[Archive-access-cvs] archive-access/projects/nutch maven.xml,1.11,1.12 project.properties,1.15,1.16 project.xml,1.20,1.21

[Michael S. <sta...@us...>]

Update of /cvsroot/archive-access/archive-access/projects/nutch
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31435

Modified Files:
	maven.xml project.properties project.xml 
Log Message:

* project.xml 
    Move the release past 0.4.0 to 0.5.0.
* maven.xml
* project.properties
    Add building of the release notes.


Index: maven.xml
===================================================================
RCS file: /cvsroot/archive-access/archive-access/projects/nutch/maven.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** maven.xml	21 Oct 2005 00:42:14 -0000	1.11
--- maven.xml	22 Oct 2005 02:43:23 -0000	1.12
***************
*** 22,25 ****
--- 22,26 ----
      <preGoal name="xdoc:jelly-transform">
          <attainGoal name="faq" />
+         <attainGoal name="docbook"/>
      </preGoal>
      <postGoal name="xdoc:jelly-transform">
***************
*** 44,47 ****
--- 45,49 ----
          <echo>[nutchwax] dist:prepare-bin-filesystem postGoal</echo>
          <property name="nutch.dir" value="${basedir}/nutch" />
+         <attainGoal name="docbook" />
          
  
***************
*** 123,126 ****
--- 125,129 ----
              file="${basedir}/conf/nutch-site.xml.nutchwax" filtering="true" 
              overwrite="true" />
+         <attainGoal name="copy_docbook" />
      </postGoal>
  
***************
*** 128,130 ****
--- 131,173 ----
      <goal name="dist:build-src" />
  
+     <goal name="docbook">
+     <!--Check that the jimi jars are present.  If not, skip docbook.
+      -->
+     <j:set var="sDocbookSupportPresent" value="false" />
+        <util:available file="${maven.repo.local}/jimi/jars" >
+         <j:set var="sDocbookSupportPresent" value="true"/>
+        </util:available>
+        <j:if test="${sDocbookSupportPresent == 'true'}">
+         <attainGoal name="sdocbook:generate-html"/>
+         <!--<attainGoal name="sdocbook:generate-pdf"/>
+          -->
+        </j:if>
+        <!-- else -->
+        <j:if test="${sDocbookSupportPresent != 'true'}">
+         <echo
+          message="sdocbook SUN jimi jar not present. Skipping docbook build." />
+        </j:if>
+     </goal>
+ 
+     <goal name="copy_docbook">
+     <!--Copies docbooks under dist docs and under webapps. This goal runs
+         after these dirs have been setup.
+      -->
+     <property name="docbook.assembled"
+         value="${maven.build.dir}/docs/articles/" />
+     <j:set var="docbookPresent" value="false" />
+        <util:available file="${docbook.assembled}" >
+         <j:set var="docbookPresent" value="true"/>
+        </util:available>
+        <j:if test="${docbookPresent == 'true'}">
+         <echo message="Copying over docbook" />
+         <!--Copy under docs in binary build-->
+         <mkdir dir="${maven.dist.bin.assembly.dir}/docs/articles/" />
+         <copy todir="${maven.dist.bin.assembly.dir}/docs/articles/" 
+             verbose="true">
+           <fileset dir="${maven.build.dir}/docs/articles/" />
+         </copy>
+        </j:if>
+     </goal>
+ 
  </project>

Index: project.properties
===================================================================
RCS file: /cvsroot/archive-access/archive-access/projects/nutch/project.properties,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** project.properties	18 Oct 2005 23:21:11 -0000	1.15
--- project.properties	22 Oct 2005 02:43:23 -0000	1.16
***************
*** 22,23 ****
--- 22,30 ----
  maven.jar.arc = ${basedir}/lib/arc-1.5.1-200508191341.jar
  maven.jar.servlet-api = ${basedir}/nutch/lib/servlet-api.jar
+ 
+ # Sdocbook properties
+ maven.sdocbook.src.dir = ${basedir}/src/articles
+ maven.sdocbook.target.dir = ${maven.build.dir}/docs/articles
+ maven.sdocbook.resources.include =
+ maven.sdocbook.html.params = -PARAM generate.id.attributes 1 -PARAM section.autolabel 1 -PARAM part.autolabel 1 -PARAM chapter.autolabel 1 -PARAM generate.meta.abstract 1
+ maven.sdocbook.fo.params = -PARAM generate.id.attributes 1 -PARAM section.autolabel 1 -PARAM part.autolabel 1 -PARAM chapter.autolabel 1 -PARAM generate.meta.abstract 1

Index: project.xml
===================================================================
RCS file: /cvsroot/archive-access/archive-access/projects/nutch/project.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** project.xml	22 Oct 2005 01:03:18 -0000	1.20
--- project.xml	22 Oct 2005 02:43:23 -0000	1.21
***************
*** 12,16 ****
    <!-- The version of the project under development, e.g.
         1.1, 1.2, 2.0-SNAPSHOT -->
!   <currentVersion>0.4.0${version.build.suffix}</currentVersion>
  
    <!-- details about the organization that 'owns' the project -->
--- 12,16 ----
    <!-- The version of the project under development, e.g.
         1.1, 1.2, 2.0-SNAPSHOT -->
!   <currentVersion>0.5.0${version.build.suffix}</currentVersion>
  
    <!-- details about the organization that 'owns' the project -->