[Archive-access-cvs] SF.net SVN: archive-access: [1513] trunk/archive-access/projects/nutchwax

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

Revision: 1513
          http://archive-access.svn.sourceforge.net/archive-access/?rev=1513&view=rev
Author:   stack-sf
Date:     2007-02-22 16:38:13 -0800 (Thu, 22 Feb 2007)

Log Message:
-----------

A    nutchwax/src/main
A    nutchwax/src/main/assembly
A    nutchwax/src/main/assembly/src-distribution.xml
A    nutchwax/src/main/assembly/bin-distribution.xml
A    nutchwax/src/main/filters
A    nutchwax/src/main/filters/filter.properties
M    nutchwax/pom.xml
M    nutchwax/build.xml
    Add assembler descriptors for src and bin.

Modified Paths:
--------------
    trunk/archive-access/projects/nutchwax/build.xml
    trunk/archive-access/projects/nutchwax/pom.xml

Added Paths:
-----------
    trunk/archive-access/projects/nutchwax/src/main/
    trunk/archive-access/projects/nutchwax/src/main/assembly/
    trunk/archive-access/projects/nutchwax/src/main/assembly/bin-distribution.xml
    trunk/archive-access/projects/nutchwax/src/main/assembly/src-distribution.xml
    trunk/archive-access/projects/nutchwax/src/main/filters/
    trunk/archive-access/projects/nutchwax/src/main/filters/filter.properties

Modified: trunk/archive-access/projects/nutchwax/build.xml
===================================================================
--- trunk/archive-access/projects/nutchwax/build.xml	2007-02-22 22:32:13 UTC (rev 1512)
+++ trunk/archive-access/projects/nutchwax/build.xml	2007-02-23 00:38:13 UTC (rev 1513)
@@ -59,15 +59,21 @@
 
   <target name="third.party.jar" description="Build third-party jars">
     <echo message="Building nutch third-party dependency (jar)" />
-    <ant dir="third-party/nutch" target="jar" inheritAll="false" />
+    <ant dir="third-party/nutch" target="jar" inheritAll="false" >
+        <property name="build.compiler" value="extJavac" />
+    </ant>
   </target>
   <target name="third.party.war" description="Build third-party wars">
     <echo message="Building nutch third-party dependency (war)" />
-    <ant dir="third-party/nutch" target="war" inheritAll="false" />
+    <ant dir="third-party/nutch" target="war" inheritAll="false" >
+        <property name="build.compiler" value="extJavac" />
+    </ant>
   </target>
   <target name="third.party.clean" description="Clean third-party software">
     <echo message="Cleaning nutch third-party dependency" />
-    <ant dir="third-party/nutch" target="clean" inheritAll="false" />
+    <ant dir="third-party/nutch" target="clean" inheritAll="false" >
+        <property name="build.compiler" value="extJavac" />
+    </ant>
   </target>
 
   <!-- ====================================================== -->
@@ -102,7 +108,9 @@
   <!-- ====================================================== -->
   <target name="compile-plugins"
         description="Compile all nutchwax plugins">
-    <ant dir="src/plugin" target="deploy" inheritAll="false"/>
+    <ant dir="src/plugin" target="deploy" inheritAll="false">
+        <property name="build.compiler" value="extJavac" />
+    </ant>
   </target>
 
   <!-- ================================================================== -->

Modified: trunk/archive-access/projects/nutchwax/pom.xml
===================================================================
--- trunk/archive-access/projects/nutchwax/pom.xml	2007-02-22 22:32:13 UTC (rev 1512)
+++ trunk/archive-access/projects/nutchwax/pom.xml	2007-02-23 00:38:13 UTC (rev 1513)
@@ -118,6 +118,21 @@
     <plugins>
 
       <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+
