jvanzyl 2002/07/15 19:39:51
Modified: src/plugins-build/activity maven.xml
src/plugins-build/ant maven.xml
src/plugins-build/antlr maven.xml
src/plugins-build/cactus maven.xml
src/plugins-build/changelog maven.xml
src/plugins-build/checkstyle maven.xml
src/plugins-build/clean maven.xml
src/plugins-build/clover maven.xml
src/plugins-build/dependency maven.xml
src/plugins-build/dist maven.xml
src/plugins-build/docbook maven.xml
src/plugins-build/graph maven.xml
src/plugins-build/gump maven.xml
src/plugins-build/j2ee maven.xml
src/plugins-build/java maven.xml
src/plugins-build/javadoc maven.xml
src/plugins-build/jdepend maven.xml
src/plugins-build/junit-report maven.xml
src/plugins-build/jxr maven.xml
src/plugins-build/pdf maven.xml
src/plugins-build/pom maven.xml
src/plugins-build/reactor maven.xml
src/plugins-build/site maven.xml
src/plugins-build/struts maven.xml
src/plugins-build/tasklist maven.xml
src/plugins-build/test maven.xml
src/plugins-build/webserver maven.xml
src/plugins-build/xdoc maven.xml
Log:
o Change the structure of the plugins so that within the plugin JAR
we have:
<jar>
|
+-<classes> i.e. org/apache/maven | com/foo/bar | whatever
|
+-<all other plugin resources>
This is being done for a couple reasons:
1) The entire directory structure of the plugin is in the classpath
so that we can migrate to using resources directly from a packed
JAR. Right now, most of the plugins rely on the filesystem. So by placing
the whole directory structure in the classpath people can migrate their
plugins to work directly from a JAR i.e. you can use classpath and
filesystem semantics. We can probably have a manifest attribute
for plugins that just won't work from a JAR and have them unpacked.
2) This structure will allow the resources in the JAR to be available
in the same way that other maven produced JARs. So if a plugin
depends on another plugin then it can be listed in the dependencies
and will be pulled down like any other JAR. So if we add an
--install=<project-id> then users can download new plugins and
when it's run for the first time all its dependencies will be pulled
down. Eventually the --install feature could pull down everything
required but what is currently available will work.
Revision Changes Path
1.3 +8 -9 jakarta-turbine-maven/src/plugins-build/activity/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/activity/maven.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- maven.xml 15 Jul 2002 14:30:37 -0000 1.2
+++ maven.xml 16 Jul 2002 02:39:49 -0000 1.3
@@ -11,13 +11,7 @@
<property name="assemblyDir" value="target/assemblyDir"/>
- <mkdir dir="target/assemblyDir"/>
-
- <copy todir="${assemblyDir}" flatten="true">
- <fileset dir=".">
- <include name="target/${maven.final.name}.jar"/>
- </fileset>
- </copy>
+ <mkdir dir="${assemblyDir}"/>
<copy todir="${assemblyDir}">
<fileset dir=".">
@@ -26,12 +20,17 @@
<exclude name="maven.xml"/>
</fileset>
</copy>
-
+
+ <j:if test="${sourcesPresent == 'true'}">
+ <copy todir="${assemblyDir}">
+ <fileset dir="target/classes"/>
+ </copy>
+ </j:if>
+
<jar
jarfile="${maven.build.dir}/${maven.final.name}-plugin.jar">
<fileset dir="${assemblyDir}"/>
</jar>
-
</goal>
1.4 +8 -9 jakarta-turbine-maven/src/plugins-build/ant/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/ant/maven.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- maven.xml 15 Jul 2002 14:30:38 -0000 1.3
+++ maven.xml 16 Jul 2002 02:39:49 -0000 1.4
@@ -11,13 +11,7 @@
<property name="assemblyDir" value="target/assemblyDir"/>
- <mkdir dir="target/assemblyDir"/>
-
- <copy todir="${assemblyDir}" flatten="true">
- <fileset dir=".">
- <include name="target/${maven.final.name}.jar"/>
- </fileset>
- </copy>
+ <mkdir dir="${assemblyDir}"/>
<copy todir="${assemblyDir}">
<fileset dir=".">
@@ -26,12 +20,17 @@
<exclude name="maven.xml"/>
</fileset>
</copy>
-
+
+ <j:if test="${sourcesPresent == 'true'}">
+ <copy todir="${assemblyDir}">
+ <fileset dir="target/classes"/>
+ </copy>
+ </j:if>
+
<jar
jarfile="${maven.build.dir}/${maven.final.name}-plugin.jar">
<fileset dir="${assemblyDir}"/>
</jar>
-
</goal>
1.4 +8 -9 jakarta-turbine-maven/src/plugins-build/antlr/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/antlr/maven.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- maven.xml 15 Jul 2002 14:30:38 -0000 1.3
+++ maven.xml 16 Jul 2002 02:39:49 -0000 1.4
@@ -11,13 +11,7 @@
<property name="assemblyDir" value="target/assemblyDir"/>
- <mkdir dir="target/assemblyDir"/>
-
- <copy todir="${assemblyDir}" flatten="true">
- <fileset dir=".">
- <include name="target/${maven.final.name}.jar"/>
- </fileset>
- </copy>
+ <mkdir dir="${assemblyDir}"/>
<copy todir="${assemblyDir}">
<fileset dir=".">
@@ -26,12 +20,17 @@
<exclude name="maven.xml"/>
</fileset>
</copy>
-
+
+ <j:if test="${sourcesPresent == 'true'}">
+ <copy todir="${assemblyDir}">
+ <fileset dir="target/classes"/>
+ </copy>
+ </j:if>
+
<jar
jarfile="${maven.build.dir}/${maven.final.name}-plugin.jar">
<fileset dir="${assemblyDir}"/>
</jar>
-
</goal>
1.4 +8 -9 jakarta-turbine-maven/src/plugins-build/cactus/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/cactus/maven.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- maven.xml 15 Jul 2002 14:30:38 -0000 1.3
+++ maven.xml 16 Jul 2002 02:39:49 -0000 1.4
@@ -11,13 +11,7 @@
<property name="assemblyDir" value="target/assemblyDir"/>
- <mkdir dir="target/assemblyDir"/>
-
- <copy todir="${assemblyDir}" flatten="true">
- <fileset dir=".">
- <include name="target/${maven.final.name}.jar"/>
- </fileset>
- </copy>
+ <mkdir dir="${assemblyDir}"/>
<copy todir="${assemblyDir}">
<fileset dir=".">
@@ -26,12 +20,17 @@
<exclude name="maven.xml"/>
</fileset>
</copy>
-
+
+ <j:if test="${sourcesPresent == 'true'}">
+ <copy todir="${assemblyDir}">
+ <fileset dir="target/classes"/>
+ </copy>
+ </j:if>
+
<jar
jarfile="${maven.build.dir}/${maven.final.name}-plugin.jar">
<fileset dir="${assemblyDir}"/>
</jar>
-
</goal>
1.5 +8 -9 jakarta-turbine-maven/src/plugins-build/changelog/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/changelog/maven.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- maven.xml 15 Jul 2002 14:30:38 -0000 1.4
+++ maven.xml 16 Jul 2002 02:39:49 -0000 1.5
@@ -11,13 +11,7 @@
<property name="assemblyDir" value="target/assemblyDir"/>
- <mkdir dir="target/assemblyDir"/>
-
- <copy todir="${assemblyDir}" flatten="true">
- <fileset dir=".">
- <include name="target/${maven.final.name}.jar"/>
- </fileset>
- </copy>
+ <mkdir dir="${assemblyDir}"/>
<copy todir="${assemblyDir}">
<fileset dir=".">
@@ -26,12 +20,17 @@
<exclude name="maven.xml"/>
</fileset>
</copy>
-
+
+ <j:if test="${sourcesPresent == 'true'}">
+ <copy todir="${assemblyDir}">
+ <fileset dir="target/classes"/>
+ </copy>
+ </j:if>
+
<jar
jarfile="${maven.build.dir}/${maven.final.name}-plugin.jar">
<fileset dir="${assemblyDir}"/>
</jar>
-
</goal>
1.4 +8 -9 jakarta-turbine-maven/src/plugins-build/checkstyle/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/checkstyle/maven.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- maven.xml 15 Jul 2002 14:30:38 -0000 1.3
+++ maven.xml 16 Jul 2002 02:39:49 -0000 1.4
@@ -11,13 +11,7 @@
<property name="assemblyDir" value="target/assemblyDir"/>
- <mkdir dir="target/assemblyDir"/>
-
- <copy todir="${assemblyDir}" flatten="true">
- <fileset dir=".">
- <include name="target/${maven.final.name}.jar"/>
- </fileset>
- </copy>
+ <mkdir dir="${assemblyDir}"/>
<copy todir="${assemblyDir}">
<fileset dir=".">
@@ -26,12 +20,17 @@
<exclude name="maven.xml"/>
</fileset>
</copy>
-
+
+ <j:if test="${sourcesPresent == 'true'}">
+ <copy todir="${assemblyDir}">
+ <fileset dir="target/classes"/>
+ </copy>
+ </j:if>
+
<jar
jarfile="${maven.build.dir}/${maven.final.name}-plugin.jar">
<fileset dir="${assemblyDir}"/>
</jar>
-
</goal>
1.4 +8 -9 jakarta-turbine-maven/src/plugins-build/clean/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/clean/maven.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- maven.xml 15 Jul 2002 14:30:38 -0000 1.3
+++ maven.xml 16 Jul 2002 02:39:49 -0000 1.4
@@ -11,13 +11,7 @@
<property name="assemblyDir" value="target/assemblyDir"/>
- <mkdir dir="target/assemblyDir"/>
-
- <copy todir="${assemblyDir}" flatten="true">
- <fileset dir=".">
- <include name="target/${maven.final.name}.jar"/>
- </fileset>
- </copy>
+ <mkdir dir="${assemblyDir}"/>
<copy todir="${assemblyDir}">
<fileset dir=".">
@@ -26,12 +20,17 @@
<exclude name="maven.xml"/>
</fileset>
</copy>
-
+
+ <j:if test="${sourcesPresent == 'true'}">
+ <copy todir="${assemblyDir}">
+ <fileset dir="target/classes"/>
+ </copy>
+ </j:if>
+
<jar
jarfile="${maven.build.dir}/${maven.final.name}-plugin.jar">
<fileset dir="${assemblyDir}"/>
</jar>
-
</goal>
1.4 +8 -9 jakarta-turbine-maven/src/plugins-build/clover/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/clover/maven.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- maven.xml 15 Jul 2002 14:30:38 -0000 1.3
+++ maven.xml 16 Jul 2002 02:39:49 -0000 1.4
@@ -11,13 +11,7 @@
<property name="assemblyDir" value="target/assemblyDir"/>
- <mkdir dir="target/assemblyDir"/>
-
- <copy todir="${assemblyDir}" flatten="true">
- <fileset dir=".">
- <include name="target/${maven.final.name}.jar"/>
- </fileset>
- </copy>
+ <mkdir dir="${assemblyDir}"/>
<copy todir="${assemblyDir}">
<fileset dir=".">
@@ -26,12 +20,17 @@
<exclude name="maven.xml"/>
</fileset>
</copy>
-
+
+ <j:if test="${sourcesPresent == 'true'}">
+ <copy todir="${assemblyDir}">
+ <fileset dir="target/classes"/>
+ </copy>
+ </j:if>
+
<jar
jarfile="${maven.build.dir}/${maven.final.name}-plugin.jar">
<fileset dir="${assemblyDir}"/>
</jar>
-
</goal>
1.4 +8 -9 jakarta-turbine-maven/src/plugins-build/dependency/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/dependency/maven.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- maven.xml 15 Jul 2002 14:30:38 -0000 1.3
+++ maven.xml 16 Jul 2002 02:39:49 -0000 1.4
@@ -11,13 +11,7 @@
<property name="assemblyDir" value="target/assemblyDir"/>
- <mkdir dir="target/assemblyDir"/>
-
- <copy todir="${assemblyDir}" flatten="true">
- <fileset dir=".">
- <include name="target/${maven.final.name}.jar"/>
- </fileset>
- </copy>
+ <mkdir dir="${assemblyDir}"/>
<copy todir="${assemblyDir}">
<fileset dir=".">
@@ -26,12 +20,17 @@
<exclude name="maven.xml"/>
</fileset>
</copy>
-
+
+ <j:if test="${sourcesPresent == 'true'}">
+ <copy todir="${assemblyDir}">
+ <fileset dir="target/classes"/>
+ </copy>
+ </j:if>
+
<jar
jarfile="${maven.build.dir}/${maven.final.name}-plugin.jar">
<fileset dir="${assemblyDir}"/>
</jar>
-
</goal>
1.4 +8 -9 jakarta-turbine-maven/src/plugins-build/dist/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/dist/maven.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- maven.xml 15 Jul 2002 14:30:38 -0000 1.3
+++ maven.xml 16 Jul 2002 02:39:49 -0000 1.4
@@ -11,13 +11,7 @@
<property name="assemblyDir" value="target/assemblyDir"/>
- <mkdir dir="target/assemblyDir"/>
-
- <copy todir="${assemblyDir}" flatten="true">
- <fileset dir=".">
- <include name="target/${maven.final.name}.jar"/>
- </fileset>
- </copy>
+ <mkdir dir="${assemblyDir}"/>
<copy todir="${assemblyDir}">
<fileset dir=".">
@@ -26,12 +20,17 @@
<exclude name="maven.xml"/>
</fileset>
</copy>
-
+
+ <j:if test="${sourcesPresent == 'true'}">
+ <copy todir="${assemblyDir}">
+ <fileset dir="target/classes"/>
+ </copy>
+ </j:if>
+
<jar
jarfile="${maven.build.dir}/${maven.final.name}-plugin.jar">
<fileset dir="${assemblyDir}"/>
</jar>
-
</goal>
1.4 +8 -9 jakarta-turbine-maven/src/plugins-build/docbook/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/docbook/maven.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- maven.xml 15 Jul 2002 14:30:38 -0000 1.3
+++ maven.xml 16 Jul 2002 02:39:49 -0000 1.4
@@ -11,13 +11,7 @@
<property name="assemblyDir" value="target/assemblyDir"/>
- <mkdir dir="target/assemblyDir"/>
-
- <copy todir="${assemblyDir}" flatten="true">
- <fileset dir=".">
- <include name="target/${maven.final.name}.jar"/>
- </fileset>
- </copy>
+ <mkdir dir="${assemblyDir}"/>
<copy todir="${assemblyDir}">
<fileset dir=".">
@@ -26,12 +20,17 @@
<exclude name="maven.xml"/>
</fileset>
</copy>
-
+
+ <j:if test="${sourcesPresent == 'true'}">
+ <copy todir="${assemblyDir}">
+ <fileset dir="target/classes"/>
+ </copy>
+ </j:if>
+
<jar
jarfile="${maven.build.dir}/${maven.final.name}-plugin.jar">
<fileset dir="${assemblyDir}"/>
</jar>
-
</goal>
1.4 +8 -9 jakarta-turbine-maven/src/plugins-build/graph/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/graph/maven.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- maven.xml 15 Jul 2002 14:30:38 -0000 1.3
+++ maven.xml 16 Jul 2002 02:39:49 -0000 1.4
@@ -11,13 +11,7 @@
<property name="assemblyDir" value="target/assemblyDir"/>
- <mkdir dir="target/assemblyDir"/>
-
- <copy todir="${assemblyDir}" flatten="true">
- <fileset dir=".">
- <include name="target/${maven.final.name}.jar"/>
- </fileset>
- </copy>
+ <mkdir dir="${assemblyDir}"/>
<copy todir="${assemblyDir}">
<fileset dir=".">
@@ -26,12 +20,17 @@
<exclude name="maven.xml"/>
</fileset>
</copy>
-
+
+ <j:if test="${sourcesPresent == 'true'}">
+ <copy todir="${assemblyDir}">
+ <fileset dir="target/classes"/>
+ </copy>
+ </j:if>
+
<jar
jarfile="${maven.build.dir}/${maven.final.name}-plugin.jar">
<fileset dir="${assemblyDir}"/>
</jar>
-
</goal>
1.4 +8 -9 jakarta-turbine-maven/src/plugins-build/gump/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/gump/maven.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- maven.xml 15 Jul 2002 14:30:38 -0000 1.3
+++ maven.xml 16 Jul 2002 02:39:49 -0000 1.4
@@ -11,13 +11,7 @@
<property name="assemblyDir" value="target/assemblyDir"/>
- <mkdir dir="target/assemblyDir"/>
-
- <copy todir="${assemblyDir}" flatten="true">
- <fileset dir=".">
- <include name="target/${maven.final.name}.jar"/>
- </fileset>
- </copy>
+ <mkdir dir="${assemblyDir}"/>
<copy todir="${assemblyDir}">
<fileset dir=".">
@@ -26,12 +20,17 @@
<exclude name="maven.xml"/>
</fileset>
</copy>
-
+
+ <j:if test="${sourcesPresent == 'true'}">
+ <copy todir="${assemblyDir}">
+ <fileset dir="target/classes"/>
+ </copy>
+ </j:if>
+
<jar
jarfile="${maven.build.dir}/${maven.final.name}-plugin.jar">
<fileset dir="${assemblyDir}"/>
</jar>
-
</goal>
1.4 +8 -9 jakarta-turbine-maven/src/plugins-build/j2ee/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/j2ee/maven.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- maven.xml 15 Jul 2002 14:30:38 -0000 1.3
+++ maven.xml 16 Jul 2002 02:39:50 -0000 1.4
@@ -11,13 +11,7 @@
<property name="assemblyDir" value="target/assemblyDir"/>
- <mkdir dir="target/assemblyDir"/>
-
- <copy todir="${assemblyDir}" flatten="true">
- <fileset dir=".">
- <include name="target/${maven.final.name}.jar"/>
- </fileset>
- </copy>
+ <mkdir dir="${assemblyDir}"/>
<copy todir="${assemblyDir}">
<fileset dir=".">
@@ -26,12 +20,17 @@
<exclude name="maven.xml"/>
</fileset>
</copy>
-
+
+ <j:if test="${sourcesPresent == 'true'}">
+ <copy todir="${assemblyDir}">
+ <fileset dir="target/classes"/>
+ </copy>
+ </j:if>
+
<jar
jarfile="${maven.build.dir}/${maven.final.name}-plugin.jar">
<fileset dir="${assemblyDir}"/>
</jar>
-
</goal>
1.4 +8 -9 jakarta-turbine-maven/src/plugins-build/java/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/java/maven.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- maven.xml 15 Jul 2002 14:30:39 -0000 1.3
+++ maven.xml 16 Jul 2002 02:39:50 -0000 1.4
@@ -11,13 +11,7 @@
<property name="assemblyDir" value="target/assemblyDir"/>
- <mkdir dir="target/assemblyDir"/>
-
- <copy todir="${assemblyDir}" flatten="true">
- <fileset dir=".">
- <include name="target/${maven.final.name}.jar"/>
- </fileset>
- </copy>
+ <mkdir dir="${assemblyDir}"/>
<copy todir="${assemblyDir}">
<fileset dir=".">
@@ -26,12 +20,17 @@
<exclude name="maven.xml"/>
</fileset>
</copy>
-
+
+ <j:if test="${sourcesPresent == 'true'}">
+ <copy todir="${assemblyDir}">
+ <fileset dir="target/classes"/>
+ </copy>
+ </j:if>
+
<jar
jarfile="${maven.build.dir}/${maven.final.name}-plugin.jar">
<fileset dir="${assemblyDir}"/>
</jar>
-
</goal>
1.4 +8 -9 jakarta-turbine-maven/src/plugins-build/javadoc/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/javadoc/maven.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- maven.xml 15 Jul 2002 14:30:39 -0000 1.3
+++ maven.xml 16 Jul 2002 02:39:50 -0000 1.4
@@ -11,13 +11,7 @@
<property name="assemblyDir" value="target/assemblyDir"/>
- <mkdir dir="target/assemblyDir"/>
-
- <copy todir="${assemblyDir}" flatten="true">
- <fileset dir=".">
- <include name="target/${maven.final.name}.jar"/>
- </fileset>
- </copy>
+ <mkdir dir="${assemblyDir}"/>
<copy todir="${assemblyDir}">
<fileset dir=".">
@@ -26,12 +20,17 @@
<exclude name="maven.xml"/>
</fileset>
</copy>
-
+
+ <j:if test="${sourcesPresent == 'true'}">
+ <copy todir="${assemblyDir}">
+ <fileset dir="target/classes"/>
+ </copy>
+ </j:if>
+
<jar
jarfile="${maven.build.dir}/${maven.final.name}-plugin.jar">
<fileset dir="${assemblyDir}"/>
</jar>
-
</goal>
1.4 +8 -9 jakarta-turbine-maven/src/plugins-build/jdepend/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/jdepend/maven.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- maven.xml 15 Jul 2002 14:30:39 -0000 1.3
+++ maven.xml 16 Jul 2002 02:39:50 -0000 1.4
@@ -11,13 +11,7 @@
<property name="assemblyDir" value="target/assemblyDir"/>
- <mkdir dir="target/assemblyDir"/>
-
- <copy todir="${assemblyDir}" flatten="true">
- <fileset dir=".">
- <include name="target/${maven.final.name}.jar"/>
- </fileset>
- </copy>
+ <mkdir dir="${assemblyDir}"/>
<copy todir="${assemblyDir}">
<fileset dir=".">
@@ -26,12 +20,17 @@
<exclude name="maven.xml"/>
</fileset>
</copy>
-
+
+ <j:if test="${sourcesPresent == 'true'}">
+ <copy todir="${assemblyDir}">
+ <fileset dir="target/classes"/>
+ </copy>
+ </j:if>
+
<jar
jarfile="${maven.build.dir}/${maven.final.name}-plugin.jar">
<fileset dir="${assemblyDir}"/>
</jar>
-
</goal>
1.4 +8 -9 jakarta-turbine-maven/src/plugins-build/junit-report/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/junit-report/maven.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- maven.xml 15 Jul 2002 14:30:39 -0000 1.3
+++ maven.xml 16 Jul 2002 02:39:50 -0000 1.4
@@ -11,13 +11,7 @@
<property name="assemblyDir" value="target/assemblyDir"/>
- <mkdir dir="target/assemblyDir"/>
-
- <copy todir="${assemblyDir}" flatten="true">
- <fileset dir=".">
- <include name="target/${maven.final.name}.jar"/>
- </fileset>
- </copy>
+ <mkdir dir="${assemblyDir}"/>
<copy todir="${assemblyDir}">
<fileset dir=".">
@@ -26,12 +20,17 @@
<exclude name="maven.xml"/>
</fileset>
</copy>
-
+
+ <j:if test="${sourcesPresent == 'true'}">
+ <copy todir="${assemblyDir}">
+ <fileset dir="target/classes"/>
+ </copy>
+ </j:if>
+
<jar
jarfile="${maven.build.dir}/${maven.final.name}-plugin.jar">
<fileset dir="${assemblyDir}"/>
</jar>
-
</goal>
1.4 +8 -9 jakarta-turbine-maven/src/plugins-build/jxr/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/jxr/maven.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- maven.xml 15 Jul 2002 14:30:39 -0000 1.3
+++ maven.xml 16 Jul 2002 02:39:50 -0000 1.4
@@ -11,13 +11,7 @@
<property name="assemblyDir" value="target/assemblyDir"/>
- <mkdir dir="target/assemblyDir"/>
-
- <copy todir="${assemblyDir}" flatten="true">
- <fileset dir=".">
- <include name="target/${maven.final.name}.jar"/>
- </fileset>
- </copy>
+ <mkdir dir="${assemblyDir}"/>
<copy todir="${assemblyDir}">
<fileset dir=".">
@@ -26,12 +20,17 @@
<exclude name="maven.xml"/>
</fileset>
</copy>
-
+
+ <j:if test="${sourcesPresent == 'true'}">
+ <copy todir="${assemblyDir}">
+ <fileset dir="target/classes"/>
+ </copy>
+ </j:if>
+
<jar
jarfile="${maven.build.dir}/${maven.final.name}-plugin.jar">
<fileset dir="${assemblyDir}"/>
</jar>
-
</goal>
1.4 +8 -9 jakarta-turbine-maven/src/plugins-build/pdf/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/pdf/maven.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- maven.xml 15 Jul 2002 14:30:39 -0000 1.3
+++ maven.xml 16 Jul 2002 02:39:50 -0000 1.4
@@ -11,13 +11,7 @@
<property name="assemblyDir" value="target/assemblyDir"/>
- <mkdir dir="target/assemblyDir"/>
-
- <copy todir="${assemblyDir}" flatten="true">
- <fileset dir=".">
- <include name="target/${maven.final.name}.jar"/>
- </fileset>
- </copy>
+ <mkdir dir="${assemblyDir}"/>
<copy todir="${assemblyDir}">
<fileset dir=".">
@@ -26,12 +20,17 @@
<exclude name="maven.xml"/>
</fileset>
</copy>
-
+
+ <j:if test="${sourcesPresent == 'true'}">
+ <copy todir="${assemblyDir}">
+ <fileset dir="target/classes"/>
+ </copy>
+ </j:if>
+
<jar
jarfile="${maven.build.dir}/${maven.final.name}-plugin.jar">
<fileset dir="${assemblyDir}"/>
</jar>
-
</goal>
1.4 +8 -9 jakarta-turbine-maven/src/plugins-build/pom/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/pom/maven.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- maven.xml 15 Jul 2002 14:30:39 -0000 1.3
+++ maven.xml 16 Jul 2002 02:39:50 -0000 1.4
@@ -11,13 +11,7 @@
<property name="assemblyDir" value="target/assemblyDir"/>
- <mkdir dir="target/assemblyDir"/>
-
- <copy todir="${assemblyDir}" flatten="true">
- <fileset dir=".">
- <include name="target/${maven.final.name}.jar"/>
- </fileset>
- </copy>
+ <mkdir dir="${assemblyDir}"/>
<copy todir="${assemblyDir}">
<fileset dir=".">
@@ -26,12 +20,17 @@
<exclude name="maven.xml"/>
</fileset>
</copy>
-
+
+ <j:if test="${sourcesPresent == 'true'}">
+ <copy todir="${assemblyDir}">
+ <fileset dir="target/classes"/>
+ </copy>
+ </j:if>
+
<jar
jarfile="${maven.build.dir}/${maven.final.name}-plugin.jar">
<fileset dir="${assemblyDir}"/>
</jar>
-
</goal>
1.4 +8 -9 jakarta-turbine-maven/src/plugins-build/reactor/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/reactor/maven.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- maven.xml 15 Jul 2002 14:30:39 -0000 1.3
+++ maven.xml 16 Jul 2002 02:39:50 -0000 1.4
@@ -11,13 +11,7 @@
<property name="assemblyDir" value="target/assemblyDir"/>
- <mkdir dir="target/assemblyDir"/>
-
- <copy todir="${assemblyDir}" flatten="true">
- <fileset dir=".">
- <include name="target/${maven.final.name}.jar"/>
- </fileset>
- </copy>
+ <mkdir dir="${assemblyDir}"/>
<copy todir="${assemblyDir}">
<fileset dir=".">
@@ -26,12 +20,17 @@
<exclude name="maven.xml"/>
</fileset>
</copy>
-
+
+ <j:if test="${sourcesPresent == 'true'}">
+ <copy todir="${assemblyDir}">
+ <fileset dir="target/classes"/>
+ </copy>
+ </j:if>
+
<jar
jarfile="${maven.build.dir}/${maven.final.name}-plugin.jar">
<fileset dir="${assemblyDir}"/>
</jar>
-
</goal>
1.4 +8 -9 jakarta-turbine-maven/src/plugins-build/site/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/site/maven.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- maven.xml 15 Jul 2002 14:30:39 -0000 1.3
+++ maven.xml 16 Jul 2002 02:39:50 -0000 1.4
@@ -11,13 +11,7 @@
<property name="assemblyDir" value="target/assemblyDir"/>
- <mkdir dir="target/assemblyDir"/>
-
- <copy todir="${assemblyDir}" flatten="true">
- <fileset dir=".">
- <include name="target/${maven.final.name}.jar"/>
- </fileset>
- </copy>
+ <mkdir dir="${assemblyDir}"/>
<copy todir="${assemblyDir}">
<fileset dir=".">
@@ -26,12 +20,17 @@
<exclude name="maven.xml"/>
</fileset>
</copy>
-
+
+ <j:if test="${sourcesPresent == 'true'}">
+ <copy todir="${assemblyDir}">
+ <fileset dir="target/classes"/>
+ </copy>
+ </j:if>
+
<jar
jarfile="${maven.build.dir}/${maven.final.name}-plugin.jar">
<fileset dir="${assemblyDir}"/>
</jar>
-
</goal>
1.4 +8 -9 jakarta-turbine-maven/src/plugins-build/struts/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/struts/maven.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- maven.xml 15 Jul 2002 14:30:39 -0000 1.3
+++ maven.xml 16 Jul 2002 02:39:50 -0000 1.4
@@ -11,13 +11,7 @@
<property name="assemblyDir" value="target/assemblyDir"/>
- <mkdir dir="target/assemblyDir"/>
-
- <copy todir="${assemblyDir}" flatten="true">
- <fileset dir=".">
- <include name="target/${maven.final.name}.jar"/>
- </fileset>
- </copy>
+ <mkdir dir="${assemblyDir}"/>
<copy todir="${assemblyDir}">
<fileset dir=".">
@@ -26,12 +20,17 @@
<exclude name="maven.xml"/>
</fileset>
</copy>
-
+
+ <j:if test="${sourcesPresent == 'true'}">
+ <copy todir="${assemblyDir}">
+ <fileset dir="target/classes"/>
+ </copy>
+ </j:if>
+
<jar
jarfile="${maven.build.dir}/${maven.final.name}-plugin.jar">
<fileset dir="${assemblyDir}"/>
</jar>
-
</goal>
1.4 +8 -9 jakarta-turbine-maven/src/plugins-build/tasklist/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/tasklist/maven.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- maven.xml 15 Jul 2002 14:30:39 -0000 1.3
+++ maven.xml 16 Jul 2002 02:39:50 -0000 1.4
@@ -11,13 +11,7 @@
<property name="assemblyDir" value="target/assemblyDir"/>
- <mkdir dir="target/assemblyDir"/>
-
- <copy todir="${assemblyDir}" flatten="true">
- <fileset dir=".">
- <include name="target/${maven.final.name}.jar"/>
- </fileset>
- </copy>
+ <mkdir dir="${assemblyDir}"/>
<copy todir="${assemblyDir}">
<fileset dir=".">
@@ -26,12 +20,17 @@
<exclude name="maven.xml"/>
</fileset>
</copy>
-
+
+ <j:if test="${sourcesPresent == 'true'}">
+ <copy todir="${assemblyDir}">
+ <fileset dir="target/classes"/>
+ </copy>
+ </j:if>
+
<jar
jarfile="${maven.build.dir}/${maven.final.name}-plugin.jar">
<fileset dir="${assemblyDir}"/>
</jar>
-
</goal>
1.4 +8 -9 jakarta-turbine-maven/src/plugins-build/test/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/test/maven.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- maven.xml 15 Jul 2002 14:30:39 -0000 1.3
+++ maven.xml 16 Jul 2002 02:39:50 -0000 1.4
@@ -11,13 +11,7 @@
<property name="assemblyDir" value="target/assemblyDir"/>
- <mkdir dir="target/assemblyDir"/>
-
- <copy todir="${assemblyDir}" flatten="true">
- <fileset dir=".">
- <include name="target/${maven.final.name}.jar"/>
- </fileset>
- </copy>
+ <mkdir dir="${assemblyDir}"/>
<copy todir="${assemblyDir}">
<fileset dir=".">
@@ -26,12 +20,17 @@
<exclude name="maven.xml"/>
</fileset>
</copy>
-
+
+ <j:if test="${sourcesPresent == 'true'}">
+ <copy todir="${assemblyDir}">
+ <fileset dir="target/classes"/>
+ </copy>
+ </j:if>
+
<jar
jarfile="${maven.build.dir}/${maven.final.name}-plugin.jar">
<fileset dir="${assemblyDir}"/>
</jar>
-
</goal>
1.4 +8 -9 jakarta-turbine-maven/src/plugins-build/webserver/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/webserver/maven.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- maven.xml 15 Jul 2002 14:30:40 -0000 1.3
+++ maven.xml 16 Jul 2002 02:39:51 -0000 1.4
@@ -11,13 +11,7 @@
<property name="assemblyDir" value="target/assemblyDir"/>
- <mkdir dir="target/assemblyDir"/>
-
- <copy todir="${assemblyDir}" flatten="true">
- <fileset dir=".">
- <include name="target/${maven.final.name}.jar"/>
- </fileset>
- </copy>
+ <mkdir dir="${assemblyDir}"/>
<copy todir="${assemblyDir}">
<fileset dir=".">
@@ -26,12 +20,17 @@
<exclude name="maven.xml"/>
</fileset>
</copy>
-
+
+ <j:if test="${sourcesPresent == 'true'}">
+ <copy todir="${assemblyDir}">
+ <fileset dir="target/classes"/>
+ </copy>
+ </j:if>
+
<jar
jarfile="${maven.build.dir}/${maven.final.name}-plugin.jar">
<fileset dir="${assemblyDir}"/>
</jar>
-
</goal>
1.4 +8 -9 jakarta-turbine-maven/src/plugins-build/xdoc/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/xdoc/maven.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- maven.xml 15 Jul 2002 14:30:40 -0000 1.3
+++ maven.xml 16 Jul 2002 02:39:51 -0000 1.4
@@ -11,13 +11,7 @@
<property name="assemblyDir" value="target/assemblyDir"/>
- <mkdir dir="target/assemblyDir"/>
-
- <copy todir="${assemblyDir}" flatten="true">
- <fileset dir=".">
- <include name="target/${maven.final.name}.jar"/>
- </fileset>
- </copy>
+ <mkdir dir="${assemblyDir}"/>
<copy todir="${assemblyDir}">
<fileset dir=".">
@@ -26,12 +20,17 @@
<exclude name="maven.xml"/>
</fileset>
</copy>
-
+
+ <j:if test="${sourcesPresent == 'true'}">
+ <copy todir="${assemblyDir}">
+ <fileset dir="target/classes"/>
+ </copy>
+ </j:if>
+
<jar
jarfile="${maven.build.dir}/${maven.final.name}-plugin.jar">
<fileset dir="${assemblyDir}"/>
</jar>
-
</goal>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
