Added PageHeader and PageFooter to automatic update list.

oliverkuntze · Aug 27, 2009 · d4c07de · d4c07de
1 parent e9d2067
commit d4c07de
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 11 deletions.
diff --git a/FitNesseRoot/PageHeader/content.txt b/FitNesseRoot/PageHeader/content.txt
@@ -0,0 +1 @@
+#page header
diff --git a/FitNesseRoot/PageHeader/properties.xml b/FitNesseRoot/PageHeader/properties.xml
@@ -1,7 +1,13 @@
 <?xml version="1.0"?>
 <properties>
-  <Files/>
-  <LastModified>20060717211710</LastModified>
-  <RecentChanges/>
-  <WhereUsed/>
+	<Edit/>
+	<Files/>
+	<Help/>
+	<Normal/>
+	<Properties/>
+	<RecentChanges/>
+	<Refactor/>
+	<Suites/>
+	<Versions/>
+	<WhereUsed/>
 </properties>
diff --git a/FitNesseRoot/RecentChanges/content.txt b/FitNesseRoot/RecentChanges/content.txt
@@ -1,3 +1,5 @@
+|PageHeader||17:18:32 Thu, Aug 27, 2009|
+|||17:15:31 Thu, Aug 27, 2009|
 |FitNesse.SuiteAcceptanceTests.SuiteTestRunnerTests.TestRunnerVerboseOutput||14:31:26 Thu, Aug 20, 2009|
 |FitNesse.UserGuide.RestfulTests||14:03:07 Thu, Aug 20, 2009|
 |FitNesse.UserGuide.RestfulServices.RestfulSuiteXmlFormat||13:58:29 Thu, Aug 20, 2009|
@@ -6,7 +8,6 @@
 |FitNesse.UserGuide.QuickReferenceGuide||09:19:28 Wed, Aug 19, 2009|
 |JunkPage.VarPage||09:07:06 Wed, Aug 19, 2009|
 |JunkPage.TestTableTable||08:53:50 Wed, Aug 19, 2009|
-|||20:45:23 Tue, Aug 18, 2009|
 |FrontPage||20:45:07 Tue, Aug 18, 2009|
 |FitNesse.UserGuide.TestSuites||15:59:39 Tue, Aug 18, 2009|
 |FitNesse.UserGuide.TestSuites.SuiteQuery||15:57:54 Tue, Aug 18, 2009|
@@ -97,4 +98,3 @@
 |JunkPage.NunkPage||13:16:24 Tue, Jul 07, 2009|
 |FitNesse.SuiteAcceptanceTests.SuiteResponderTests.TestRssResponder||13:06:56 Tue, Jul 07, 2009|
 |FitNesse.SuiteAcceptanceTests.SuiteResponderTests.SuiteVersionResponder.TestUsenameInVersionList||13:05:49 Tue, Jul 07, 2009|
-|FitNesse.SuiteAcceptanceTests.SuiteAuthenticationTests.TestSecureSavePage||13:03:29 Tue, Jul 07, 2009|
diff --git a/FitNesseRoot/content.txt b/FitNesseRoot/content.txt
@@ -1 +1 @@
-!contents
+!contents
diff --git a/build.xml b/build.xml
@@ -39,10 +39,10 @@
       <exclude name="**/*TestSuite.class"/>
       <include name="Resources/**"/>
       <include name="tasks.properties"/>
-    	
-      <zipfileset src="lib/htmlparser.jar" />
-      <zipfileset src="lib/json.jar" />
-      <zipfileset src="lib/velocity-1.6.2-dep.jar" />
+
+      <zipfileset src="lib/htmlparser.jar"/>
+      <zipfileset src="lib/json.jar"/>
+      <zipfileset src="lib/velocity-1.6.2-dep.jar"/>
       <zipfileset src="lib/fitlibrary.jar"/>
 
       <manifest>
@@ -67,6 +67,8 @@
       <arg value="FitNesseRoot/files/templates"/>
       <arg value="FitNesseRoot/FitNesse"/>
       <arg value="FitNesseRoot/FrontPage"/>
+      <arg value="FitNesseRoot/PageFooter"/>
+      <arg value="FitNesseRoot/PageHeader"/>
     </java>
     <copy todir="classes/Resources">
       <fileset dir=".">
@@ -95,6 +97,8 @@
       <fileset dir="FitNesseRoot">
         <include name="FitNesse/**"/>
         <include name="FrontPage/**"/>
+        <include name="PageHeader/**"/>
+        <include name="PageFooter/**"/>
         <exclude name="**/*.zip"/>
       </fileset>
     </copy>

diff --git a/src/fitnesse/updates/UpdateFileList.java b/src/fitnesse/updates/UpdateFileList.java
@@ -13,6 +13,7 @@ public class UpdateFileList {
   private HashSet<String> doNotReplaceFiles = new HashSet<String>();
   private String baseDirectory = "";
   static UpdateFileList testUpdater = null;
+  private static String badFile;
 
   public static void main(String[] args) {
     UpdateFileList updater = testUpdater != null ? testUpdater : new UpdateFileList();
@@ -78,6 +79,7 @@ public boolean directoriesAreValid() {
     for (String dirName : mainDirectories) {
       File checkFile = new File(dirName);
       if (!checkFile.exists()) {
+        badFile = dirName;
         return false;
       }
     }