mcconnell 2003/12/10 23:19:33
Modified: repository maven.xml project.xml
repository/test/src/test/org/apache/avalon/repository/main
DefaultInitialContextTest.java
Log:
Update to include avalon:dist.
Revision Changes Path
1.4 +163 -1 avalon/repository/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/repository/maven.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- maven.xml 8 Dec 2003 12:48:48 -0000 1.3
+++ maven.xml 11 Dec 2003 07:19:32 -0000 1.4
@@ -5,13 +5,37 @@
<ant:property name="maven.docs.src" value="${basedir}/site/xdocs"/>
<ant:property file="project.properties"/>
+ <ant:property name="maven.dist.assembly.dir"
+ value="${maven.build.dir}/temp"/>
+ <ant:property name="maven.dist.bin.archive.dir"
+ value="${maven.dist.assembly.dir}/bin"/>
+ <ant:property name="maven.dist.src.archive.dir"
+ value="${maven.dist.assembly.dir}/src"/>
+ <ant:property name="maven.dist.bin.assembly.dir"
+ value="${maven.dist.assembly.dir}/bin/${pom.artifactId}"/>
+ <ant:property name="maven.dist.src.assembly.dir"
+ value="${maven.dist.assembly.dir}/src/${pom.artifactId}"/>
+ <ant:property name="maven.dist.dir"
+ value="${maven.build.dir}/distributions"/>
+
<goal name="avalon:build" description="Build the Repository.">
+
<maven:reactor basedir="${basedir}"
includes="**/project.xml"
excludes="project.xml"
goals=""
banner="Building:"
- ignoreFailures="false" />
+ ignoreFailures="false"
+ postProcessing="true" />
+
+ <ant:copy todir="${maven.build.dir}">
+ <j:forEach var="child" items="${reactorProjects}">
+ <ant:fileset dir="${child.file.parentFile}/target">
+ <ant:include name="${child.artifactId}-${child.currentVersion}.jar"/>
+ </ant:fileset>
+ </j:forEach>
+ </ant:copy>
+
</goal>
<goal name="avalon:clean" prereqs="clean" description="Clean all subprojects.">
@@ -31,6 +55,144 @@
banner="Building site:"
ignoreFailures="false"/>
</goal>
+
+ <goal name="avalon:dist" prereqs="avalon:build,avalon:site,xdist">
+ </goal>
+
+ <goal name="xdist"
+ prereqs="xdist:build"
+ description="Build a complete distribution.">
+ </goal>
+
+ <goal
+ name="xdist:build"
+ prereqs="xdist:build-bin,xdist:build-src"
+ description="Build a complete distribution.">
+ </goal>
+
+ <goal
+ name="xdist:build-setup"
+ description="Set up directories for a distribution build">
+ <ant:delete dir="${maven.dist.dir}"/>
+ <ant:mkdir dir="${maven.dist.dir}"/>
+ </goal>
+
+
+ <goal
+ name="xdist:build-bin"
+ prereqs="xdist:build-setup,xdist:prepare-bin-filesystem"
+ description="Build the binary distribution.">
+
+ <!-- Create a tar.gz file -->
+ <ant:tar longfile="gnu" tarfile="${maven.dist.dir}/${maven.final.name}.tar">
+ <ant:tarfileset dir="${maven.dist.bin.archive.dir}"/>
+ </ant:tar>
+
+ <ant:gzip
+ zipfile="${maven.dist.dir}/${maven.final.name}.tar.gz"
+ src="${maven.dist.dir}/${maven.final.name}.tar"
+ />
+
+ <ant:delete file="${maven.dist.dir}/${maven.final.name}.tar"/>
+
+ <!-- Create a zip file -->
+ <ant:zip zipfile="${maven.dist.dir}/${maven.final.name}.zip">
+ <ant:zipfileset dir="${maven.dist.bin.archive.dir}"/>
+ </ant:zip>
+ </goal>
+
+ <goal
+ name="xdist:build-src"
+ prereqs="xdist:build-setup,xdist:prepare-src-filesystem"
+ description="Build the source distribution.">
+
+ <!-- Create a tar.gz file -->
+ <ant:tar longfile="gnu" tarfile="${maven.dist.dir}/${maven.final.name}-src.tar">
+ <ant:tarfileset dir="${maven.dist.src.archive.dir}"/>
+ </ant:tar>
+
+ <ant:gzip
+ zipfile="${maven.dist.dir}/${maven.final.name}-src.tar.gz"
+ src="${maven.dist.dir}/${maven.final.name}-src.tar"
+ />
+
+ <ant:delete file="${maven.dist.dir}/${maven.final.name}-src.tar"/>
+
+ <!-- Create a zip file -->
+ <ant:zip zipfile="${maven.dist.dir}/${maven.final.name}-src.zip">
+ <ant:zipfileset dir="${maven.dist.src.archive.dir}"/>
+ </ant:zip>
+
+ </goal>
+
+ <goal
+ name="xdist:prepare-bin-filesystem"
+ description="Builds the binary files.">
+
+ <ant:delete dir="${maven.dist.bin.assembly.dir}"/>
+ <ant:mkdir dir="${maven.dist.bin.assembly.dir}"/>
+ <ant:echo>
+ +-------------------------------------------------------+
+ | C R E A T I N G B I N A R Y D I S T R I B U T I O N |
+ +-------------------------------------------------------+
+ </ant:echo>
+ <ant:copy todir="${maven.dist.bin.assembly.dir}">
+ <ant:fileset dir=".">
+ <ant:include name="LICENSE*"/>
+ </ant:fileset>
+ </ant:copy>
+
+ <!-- Copy Jars -->
+ <ant:copy todir="${maven.dist.bin.assembly.dir}">
+ <ant:fileset dir="${maven.build.dir}">
+ <ant:include name="*.jar"/>
+ <ant:include name="docs/**"/>
+ </ant:fileset>
+ </ant:copy>
+ </goal>
+
+ <goal
+ name="xdist:prepare-src-filesystem"
+ description="Builds the source distribution file system.">
+ <ant:delete dir="${maven.dist.src.assembly.dir}" />
+ <ant:mkdir dir="${maven.dist.src.assembly.dir}" />
+
+ <ant:echo>
+ +-------------------------------------------------------+
+ | C R E A T I N G S O U R C E D I S T R I B U T I O N |
+ +-------------------------------------------------------+
+ </ant:echo>
+
+ <ant:copy todir="${maven.dist.src.assembly.dir}">
+ <ant:fileset dir=".">
+ <ant:include name="LICENSE*"/>
+ <ant:include name="project.properties"/>
+ <ant:include name="maven.xml"/>
+ <ant:include name="project.xml"/>
+ </ant:fileset>
+ </ant:copy>
+
+ <maven:reactor basedir="${basedir}"
+ includes="**/project.xml"
+ excludes="**/target/**,project.xml"
+ banner="Building:"
+ ignoreFailures="false"
+ postProcessing="true" />
+ <ant:copy todir="${maven.dist.src.assembly.dir}">
+ <j:forEach var="child" items="${reactorProjects}">
+ <ant:fileset dir="${child.file.parentFile}">
+ <ant:exclude name="**/target/**"/>
+ <ant:exclude name="**/*.log"/>
+ </ant:fileset>
+ </j:forEach>
+ </ant:copy>
+
+ <ant:copy todir="${maven.dist.src.assembly.dir}/site">
+ <ant:fileset dir="site"/>
+ </ant:copy>
+
+ </goal>
+
<goal name="xjavadoc">
<ant:mkdir dir="${maven.build.dir}/docs/api" />
1.3 +1 -1 avalon/repository/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/repository/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 4 Dec 2003 22:02:38 -0000 1.2
+++ project.xml 11 Dec 2003 07:19:32 -0000 1.3
@@ -6,7 +6,7 @@
<groupId>avalon</groupId>
<id>avalon-reposiory</id>
<name>Avalon Repository POM</name>
- <currentVersion>1.2-dev</currentVersion>
+ <currentVersion>1.2-RC1</currentVersion>
<organization>
<name>Apache Software Foundation</name>
1.5 +1 -7
avalon/repository/test/src/test/org/apache/avalon/repository/main/DefaultInitialContextTest.java
Index: DefaultInitialContextTest.java
===================================================================
RCS file:
/home/cvs/avalon/repository/test/src/test/org/apache/avalon/repository/main/DefaultInitialContextTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultInitialContextTest.java 9 Dec 2003 09:19:10 -0000 1.4
+++ DefaultInitialContextTest.java 11 Dec 2003 07:19:32 -0000 1.5
@@ -148,12 +148,6 @@
Env.getEnvVariable( "MAVEN_HOME_LOCAL" ) );
if( null != local ) return local;
- String maven =
- System.getProperty(
- "maven.home",
- Env.getEnvVariable( "MAVEN_HOME" ) );
- if( null != maven ) return maven;
-
return System.getProperty( "user.home" ) + File.separator + ".maven";
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