+        <configuration>
+          <filters>
+            <filter>src/main/filters/filter.properties</filter>
+          </filters>
+          <descriptors>
+            <descriptor>src/main/assembly/bin-distribution.xml</descriptor>
+            <descriptor>src/main/assembly/src-distribution.xml</descriptor>
+          </descriptors>
+        </configuration>
+
+      </plugin>
+
+      <plugin>
         <artifactId>maven-antrun-plugin</artifactId>
         <executions>
           <execution >
@@ -126,10 +141,7 @@
             <configuration>
               <tasks>
                 <echo>Compiling third.party dependencies and nutchwax</echo>
-                <!--From http://www.mail-archive.com/us...@ma.../msg60131.html -->
-                <property name="build.compiler" value="extJavac"/>
                 <ant target="third.party.jar"/>
-                <ant target="compile"/>
               </tasks>
             </configuration>
             <goals>
@@ -142,6 +154,7 @@
             <configuration>
               <tasks>
                 <echo>Assembling JAR and WAR targets</echo>
+                <ant target="compile"/>
                 <ant target="jar"/>
                 <ant target="war"/>
               </tasks>

Added: trunk/archive-access/projects/nutchwax/src/main/assembly/bin-distribution.xml
===================================================================
--- trunk/archive-access/projects/nutchwax/src/main/assembly/bin-distribution.xml	                        (rev 0)
+++ trunk/archive-access/projects/nutchwax/src/main/assembly/bin-distribution.xml	2007-02-23 00:38:13 UTC (rev 1513)
@@ -0,0 +1,29 @@
+<assembly>
+  <id>bin</id>
+  <formats>
+    <format>tar.gz</format>
+    <format>zip</format>
+  </formats>
+  <fileSets>
+    <fileSet>
+        <includes>
+        <include>*.txt</include>
+        </includes>
+    </fileSet>
+    <fileSet>
+        <directory>bin</directory>
+        <fileMode>0744</fileMode>
+    </fileSet>
+    <fileSet>
+      <directory>target</directory>
+      <outputDirectory />
+      <includes>
+        <include>nutchwax*.jar</include>
+        <include>nutchwax*.war</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>target/docs</directory>
+    </fileSet>
+  </fileSets>
+</assembly>

Added: trunk/archive-access/projects/nutchwax/src/main/assembly/src-distribution.xml
===================================================================
--- trunk/archive-access/projects/nutchwax/src/main/assembly/src-distribution.xml	                        (rev 0)
+++ trunk/archive-access/projects/nutchwax/src/main/assembly/src-distribution.xml	2007-02-23 00:38:13 UTC (rev 1513)
@@ -0,0 +1,38 @@
+<assembly>
+  <id>src</id>
+  <formats>
+    <format>tar.gz</format>
+    <format>zip</format>
+  </formats>
+  <fileSets>
+    <fileSet>
+        <includes>
+        <include>*.txt</include>
+        <include>pom.xml</include>
+        <include>build.xml</include>
+        </includes>
+    </fileSet>
+    <fileSet>
+        <directory>bin</directory>
+        <includes>
+            <include>**/**</include>
+        </includes>
+        <fileMode>0744</fileMode>
+    </fileSet>
+    <fileSet>
+      <directory>src</directory>
+    </fileSet>
+    <fileSet>
+      <directory>conf</directory>
+    </fileSet>
+    <fileSet>
+      <directory>xdocs</directory>
+    </fileSet>
+    <fileSet>
+      <directory>third-party</directory>
+      <excludes>
+        <exclude>**/build/**</exclude>
+      </excludes>
+    </fileSet>
+  </fileSets>
+</assembly>

Added: trunk/archive-access/projects/nutchwax/src/main/filters/filter.properties
===================================================================
--- trunk/archive-access/projects/nutchwax/src/main/filters/filter.properties	                        (rev 0)
+++ trunk/archive-access/projects/nutchwax/src/main/filters/filter.properties	2007-02-23 00:38:13 UTC (rev 1513)
@@ -0,0 +1,2 @@
+variable1=value1
+variable2=value2


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.