bloritsch 2003/06/17 07:13:41
Modified: fortress/container maven.xml
Log:
ensure I did not miss any build changes that I needed for Fortress Tools
Revision Changes Path
1.3 +94 -94 avalon/fortress/container/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/fortress/container/maven.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- maven.xml 12 Jun 2003 18:24:22 -0000 1.2
+++ maven.xml 17 Jun 2003 14:13:41 -0000 1.3
@@ -1,94 +1,94 @@
-<?xml version="1.0"?>
-
-<project default="check"
- xmlns:j="jelly:core"
- xmlns:ant="jelly:ant"
- xmlns:deploy="deploy">
-
- <!-- include the avalon-wide custom project properties -->
- <property file="${basedir}/project.properties"/>
- <property file="${basedir}/../project.properties"/>
- <property file="${basedir}/../../project.properties"/>
- <property file="${basedir}/../../../project.properties"/>
- <property file="${basedir}/../../../../project.properties"/>
-
- <goal name="check">
- <!-- friendly error in case file is not available -->
- <ant:available file="${avalon.buildsystem}/maven-common.xml"
- property="buildsystem.available"/>
- <j:set var="avalon.buildsystem.available" value="${buildsystem.available}"/>
- <j:if test="${empty(avalon.buildsystem.available)}">
- <ant:fail>
- ===================================================================
- BUILD SYSTEM FAILURE!
- ===================================================================
-
- a required file, ${avalon.buildsystem}/maven-common.xml, cannot be
- found. Try setting the avalon.buildsystem property in
- project.properties to the correct location.
- </ant:fail>
- </j:if>
- </goal>
-
- <!-- include the avalon-wide custom goal decorators from maven-common.xml -->
- <j:import file="${avalon.buildsystem}/maven-common.xml" inherit="true"/>
-
- <postGoal name="test:compile">
- <attainGoal name="avalon:copy-sources"/>
- <attainGoal name="avalon:init"/>
-
- <ant:taskdef name="collect-meta"
- classname="org.apache.avalon.fortress.tools.ComponentMetaInfoCollector">
-
- <ant:classpath>
- <ant:path refid="maven.dependency.classpath"/>
- <ant:pathelement path="${api.build.dir}"/>
- <ant:pathelement path="${impl.build.dir}"/>
- <ant:pathelement path="${test.build.dir}"/>
- </ant:classpath>
- </ant:taskdef>
-
- <collect-meta destdir="${test.build.dir}">
- <fileset dir="${test.src.dir}"/>
- </collect-meta>
-
- <ant:copy todir="${test.build.dir}">
- <ant:fileset dir="${test.src.dir}">
- <ant:exclude name="**/*.java"/>
- <ant:exclude name="**/package.html"/>
- </ant:fileset>
- </ant:copy>
- </postGoal>
-
- <postGoal name="java:jar">
- <!-- build big jar -->
- <ant:mkdir dir="${maven.build.dir}/libs"/>
- <deploy:copy-deps
- todir="${maven.build.dir}/libs"
- excludes="junit,avalon-fortress-tools,ant,qdox,xalan"/>
-
- <ant:jar
destfile="${maven.build.dir}/${pom.artifactId}-complete-${pom.currentVersion}.jar"
duplicate="preserve">
- <ant:manifest>
- <ant:attribute name="Extension-Name"
value="${pom.aritfactId}-complete"/>
- <ant:attribute name="Specification-Vendor" value="Apache Software
Foundation"/>
- <ant:attribute name="Specification-Version"
value="${pom.currentVersion}"/>
- <ant:attribute name="Implementation-Vendor" value="Apache Software
Foundation"/>
- <ant:attribute name="Implementation-Version"
value="${pom.currentVersion}"/>
- </ant:manifest>
-
- <ant:zipfileset src="${maven.build.dir}/${maven.final.name}.jar"/>
- <ant:zipgroupfileset dir="${maven.build.dir}/libs" includes="*.zip"/>
- </ant:jar>
- </postGoal>
-
- <postGoal name="avalon:deploy-upload">
- <!-- upload big jar -->
- <ant:exec dir="." executable="${maven.scp.executable}">
- <ant:arg line="${scpopts}
target/${pom.artifactId}-complete-${pom.currentVersion}.jar
${repo}/${pom.groupId}/jars/"/>
- </ant:exec>
- </postGoal>
-
- <postGoal name="clean">
- <ant:delete dir="${maven.src.dir}/java"/>
- </postGoal>
-</project>
+<?xml version="1.0"?>
+
+<project default="check"
+ xmlns:j="jelly:core"
+ xmlns:ant="jelly:ant"
+ xmlns:deploy="deploy">
+
+ <!-- include the avalon-wide custom project properties -->
+ <property file="${basedir}/project.properties"/>
+ <property file="${basedir}/../project.properties"/>
+ <property file="${basedir}/../../project.properties"/>
+ <property file="${basedir}/../../../project.properties"/>
+ <property file="${basedir}/../../../../project.properties"/>
+
+ <goal name="check">
+ <!-- friendly error in case file is not available -->
+ <ant:available file="${avalon.buildsystem}/maven-common.xml"
+ property="buildsystem.available"/>
+ <j:set var="avalon.buildsystem.available" value="${buildsystem.available}"/>
+ <j:if test="${empty(avalon.buildsystem.available)}">
+ <ant:fail>
+ ===================================================================
+ BUILD SYSTEM FAILURE!
+ ===================================================================
+
+ a required file, ${avalon.buildsystem}/maven-common.xml, cannot be
+ found. Try setting the avalon.buildsystem property in
+ project.properties to the correct location.
+ </ant:fail>
+ </j:if>
+ </goal>
+
+ <!-- include the avalon-wide custom goal decorators from maven-common.xml -->
+ <j:import file="${avalon.buildsystem}/maven-common.xml" inherit="true"/>
+
+ <postGoal name="test:compile">
+ <attainGoal name="avalon:copy-sources"/>
+ <attainGoal name="avalon:init"/>
+
+ <ant:taskdef name="collect-meta"
+ classname="org.apache.avalon.fortress.tools.ComponentMetaInfoCollector">
+
+ <ant:classpath>
+ <ant:path refid="maven.dependency.classpath"/>
+ <ant:pathelement path="${api.build.dir}"/>
+ <ant:pathelement path="${impl.build.dir}"/>
+ <ant:pathelement path="${test.build.dir}"/>
+ </ant:classpath>
+ </ant:taskdef>
+
+ <collect-meta destdir="${test.build.dir}">
+ <fileset dir="${test.src.dir}"/>
+ </collect-meta>
+
+ <ant:copy todir="${test.build.dir}">
+ <ant:fileset dir="${test.src.dir}">
+ <ant:exclude name="**/*.java"/>
+ <ant:exclude name="**/package.html"/>
+ </ant:fileset>
+ </ant:copy>
+ </postGoal>
+
+ <postGoal name="java:jar">
+ <!-- build big jar -->
+ <ant:mkdir dir="${maven.build.dir}/libs"/>
+ <deploy:copy-deps
+ todir="${maven.build.dir}/libs"
+ excludes="junit,avalon-fortress-tools,ant,qdox,xalan"/>
+
+ <ant:jar
destfile="${maven.build.dir}/${pom.artifactId}-complete-${pom.currentVersion}.jar"
duplicate="preserve">
+ <ant:manifest>
+ <ant:attribute name="Extension-Name"
value="${pom.aritfactId}-complete"/>
+ <ant:attribute name="Specification-Vendor" value="Apache Software
Foundation"/>
+ <ant:attribute name="Specification-Version"
value="${pom.currentVersion}"/>
+ <ant:attribute name="Implementation-Vendor" value="Apache Software
Foundation"/>
+ <ant:attribute name="Implementation-Version"
value="${pom.currentVersion}"/>
+ </ant:manifest>
+
+ <ant:zipfileset src="${maven.build.dir}/${maven.final.name}.jar"/>
+ <ant:zipgroupfileset dir="${maven.build.dir}/libs" includes="*.zip"/>
+ </ant:jar>
+ </postGoal>
+
+ <postGoal name="avalon:deploy-upload">
+ <!-- upload big jar -->
+ <ant:exec dir="." executable="${maven.scp.executable}">
+ <ant:arg line="${scpopts}
target/${pom.artifactId}-complete-${pom.currentVersion}.jar
${repo}/${pom.groupId}/jars/"/>
+ </ant:exec>
+ </postGoal>
+
+ <postGoal name="clean">
+ <ant:delete dir="${maven.src.dir}/java"/>
+ </postGoal>
+</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
