Scarab commit: svn commit: r10869 - branches/release/0.22: . xdocs xdocs/howto

Author: jhoech
Date: 2010-01-21 07:28:05-0800
New Revision: 10869

Added:
   branches/release/0.22/properties.xsl
      - copied unchanged from r10868, /branches/release/0.22/xdocs/properties.xsl
   branches/release/0.22/scarab_properties.xml
      - copied, changed from r10868, /branches/release/0.22/xdocs/scarab_properties.xml
Removed:
   branches/release/0.22/xdocs/properties.xsl
   branches/release/0.22/xdocs/scarab_properties.xml
Modified:
   branches/release/0.22/maven.xml
   branches/release/0.22/xdocs/howto/release-howto.xml

Log:
FIX - Moved scarab_properties.xml file into root directory, because its primarily functionality is not to be a xdoc file, but source file for all property files, which are place in the root directory.

Modified: branches/release/0.22/maven.xml
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/0.22/maven.xml?view=diff&pathrev=10869&r1=10868&r2=10869
==============================================================================
--- branches/release/0.22/maven.xml	(original)
+++ branches/release/0.22/maven.xml	2010-01-21 07:28:05-0800
@@ -122,21 +122,21 @@
         prereqs="set-xml-transformer">
 
         <ant:style  
-             in="xdocs/scarab_properties.xml"
+             in="scarab_properties.xml"
              out="project.properties"
              style="project.xsl">
              <outputproperty name="method" value="text"/>
         </ant:style> 
 
         <ant:style  
-             in="xdocs/scarab_properties.xml"
+             in="scarab_properties.xml"
              out="minimal.properties"
              style="minimal.xsl">
              <outputproperty name="method" value="text"/>
         </ant:style> 
 
         <ant:style  
-             in="xdocs/scarab_properties.xml"
+             in="scarab_properties.xml"
              out="wizzard.properties"
              style="wizzard.xsl">
              <outputproperty name="method" value="text"/>
@@ -269,11 +269,12 @@
         </ant:ant>
     </postGoal>
 
+	<!-- generates source file for properties guide from scarab_properties file --> 
     <postGoal name="xdoc:init"> 
         <attainGoal name="set-xml-transformer"/>
         <j:set var="genDocs" value="${maven.gen.docs}"/> 
-        <ant:style basedir="xdocs/" destdir="${genDocs}" extension=".xml" 
-        style="xdocs/properties.xsl" includes="**/scarab_properties.xml" /> 
+        <ant:style destdir="${genDocs}" in="scarab_properties.xml" out="${genDocs}/scarab_properties_final.xml"
+        style="properties.xsl" /> 
     </postGoal>
       
     <!-- ===================================================== -->

Copied: branches/release/0.22/scarab_properties.xml (from r10868, /branches/release/0.22/xdocs/scarab_properties.xml)
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/0.22/scarab_properties.xml?view=diff&pathrev=10869&r1=10868&r2=10869
==============================================================================
--- /branches/release/0.22/xdocs/scarab_properties.xml	(original)
+++ branches/release/0.22/scarab_properties.xml	2010-01-21 07:28:05-0800
@@ -18,7 +18,7 @@
      NEVER change this file by hand! If you want to introduce a new property,
      please update
      
-         xdocs/scarab_properties.xml 
+         scarab_properties.xml 
      
      instead and afterwards call
      
@@ -106,7 +106,7 @@
      NEVER change this file by hand! If you want to introduce a new property,
      please update
      
-         xdocs/scarab_properties.xml 
+         scarab_properties.xml 
      
      instead and afterwards call
      

Modified: branches/release/0.22/xdocs/howto/release-howto.xml
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/0.22/xdocs/howto/release-howto.xml?view=diff&pathrev=10869&r1=10868&r2=10869
==============================================================================
--- branches/release/0.22/xdocs/howto/release-howto.xml	(original)
+++ branches/release/0.22/xdocs/howto/release-howto.xml	2010-01-21 07:28:05-0800
@@ -42,7 +42,7 @@
       If you find any failures or errors, <b>fix them</b> and <b>commit</b> the changes. Then <a href="#buildtest">build and run the tests again</a>.
 	</p>
 	<p>
-	  Edit scarab/xdocs/scarab_properties.xml and change the 
+	  Edit scarab/scarab_properties.xml and change the 
       property with name "version" removing the "-dev" appendix from
       the final version number for the release.<br/>
       Do the same in the &lt;currentVersion&gt; tag in project.xml file.

Removed: branches/release/0.22/xdocs/properties.xsl
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/0.22/xdocs/properties.xsl?view=markup&pathrev=10868

Removed: branches/release/0.22/xdocs/scarab_properties.xml
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/0.22/xdocs/scarab_properties.xml?view=markup&pathrev=10868

------------------------------------------------------
http://scarab.tigris.org/ds/viewMessage.do?dsForumId=3577&dsMessageId=2440971