Author: psteitz
Date: Wed Jan 5 09:36:26 2005
New Revision: 124233
URL: http://svn.apache.org/viewcvs?view=rev&rev=124233
Log:
Restored ant build.
Top-level script runs targets on subprojects. Jars that other subprojects
depend on are built first. The top-leve script is NOT maven-generated.
Subproject-level scripts are maven-generated, with the following changes:
-- "parentdir" and "xxxjarlocation" properties are defined, where "xxx" is the
name of any other naming subproject jar that the subproject being built
depends on. The property value set is
${parentdir}/xxx/target/xxx-core-0.8.jar"
-- pathelements for each "xxxjarlocation" are added to the build.classpath
-- in the copy task for the text files from parentdir, the generated absolute
path is changed to parentdir
-- for all but the config build, the src/conf copy is eliminated
-- the get tasks pointing to ibiblio for naming jars are eliminated
Added:
incubator/directory/naming/trunk/java/build.xml
incubator/directory/naming/trunk/management/build.xml
incubator/directory/naming/trunk/resources/build.xml
Modified:
incubator/directory/naming/trunk/build.xml
incubator/directory/naming/trunk/config/build.xml
incubator/directory/naming/trunk/core/build.xml
incubator/directory/naming/trunk/factory/build.xml
Modified: incubator/directory/naming/trunk/build.xml
Url:
http://svn.apache.org/viewcvs/incubator/directory/naming/trunk/build.xml?view=diff&rev=124233&p1=incubator/directory/naming/trunk/build.xml&r1=124232&p2=incubator/directory/naming/trunk/build.xml&r2=124233
==============================================================================
--- incubator/directory/naming/trunk/build.xml (original)
+++ incubator/directory/naming/trunk/build.xml Wed Jan 5 09:36:26 2005
@@ -1,30 +1,62 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project default="jar" name="directory-naming" basedir=".">
+<project default="jar" name="naming" basedir=".">
<!--
- Top level build for directory-naming to support limited ant
targetsfor gump integration.
- Only clean, test and jar are supported. The jar target produces
directory-naming-core and
- directory-naming-factory jars in core/dist, factory/dist directories,
with gump-style jar names.
+ Top level build for directory-naming.
+ Invokes targets on maven subproject directories. Build artifacts are created
in
+ subproject /target and /dist directories. For example, the jar goal creates
+ core/target/naming-core-0.8, factory/target/naming-factory-0.8 etc.
+
+ This script is NOT maven generated and should not be regenerated until
+ either the maven ant plugin supports multiprojects or maven.xml has been
+ modified to generate something like this.
-->
- <property name="DATE_STAMP" value="@@DATE@@"/>
+ <target name="jar-dependencies">
+ <ant dir="core" target="jar"/>
+ <ant dir="java" target="jar"/>
+ <ant dir="factory" target="jar"/>
+ </target>
- <target name="clean" description="Clean up the generated directories">
- <delete dir="${defaulttargetdir}"/>
+ <target name="clean" description="Clean">
<delete dir="${distdir}"/>
<ant dir="core" target="clean"/>
<ant dir="factory" target="clean"/>
+ <ant dir="java" target="clean"/>
+ <ant dir="management" target="clean"/>
+ <ant dir="resources" target="clean"/>
+ <ant dir="config" target="clean"/>
</target>
- <target name="test" description="Run the test cases" >
- <ant dir="core" target="test"/>
- <ant dir="factory" target="test"/>
+ <target name="test" depends="jar-dependencies" description="Test">
+ <ant dir="management" target="test"/>
+ <ant dir="resources" target="test"/>
+ <ant dir="config" target="test"/>
</target>
- <target name="jar" depends="clean" description="Create the jars">
- <ant dir="core" target="jar"/>
- <ant dir="factory" target="jar"/>
+ <target name="jar" depends="jar-dependencies" description="Jar">
+ <ant dir="mangement" target="jar"/>
+ <ant dir="resources" target="jar"/>
+ <ant dir="config" target="jar"/>
+ </target>
+
+ <target name="dist" description="Dist">
+ <ant dir="core" target="dist"/>
+ <ant dir="java" target="dist"/>
+ <ant dir="factory" target="dist"/>
+ <ant dir="management" target="dist"/>
+ <ant dir="resources" target="dist"/>
+ <ant dir="config" target="dist"/>
+ </target>
+
+ <target name="javadoc" depends="jar-dependencies" description="Javadoc">
+ <ant dir="core" target="javadoc"/>
+ <ant dir="java" target="javadoc"/>
+ <ant dir="factory" target="javadoc"/>
+ <ant dir="management" target="javadoc"/>
+ <ant dir="resources" target="javadoc"/>
+ <ant dir="config" target="javadoc"/>
</target>
-</project>
\ No newline at end of file
+</project>
Modified: incubator/directory/naming/trunk/config/build.xml
Url:
http://svn.apache.org/viewcvs/incubator/directory/naming/trunk/config/build.xml?view=diff&rev=124233&p1=incubator/directory/naming/trunk/config/build.xml&r1=124232&p2=incubator/directory/naming/trunk/config/build.xml&r2=124233
==============================================================================
--- incubator/directory/naming/trunk/config/build.xml (original)
+++ incubator/directory/naming/trunk/config/build.xml Wed Jan 5 09:36:26 2005
@@ -1,35 +1,77 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- build.xml for directory-naming-config to support gump integration and
ant
- command line builds. This build script gets dependent jars from
ibibilio, with the
- exception of javamail and jta jars, which it tries to load from the
local maven
- repository, located at ${localrepo}. If build.sysclasspath is set to
"only", dependent
- jars are expected to be available via the system classpath.
- No dist target is provided.
+ This script is maven-generated, with the following changes:
+
+ - "parentdir" and "xxxjarlocation" properties are defined, where "xxx" is the
+ name of any other naming subproject jar that the subproject being built
+ depends on. The property value set is
+ ${parentdir}/xxx/target/xxx-core-0.8.jar"
+ - pathelements for each "xxxjarlocation" are added to the build.classpath
+ - in the copy task for the text files from parentdir, the generated absolute
+ path is changed to parentdir
+ - for all but the config build, the src/conf copy is eliminated
+ - the get tasks pointing to ibiblio for naming jars are eliminated
+
+ This script should NOT be regenerated unless the changes above are
+ post-applied, the maven ant plugin is extended to support multiprojects,
+ or maven.xml is modified to make equivalent changes automatically.
-->
-<project default="jar" name="directory-naming-config" basedir=".">
- <property name="defaulttargetdir" value="target"/>
- <property name="libdir" value="target/lib"/>
- <property name="classesdir" value="target/classes"/>
- <property name="testclassesdir" value="target/test-classes"/>
- <property name="testreportdir" value="target/test-reports"/>
- <property name="distdir" value="dist"/>
- <property name="javadocdir" value="dist/docs/api"/>
- <property name="coredir" value="../core"/>
- <property name="coreclassesdir" value="../core/target/classes"/>
- <property name="localrepo" value="${user.home}/.maven/repository"/>
- <property name="final.name" value="directory-naming-config-${DATE_STAMP}"/>
-
- <target name="init" description="Initializes some properties">
- <mkdir dir="${libdir}"/>
+<project default="jar" name="naming-config" basedir=".">
+ <!-- Additions to maven-generated content -->
+ <property name="parentdir" value=".."></property>
+ <property name="corejarlocation"
+ value="${parentdir}/core/target/naming-core-0.8.jar">
+ </property>
+ <property name="factoryjarlocation"
+ value="${parentdir}/factory/target/naming-factory-0.8.jar">
+ </property>
+ <property name="javajarlocation"
+ value="${parentdir}/java/target/naming-java-0.8.jar">
+ </property>
+ <!-- End additions to maven-generated content -->
+ <property name="defaulttargetdir" value="target">
+ </property>
+ <property name="libdir" value="target/lib">
+ </property>
+ <property name="classesdir" value="target/classes">
+ </property>
+ <property name="testclassesdir" value="target/test-classes">
+ </property>
+ <property name="testclassesdir" value="target/test-classes">
+ </property>
+ <property name="testreportdir" value="target/test-reports">
+ </property>
+ <property name="distdir" value="dist">
+ </property>
+ <property name="javadocdir" value="dist/docs/api">
+ </property>
+ <property name="final.name" value="naming-config-0.8">
+ </property>
+ <path id="build.classpath">
+ <fileset dir="${libdir}">
+ <include name="**/*.jar">
+ </include>
+ </fileset>
+<!-- Additions to maven-generated content -->
+ <pathelement location="${corejarlocation}"/>
+ <pathelement location="${factoryjarlocation}"/>
+ <pathelement location="${javajarlocation}"/>
+<!-- End additions to maven-generated content -->
+ </path>
+ <target name="init" description="o Initializes some properties">
+ <mkdir dir="${libdir}">
+ </mkdir>
<condition property="noget">
<equals arg2="only" arg1="${build.sysclasspath}">
</equals>
</condition>
+ <!--Test if JUNIT is present in ANT classpath-->
+
+ <available property="Junit.present" classname="junit.framework.Test">
+ </available>
</target>
-
<target name="compile" description="o Compile the code" depends="get-deps">
<mkdir dir="${classesdir}">
</mkdir>
@@ -38,15 +80,22 @@
<pathelement location="src/java">
</pathelement>
</src>
- <classpath>
- <fileset dir="${libdir}">
- <include name="*.jar">
- </include>
- </fileset>
- <pathelement path="${coreclassesdir}">
- </pathelement>
+ <classpath refid="build.classpath">
</classpath>
</javac>
+ <mkdir dir="${classesdir}/META-INF">
+ </mkdir>
+ <copy todir="${classesdir}/META-INF">
+ <!-- Change from maven-generated abolute path -->
+ <fileset dir="${parentdir}">
+ <include name="LICENSE.txt">
+ </include>
+ <include name="NOTICE.txt">
+ </include>
+ <include name="INCUBATOR-DISCLAIMER.txt">
+ </include>
+ </fileset>
+ </copy>
<copy todir="${classesdir}">
<fileset dir="src/java">
<include name="**/*.properties">
@@ -59,33 +108,32 @@
</include>
</fileset>
</copy>
- <copy todir="${testclassesdir}">
- <fileset dir="src/test">
- <include name="**/*.xml">
- </include>
- <include name="**/*.properties">
- </include>
- </fileset>
- </copy>
</target>
-
<target name="jar" description="o Create the jar" depends="compile,test">
- <mkdir dir="${distdir}"/>
- <jar jarfile="${distdir}/${final.name}.jar" excludes="**/package.html"
basedir="${classesdir}"/>
+ <jar jarfile="${defaulttargetdir}/${final.name}.jar"
excludes="**/package.html" basedir="${classesdir}">
+ </jar>
</target>
-
<target name="clean" description="o Clean up the generated directories">
<delete dir="${defaulttargetdir}">
</delete>
<delete dir="${distdir}">
</delete>
</target>
-
+ <target name="dist" description="o Create a distribution" depends="jar,
javadoc">
+ <mkdir dir="dist">
+ </mkdir>
+ <copy todir="dist">
+ <fileset dir="${defaulttargetdir}" includes="*.jar">
+ </fileset>
+ <fileset dir="${basedir}" includes="LICENSE*, README*">
+ </fileset>
+ </copy>
+ </target>
<target name="test" description="o Run the test cases" if="test.failure"
depends="internal-test">
<fail message="There were test failures.">
</fail>
</target>
- <target name="internal-test" depends="compile-tests">
+ <target name="internal-test" if="Junit.present"
depends="junit-present,compile-tests">
<mkdir dir="${testreportdir}">
</mkdir>
<junit dir="./" failureproperty="test.failure" printSummary="yes"
fork="true" haltonerror="true">
@@ -96,27 +144,29 @@
<formatter usefile="false" type="plain">
</formatter>
<classpath>
- <fileset dir="${libdir}">
- <include name="*.jar">
- </include>
- </fileset>
+ <path refid="build.classpath">
+ </path>
<pathelement path="${testclassesdir}">
</pathelement>
<pathelement path="${classesdir}">
</pathelement>
- <pathelement path="${coreclassesdir}">
- </pathelement>
</classpath>
<batchtest todir="${testreportdir}">
<fileset dir="src/test">
<include name="**/*Test*">
</include>
+ <exclude name="**/Abstract*">
+ </exclude>
</fileset>
</batchtest>
</junit>
</target>
-
- <target name="compile-tests" depends="compile">
+ <target name="junit-present" unless="Junit.present" depends="init">
+ <echo>================================= WARNING
================================</echo>
+ <echo>Junit isn't present in your ${ANT_HOME}/lib directory. Tests not
executed.</echo>
+
<echo>==========================================================================</echo>
+ </target>
+ <target name="compile-tests" if="Junit.present"
depends="junit-present,compile">
<mkdir dir="${testclassesdir}">
</mkdir>
<javac destdir="${testclassesdir}" deprecation="true" debug="true"
optimize="false" excludes="**/package.html">
@@ -125,19 +175,22 @@
</pathelement>
</src>
<classpath>
- <fileset dir="${libdir}">
- <include name="*.jar">
- </include>
- </fileset>
+ <path refid="build.classpath">
+ </path>
<pathelement path="${classesdir}">
</pathelement>
- <pathelement path="${coreclassesdir}">
- </pathelement>
</classpath>
</javac>
+ <copy todir="${testclassesdir}">
+ <fileset dir="src/test">
+ <include name="**/*.xml">
+ </include>
+ <include name="**/*.properties">
+ </include>
+ </fileset>
+ </copy>
</target>
-
- <target name="javadoc" description="o Generate javadoc" depends="jar">
+ <target name="javadoc" description="o Generate javadoc" depends="get-deps">
<mkdir dir="${javadocdir}">
</mkdir>
<tstamp>
@@ -146,33 +199,53 @@
</tstamp>
<property name="copyright" value="Copyright &copy; Apache Software
Foundation. All Rights Reserved.">
</property>
- <property name="title" value="Naming Factories SNAPSHOT API">
+ <property name="title" value="Naming Config 0.8 API">
</property>
<javadoc use="true" private="true" destdir="${javadocdir}" author="true"
version="true" sourcepath="src/java" packagenames="org.apache.naming.*">
<classpath>
- <fileset dir="${libdir}">
- <include name="*.jar">
- </include>
- </fileset>
- <pathelement location="target/${final.name}.jar">
- </pathelement>
+ <path refid="build.classpath">
+ </path>
</classpath>
</javadoc>
</target>
-
<target name="get-deps" unless="noget" depends="init">
-
- <get dest="${libdir}/commons-logging-1.0.3.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-logging/jars/commons-logging-1.0.3.jar"/>
- <get dest="${libdir}/commons-lang-1.0.1.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-lang/jars/commons-lang-1.0.1.jar"/>
- <get dest="${libdir}/commons-digester-1.4.1.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-digester/jars/commons-digester-1.4.1.jar"/>
- <get dest="${libdir}/commons-beanutils-1.6.1.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-beanutils/jars/commons-beanutils-1.6.1.jar"/>
- <get dest="${libdir}/commons-dbcp-1.0.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-dbcp/jars/commons-dbcp-1.0.jar"/>
- <get dest="${libdir}/commons-pool-1.0.1.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-pool/jars/commons-pool-1.0.1.jar"/>
- <get dest="${libdir}/hsqldb-1.7.1.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/hsqldb/jars/hsqldb-1.7.1.jar"/>
- <get dest="${libdir}/commons-collections-2.1.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-collections/jars/commons-collections-2.1.jar"/>
- <get dest="${libdir}/mx4j-jmx-1.1.1.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/mx4j/jars/mx4j-jmx-1.1.1.jar"/>
- <get dest="${libdir}/junit-3.8.1.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/junit/jars/junit-3.8.1.jar"/>
- <get dest="${libdir}/ant-1.5.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/ant/jars/ant-1.5.jar"/>
- <get dest="${libdir}/ant-optional-1.5.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/ant/jars/ant-optional-1.5.jar"/>
+ <!--Proxy settings works only with a JDK 1.2 and higher.-->
+
+ <setproxy>
+ </setproxy>
+<!-- Maven-generated content replaced by local references above
+ <get dest="${libdir}/naming-core-0.8.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/incubator-directory/jars/naming-core-0.8.jar";>
+ </get>
+ <get dest="${libdir}/naming-factory-0.8.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/incubator-directory/jars/naming-factory-0.8.jar";>
+ </get>
+-->
+ <get dest="${libdir}/commons-logging-1.0.3.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-logging/jars/commons-logging-1.0.3.jar";>
+ </get>
+ <get dest="${libdir}/commons-lang-1.0.1.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-lang/jars/commons-lang-1.0.1.jar";>
+ </get>
+ <get dest="${libdir}/commons-digester-1.4.1.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-digester/jars/commons-digester-1.4.1.jar";>
+ </get>
+<!-- Maven-generated content replaced by local references above
+ <get dest="${libdir}/naming-java-0.8.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/incubator-directory/jars/naming-java-0.8.jar";>
+ </get>
+-->
+ <get dest="${libdir}/commons-beanutils-1.6.1.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-beanutils/jars/commons-beanutils-1.6.1.jar";>
+ </get>
+ <get dest="${libdir}/commons-collections-3.1.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-collections/jars/commons-collections-3.1.jar";>
+ </get>
+ <get dest="${libdir}/commons-dbcp-1.0.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-dbcp/jars/commons-dbcp-1.0.jar";>
+ </get>
+ <get dest="${libdir}/commons-pool-1.0.1.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-pool/jars/commons-pool-1.0.1.jar";>
+ </get>
+ <get dest="${libdir}/hsqldb-1.7.1.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/hsqldb/jars/hsqldb-1.7.1.jar";>
+ </get>
+ <get dest="${libdir}/junit-3.8.1.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/junit/jars/junit-3.8.1.jar";>
+ </get>
+ </target>
+ <target name="install-maven">
+ <get dest="${user.home}/maven-install-latest.jar" usetimestamp="true"
src="${repo}/maven/maven-install-latest.jar">
+ </get>
+ <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
+ </unjar>
</target>
</project>
Modified: incubator/directory/naming/trunk/core/build.xml
Url:
http://svn.apache.org/viewcvs/incubator/directory/naming/trunk/core/build.xml?view=diff&rev=124233&p1=incubator/directory/naming/trunk/core/build.xml&r1=124232&p2=incubator/directory/naming/trunk/core/build.xml&r2=124233
==============================================================================
--- incubator/directory/naming/trunk/core/build.xml (original)
+++ incubator/directory/naming/trunk/core/build.xml Wed Jan 5 09:36:26 2005
@@ -1,31 +1,63 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- build.xml for directory-naming-core to support gump integration and
ant
- command line builds. This build script gets dependent jars from
ibibilio,
- unless build.sysclasspath is set to "only" (as gump will do).
- No dist target is provided.
--->
+ This script is maven-generated, with the following changes:
+
+ - "parentdir" and "xxxjarlocation" properties are defined, where "xxx" is the
+ name of any other naming subproject jar that the subproject being built
+ depends on. The property value set is
+ ${parentdir}/xxx/target/xxx-core-0.8.jar"
+ - pathelements for each "xxxjarlocation" are added to the build.classpath
+ - in the copy task for the text files from parentdir, the generated absolute
+ path is changed to parentdir
+ - for all but the config build, the src/conf copy is eliminated
+ - the get tasks pointing to ibiblio for naming jars are eliminated
-<project default="jar" name="directory-naming-core" basedir=".">
+ This script should NOT be regenerated unless the changes above are
+ post-applied, the maven ant plugin is extended to support multiprojects,
+ or maven.xml is modified to make equivalent changes automatically.
+-->
- <property name="defaulttargetdir" value="target"/>
- <property name="libdir" value="target/lib"/>
- <property name="classesdir" value="target/classes"/>
- <property name="testclassesdir" value="target/test-classes"/>
- <property name="testreportdir" value="target/test-reports"/>
- <property name="distdir" value="dist"/>
- <property name="javadocdir" value="dist/docs/api"/>
- <property name="final.name" value="directory-naming-core-${DATE_STAMP}"/>
-
+<project default="jar" name="naming-core" basedir=".">
+ <!-- Addition to maven-generated content -->
+ <property name="parentdir" value=".."></property>
+ <!-- End additions to maven-generated content -->
+ <property name="defaulttargetdir" value="target">
+ </property>
+ <property name="libdir" value="target/lib">
+ </property>
+ <property name="classesdir" value="target/classes">
+ </property>
+ <property name="testclassesdir" value="target/test-classes">
+ </property>
+ <property name="testclassesdir" value="target/test-classes">
+ </property>
+ <property name="testreportdir" value="target/test-reports">
+ </property>
+ <property name="distdir" value="dist">
+ </property>
+ <property name="javadocdir" value="dist/docs/api">
+ </property>
+ <property name="final.name" value="naming-core-0.8">
+ </property>
+ <path id="build.classpath">
+ <fileset dir="${libdir}">
+ <include name="**/*.jar">
+ </include>
+ </fileset>
+ </path>
<target name="init" description="o Initializes some properties">
<mkdir dir="${libdir}">
</mkdir>
<condition property="noget">
- <equals arg2="only" arg1="${build.sysclasspath}"/>
+ <equals arg2="only" arg1="${build.sysclasspath}">
+ </equals>
</condition>
+ <!--Test if JUNIT is present in ANT classpath-->
+
+ <available property="Junit.present" classname="junit.framework.Test">
+ </available>
</target>
-
<target name="compile" description="o Compile the code" depends="get-deps">
<mkdir dir="${classesdir}">
</mkdir>
@@ -34,47 +66,62 @@
<pathelement location="src/java">
</pathelement>
</src>
- <classpath>
- <fileset dir="${libdir}">
- <include name="*.jar">
- </include>
- </fileset>
+ <classpath refid="build.classpath">
</classpath>
</javac>
+ <mkdir dir="${classesdir}/META-INF">
+ </mkdir>
+ <copy todir="${classesdir}/META-INF">
+ <!-- Change from maven-generated abolute path -->
+ <fileset dir="${parentdir}">
+ <include name="LICENSE.txt">
+ </include>
+ <include name="NOTICE.txt">
+ </include>
+ <include name="INCUBATOR-DISCLAIMER.txt">
+ </include>
+ </fileset>
+ </copy>
<copy todir="${classesdir}">
<fileset dir="src/java">
<include name="**/*.properties">
</include>
</fileset>
</copy>
- <copy todir="${testclassesdir}">
- <fileset dir="src/test">
- <include name="**/*.xml">
- </include>
- <include name="**/*.properties">
+<!-- Eliminate maven-generated content
+ <copy todir="${classesdir}">
+ <fileset dir="src/conf">
+ <include name="**/*.dtd">
</include>
</fileset>
</copy>
+-->
</target>
-
<target name="jar" description="o Create the jar" depends="compile,test">
- <mkdir dir="${distdir}"/>
- <jar jarfile="${distdir}/${final.name}.jar" excludes="**/package.html"
basedir="${classesdir}">
+ <jar jarfile="${defaulttargetdir}/${final.name}.jar"
excludes="**/package.html" basedir="${classesdir}">
</jar>
</target>
-
<target name="clean" description="o Clean up the generated directories">
<delete dir="${defaulttargetdir}">
</delete>
<delete dir="${distdir}">
</delete>
</target>
-
+ <target name="dist" description="o Create a distribution" depends="jar,
javadoc">
+ <mkdir dir="dist">
+ </mkdir>
+ <copy todir="dist">
+ <fileset dir="${defaulttargetdir}" includes="*.jar">
+ </fileset>
+ <fileset dir="${basedir}" includes="LICENSE*, README*">
+ </fileset>
+ </copy>
+ </target>
<target name="test" description="o Run the test cases" if="test.failure"
depends="internal-test">
<fail message="There were test failures.">
</fail>
</target>
- <target name="internal-test" depends="compile-tests">
+ <target name="internal-test" if="Junit.present"
depends="junit-present,compile-tests">
<mkdir dir="${testreportdir}">
</mkdir>
<junit dir="./" failureproperty="test.failure" printSummary="yes"
fork="true" haltonerror="true">
@@ -85,10 +132,8 @@
<formatter usefile="false" type="plain">
</formatter>
<classpath>
- <fileset dir="${libdir}">
- <include name="*.jar">
- </include>
- </fileset>
+ <path refid="build.classpath">
+ </path>
<pathelement path="${testclassesdir}">
</pathelement>
<pathelement path="${classesdir}">
@@ -104,7 +149,12 @@
</batchtest>
</junit>
</target>
- <target name="compile-tests" depends="compile">
+ <target name="junit-present" unless="Junit.present" depends="init">
+ <echo>================================= WARNING
================================</echo>
+ <echo>Junit isn't present in your ${ANT_HOME}/lib directory. Tests not
executed.</echo>
+
<echo>==========================================================================</echo>
+ </target>
+ <target name="compile-tests" if="Junit.present"
depends="junit-present,compile">
<mkdir dir="${testclassesdir}">
</mkdir>
<javac destdir="${testclassesdir}" deprecation="true" debug="true"
optimize="false" excludes="**/package.html">
@@ -113,17 +163,22 @@
</pathelement>
</src>
<classpath>
- <fileset dir="${libdir}">
- <include name="*.jar">
- </include>
- </fileset>
+ <path refid="build.classpath">
+ </path>
<pathelement path="${classesdir}">
</pathelement>
</classpath>
</javac>
+ <copy todir="${testclassesdir}">
+ <fileset dir="src/test">
+ <include name="**/*.xml">
+ </include>
+ <include name="**/*.properties">
+ </include>
+ </fileset>
+ </copy>
</target>
-
- <target name="javadoc" description="o Generate javadoc" depends="jar">
+ <target name="javadoc" description="o Generate javadoc" depends="get-deps">
<mkdir dir="${javadocdir}">
</mkdir>
<tstamp>
@@ -132,31 +187,29 @@
</tstamp>
<property name="copyright" value="Copyright &copy; Apache Software
Foundation. All Rights Reserved.">
</property>
- <property name="title" value="Core SNAPSHOT API">
+ <property name="title" value="Naming Core 0.8 API">
</property>
<javadoc use="true" private="true" destdir="${javadocdir}" author="true"
version="true" sourcepath="src/java" packagenames="org.apache.naming.*">
<classpath>
- <fileset dir="${libdir}">
- <include name="*.jar">
- </include>
- </fileset>
- <pathelement location="target/${final.name}.jar">
- </pathelement>
+ <path refid="build.classpath">
+ </path>
</classpath>
</javadoc>
</target>
-
<target name="get-deps" unless="noget" depends="init">
- <get dest="${libdir}/commons-collections-2.1.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-collections/jars/commons-collections-2.1.jar";>
- </get>
- <get dest="${libdir}/mx4j-jmx-1.1.1.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/mx4j/jars/mx4j-jmx-1.1.1.jar";>
+ <!--Proxy settings works only with a JDK 1.2 and higher.-->
+
+ <setproxy>
+ </setproxy>
+ <get dest="${libdir}/commons-logging-1.0.3.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-logging/jars/commons-logging-1.0.3.jar";>
</get>
<get dest="${libdir}/junit-3.8.1.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/junit/jars/junit-3.8.1.jar";>
</get>
- <get dest="${libdir}/ant-1.5.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/ant/jars/ant-1.5.jar";>
- </get>
- <get dest="${libdir}/ant-optional-1.5.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/ant/jars/ant-optional-1.5.jar";>
+ </target>
+ <target name="install-maven">
+ <get dest="${user.home}/maven-install-latest.jar" usetimestamp="true"
src="${repo}/maven/maven-install-latest.jar">
</get>
+ <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
+ </unjar>
</target>
-
</project>
Modified: incubator/directory/naming/trunk/factory/build.xml
Url:
http://svn.apache.org/viewcvs/incubator/directory/naming/trunk/factory/build.xml?view=diff&rev=124233&p1=incubator/directory/naming/trunk/factory/build.xml&r1=124232&p2=incubator/directory/naming/trunk/factory/build.xml&r2=124233
==============================================================================
--- incubator/directory/naming/trunk/factory/build.xml (original)
+++ incubator/directory/naming/trunk/factory/build.xml Wed Jan 5 09:36:26 2005
@@ -1,35 +1,68 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- build.xml for directory-naming-factory to support gump integration
and ant
- command line builds. This build script gets dependent jars from
ibibilio, with the
- exception of javamail and jta jars, which it tries to load from the
local maven
- repository, located at ${localrepo}. If build.sysclasspath is set to
"only", dependent
- jars are expected to be available via the system classpath.
- No dist target is provided.
+ This script is maven-generated, with the following changes:
+
+ - "parentdir" and "xxxjarlocation" properties are defined, where "xxx" is the
+ name of any other naming subproject jar that the subproject being built
+ depends on. The property value set is
+ ${parentdir}/xxx/target/xxx-core-0.8.jar"
+ - pathelements for each "xxxjarlocation" are added to the build.classpath
+ - in the copy task for the text files from parentdir, the generated absolute
+ path is changed to parentdir
+ - for all but the config build, the src/conf copy is eliminated
+ - the get tasks pointing to ibiblio for naming jars are eliminated
+
+ This script should NOT be regenerated unless the changes above are
+ post-applied, the maven ant plugin is extended to support multiprojects,
+ or maven.xml is modified to make equivalent changes automatically.
-->
-<project default="jar" name="directory-naming-factory" basedir=".">
- <property name="defaulttargetdir" value="target"/>
- <property name="libdir" value="target/lib"/>
- <property name="classesdir" value="target/classes"/>
- <property name="testclassesdir" value="target/test-classes"/>
- <property name="testreportdir" value="target/test-reports"/>
- <property name="distdir" value="dist"/>
- <property name="javadocdir" value="dist/docs/api"/>
- <property name="coredir" value="../core"/>
- <property name="coreclassesdir" value="../core/target/classes"/>
- <property name="localrepo" value="${user.home}/.maven/repository"/>
- <property name="final.name" value="directory-naming-factory-${DATE_STAMP}"/>
-
- <target name="init" description="Initializes some properties">
- <mkdir dir="${libdir}"/>
+<project default="jar" name="naming-factory" basedir=".">
+<!-- Additions to maven-generated content -->
+ <property name="parentdir" value=".."></property>
+ <property name="corejarlocation"
+ value="${parentdir}/core/target/naming-core-0.8.jar">
+ </property>
+<!-- End addition to maven-generated content -->
+ <property name="defaulttargetdir" value="target">
+ </property>
+ <property name="libdir" value="target/lib">
+ </property>
+ <property name="classesdir" value="target/classes">
+ </property>
+ <property name="testclassesdir" value="target/test-classes">
+ </property>
+ <property name="testclassesdir" value="target/test-classes">
+ </property>
+ <property name="testreportdir" value="target/test-reports">
+ </property>
+ <property name="distdir" value="dist">
+ </property>
+ <property name="javadocdir" value="dist/docs/api">
+ </property>
+ <property name="final.name" value="naming-factory-0.8">
+ </property>
+ <path id="build.classpath">
+ <fileset dir="${libdir}">
+ <include name="**/*.jar">
+ </include>
+ </fileset>
+ <!-- Addition to maven-generated content -->
+ <pathelement location="${corejarlocation}"/>
+ </path>
+ <target name="init" description="o Initializes some properties">
+ <mkdir dir="${libdir}">
+ </mkdir>
<condition property="noget">
<equals arg2="only" arg1="${build.sysclasspath}">
</equals>
</condition>
+ <!--Test if JUNIT is present in ANT classpath-->
+
+ <available property="Junit.present" classname="junit.framework.Test">
+ </available>
</target>
-
<target name="compile" description="o Compile the code" depends="get-deps">
<mkdir dir="${classesdir}">
</mkdir>
@@ -38,54 +71,62 @@
<pathelement location="src/java">
</pathelement>
</src>
- <classpath>
- <fileset dir="${libdir}">
- <include name="*.jar">
- </include>
- </fileset>
- <pathelement path="${coreclassesdir}">
- </pathelement>
+ <classpath refid="build.classpath">
</classpath>
</javac>
+ <mkdir dir="${classesdir}/META-INF">
+ </mkdir>
+ <copy todir="${classesdir}/META-INF">
+ <!-- Change from maven-generated abolute path -->
+ <fileset dir="${parentdir}">
+ <include name="LICENSE.txt">
+ </include>
+ <include name="NOTICE.txt">
+ </include>
+ <include name="INCUBATOR-DISCLAIMER.txt">
+ </include>
+ </fileset>
+ </copy>
<copy todir="${classesdir}">
<fileset dir="src/java">
<include name="**/*.properties">
</include>
</fileset>
</copy>
+<!-- Eliminate maven-generated contet
<copy todir="${classesdir}">
<fileset dir="src/conf">
<include name="**/*.dtd">
</include>
</fileset>
</copy>
- <copy todir="${testclassesdir}">
- <fileset dir="src/test">
- <include name="**/*.xml">
- </include>
- <include name="**/*.properties">
- </include>
- </fileset>
- </copy>
+-->
</target>
-
<target name="jar" description="o Create the jar" depends="compile,test">
- <mkdir dir="${distdir}"/>
- <jar jarfile="${distdir}/${final.name}.jar" excludes="**/package.html"
basedir="${classesdir}"/>
+ <jar jarfile="${defaulttargetdir}/${final.name}.jar"
excludes="**/package.html" basedir="${classesdir}">
+ </jar>
</target>
-
<target name="clean" description="o Clean up the generated directories">
<delete dir="${defaulttargetdir}">
</delete>
<delete dir="${distdir}">
</delete>
</target>
-
+ <target name="dist" description="o Create a distribution" depends="jar,
javadoc">
+ <mkdir dir="dist">
+ </mkdir>
+ <copy todir="dist">
+ <fileset dir="${defaulttargetdir}" includes="*.jar">
+ </fileset>
+ <fileset dir="${basedir}" includes="LICENSE*, README*">
+ </fileset>
+ </copy>
+ </target>
<target name="test" description="o Run the test cases" if="test.failure"
depends="internal-test">
<fail message="There were test failures.">
</fail>
</target>
- <target name="internal-test" depends="compile-tests">
+ <target name="internal-test" if="Junit.present"
depends="junit-present,compile-tests">
<mkdir dir="${testreportdir}">
</mkdir>
<junit dir="./" failureproperty="test.failure" printSummary="yes"
fork="true" haltonerror="true">
@@ -96,27 +137,29 @@
<formatter usefile="false" type="plain">
</formatter>
<classpath>
- <fileset dir="${libdir}">
- <include name="*.jar">
- </include>
- </fileset>
+ <path refid="build.classpath">
+ </path>
<pathelement path="${testclassesdir}">
</pathelement>
<pathelement path="${classesdir}">
</pathelement>
- <pathelement path="${coreclassesdir}">
- </pathelement>
</classpath>
<batchtest todir="${testreportdir}">
<fileset dir="src/test">
<include name="**/*Test*">
</include>
+ <exclude name="**/Abstract*">
+ </exclude>
</fileset>
</batchtest>
</junit>
</target>
-
- <target name="compile-tests" depends="compile">
+ <target name="junit-present" unless="Junit.present" depends="init">
+ <echo>================================= WARNING
================================</echo>
+ <echo>Junit isn't present in your ${ANT_HOME}/lib directory. Tests not
executed.</echo>
+
<echo>==========================================================================</echo>
+ </target>
+ <target name="compile-tests" if="Junit.present"
depends="junit-present,compile">
<mkdir dir="${testclassesdir}">
</mkdir>
<javac destdir="${testclassesdir}" deprecation="true" debug="true"
optimize="false" excludes="**/package.html">
@@ -125,19 +168,22 @@
</pathelement>
</src>
<classpath>
- <fileset dir="${libdir}">
- <include name="*.jar">
- </include>
- </fileset>
+ <path refid="build.classpath">
+ </path>
<pathelement path="${classesdir}">
</pathelement>
- <pathelement path="${coreclassesdir}">
- </pathelement>
</classpath>
</javac>
+ <copy todir="${testclassesdir}">
+ <fileset dir="src/test">
+ <include name="**/*.xml">
+ </include>
+ <include name="**/*.properties">
+ </include>
+ </fileset>
+ </copy>
</target>
-
- <target name="javadoc" description="o Generate javadoc" depends="jar">
+ <target name="javadoc" description="o Generate javadoc" depends="get-deps">
<mkdir dir="${javadocdir}">
</mkdir>
<tstamp>
@@ -146,42 +192,36 @@
</tstamp>
<property name="copyright" value="Copyright &copy; Apache Software
Foundation. All Rights Reserved.">
</property>
- <property name="title" value="Naming Factories SNAPSHOT API">
+ <property name="title" value="Naming Factories 0.8 API">
</property>
<javadoc use="true" private="true" destdir="${javadocdir}" author="true"
version="true" sourcepath="src/java" packagenames="org.apache.naming.*">
<classpath>
- <fileset dir="${libdir}">
- <include name="*.jar">
- </include>
- </fileset>
- <pathelement location="target/${final.name}.jar">
- </pathelement>
+ <path refid="build.classpath">
+ </path>
</classpath>
</javadoc>
</target>
-
<target name="get-deps" unless="noget" depends="init">
-
- <copy todir="${libdir}">
- <fileset dir="${localrepo}/jta-spec/jars">
- <include name="jta-spec-1.0.1.jar"/>
- </fileset>
- <fileset dir="${localrepo}/javamail/jars/">
- <include name="javamail-1.2.jar"/>
- </fileset>
- </copy>
+ <!--Proxy settings works only with a JDK 1.2 and higher.-->
+
+ <setproxy>
+ </setproxy>
- <get dest="${libdir}/commons-logging-1.0.3.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-logging/jars/commons-logging-1.0.3.jar"/>
- <get dest="${libdir}/commons-lang-1.0.1.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-lang/jars/commons-lang-1.0.1.jar"/>
- <get dest="${libdir}/commons-digester-1.4.1.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-digester/jars/commons-digester-1.4.1.jar"/>
- <get dest="${libdir}/commons-beanutils-1.6.1.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-beanutils/jars/commons-beanutils-1.6.1.jar"/>
- <get dest="${libdir}/commons-dbcp-1.0.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-dbcp/jars/commons-dbcp-1.0.jar"/>
- <get dest="${libdir}/commons-pool-1.0.1.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-pool/jars/commons-pool-1.0.1.jar"/>
- <get dest="${libdir}/hsqldb-1.7.1.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/hsqldb/jars/hsqldb-1.7.1.jar"/>
- <get dest="${libdir}/commons-collections-2.1.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-collections/jars/commons-collections-2.1.jar"/>
- <get dest="${libdir}/mx4j-jmx-1.1.1.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/mx4j/jars/mx4j-jmx-1.1.1.jar"/>
- <get dest="${libdir}/junit-3.8.1.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/junit/jars/junit-3.8.1.jar"/>
- <get dest="${libdir}/ant-1.5.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/ant/jars/ant-1.5.jar"/>
- <get dest="${libdir}/ant-optional-1.5.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/ant/jars/ant-optional-1.5.jar"/>
+<!-- Replaced this maven-generated get with local reference above
+ <get dest="${libdir}/naming-core-0.8.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/incubator-directory/jars/naming-core-0.8.jar";>
+ </get>
+-->
+ <get dest="${libdir}/commons-logging-1.0.3.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-logging/jars/commons-logging-1.0.3.jar";>
+ </get>
+ <get dest="${libdir}/geronimo-spec-javamail-1.3.1-rc1.jar"
usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/geronimo-spec/jars/geronimo-spec-javamail-1.3.1-rc1.jar";>
+ </get>
+ <get dest="${libdir}/junit-3.8.1.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/junit/jars/junit-3.8.1.jar";>
+ </get>
+ </target>
+ <target name="install-maven">
+ <get dest="${user.home}/maven-install-latest.jar" usetimestamp="true"
src="${repo}/maven/maven-install-latest.jar">
+ </get>
+ <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
+ </unjar>
</target>
-</project>
\ No newline at end of file
+</project>
Added: incubator/directory/naming/trunk/java/build.xml
Url:
http://svn.apache.org/viewcvs/incubator/directory/naming/trunk/java/build.xml?view=auto&rev=124233
==============================================================================
--- (empty file)
+++ incubator/directory/naming/trunk/java/build.xml Wed Jan 5 09:36:26 2005
@@ -0,0 +1,224 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ This script is maven-generated, with the following changes:
+
+ - "parentdir" and "xxxjarlocation" properties are defined, where "xxx" is the
+ name of any other naming subproject jar that the subproject being built
+ depends on. The property value set is
+ ${parentdir}/xxx/target/xxx-core-0.8.jar"
+ - pathelements for each "xxxjarlocation" are added to the build.classpath
+ - in the copy task for the text files from parentdir, the generated absolute
+ path is changed to parentdir
+ - for all but the config build, the src/conf copy is eliminated
+ - the get tasks pointing to ibiblio for naming jars are eliminated
+
+ This script should NOT be regenerated unless the changes above are
+ post-applied, the maven ant plugin is extended to support multiprojects,
+ or maven.xml is modified to make equivalent changes automatically.
+-->
+
+<project default="jar" name="naming-java" basedir=".">
+ <!-- Additions to maven-generated content -->
+ <property name="parentdir" value=".."></property>
+ <property name="corejarlocation"
+ value="${parentdir}/core/target/naming-core-0.8.jar">
+ </property>
+ <!-- End additions to maven-generated content -->
+ <property name="defaulttargetdir" value="target">
+ </property>
+ <property name="libdir" value="target/lib">
+ </property>
+ <property name="classesdir" value="target/classes">
+ </property>
+ <property name="testclassesdir" value="target/test-classes">
+ </property>
+ <property name="testclassesdir" value="target/test-classes">
+ </property>
+ <property name="testreportdir" value="target/test-reports">
+ </property>
+ <property name="distdir" value="dist">
+ </property>
+ <property name="javadocdir" value="dist/docs/api">
+ </property>
+ <property name="final.name" value="naming-java-0.8">
+ </property>
+ <path id="build.classpath">
+ <fileset dir="${libdir}">
+ <include name="**/*.jar">
+ </include>
+ </fileset>
+ <!-- Addition to maven-generated content -->
+ <pathelement location="${corejarlocation}"/>
+ </path>
+ <target name="init" description="o Initializes some properties">
+ <mkdir dir="${libdir}">
+ </mkdir>
+ <condition property="noget">
+ <equals arg2="only" arg1="${build.sysclasspath}">
+ </equals>
+ </condition>
+ <!--Test if JUNIT is present in ANT classpath-->
+
+ <available property="Junit.present" classname="junit.framework.Test">
+ </available>
+ </target>
+ <target name="compile" description="o Compile the code" depends="get-deps">
+ <mkdir dir="${classesdir}">
+ </mkdir>
+ <javac destdir="${classesdir}" deprecation="true" debug="true"
optimize="false" excludes="**/package.html">
+ <src>
+ <pathelement location="src/java">
+ </pathelement>
+ </src>
+ <classpath refid="build.classpath">
+ </classpath>
+ </javac>
+ <mkdir dir="${classesdir}/META-INF">
+ </mkdir>
+ <copy todir="${classesdir}/META-INF">
+ <!-- Change from maven-generated abolute path -->
+ <fileset dir="${parentdir}">
+ <include name="LICENSE.txt">
+ </include>
+ <include name="NOTICE.txt">
+ </include>
+ <include name="INCUBATOR-DISCLAIMER.txt">
+ </include>
+ </fileset>
+ </copy>
+ <copy todir="${classesdir}">
+ <fileset dir="src/java">
+ <include name="**/*.properties">
+ </include>
+ </fileset>
+ </copy>
+<!-- Eliminate maven-generated content
+ <copy todir="${classesdir}">
+ <fileset dir="src/conf">
+ <include name="**/*.dtd">
+ </include>
+ </fileset>
+ </copy>
+-->
+ </target>
+ <target name="jar" description="o Create the jar" depends="compile,test">
+ <jar jarfile="${defaulttargetdir}/${final.name}.jar"
excludes="**/package.html" basedir="${classesdir}">
+ </jar>
+ </target>
+ <target name="clean" description="o Clean up the generated directories">
+ <delete dir="${defaulttargetdir}">
+ </delete>
+ <delete dir="${distdir}">
+ </delete>
+ </target>
+ <target name="dist" description="o Create a distribution" depends="jar,
javadoc">
+ <mkdir dir="dist">
+ </mkdir>
+ <copy todir="dist">
+ <fileset dir="${defaulttargetdir}" includes="*.jar">
+ </fileset>
+ <fileset dir="${basedir}" includes="LICENSE*, README*">
+ </fileset>
+ </copy>
+ </target>
+ <target name="test" description="o Run the test cases" if="test.failure"
depends="internal-test">
+ <fail message="There were test failures.">
+ </fail>
+ </target>
+ <target name="internal-test" if="Junit.present"
depends="junit-present,compile-tests">
+ <mkdir dir="${testreportdir}">
+ </mkdir>
+ <junit dir="./" failureproperty="test.failure" printSummary="yes"
fork="true" haltonerror="true">
+ <sysproperty key="basedir" value=".">
+ </sysproperty>
+ <formatter type="xml">
+ </formatter>
+ <formatter usefile="false" type="plain">
+ </formatter>
+ <classpath>
+ <path refid="build.classpath">
+ </path>
+ <pathelement path="${testclassesdir}">
+ </pathelement>
+ <pathelement path="${classesdir}">
+ </pathelement>
+ </classpath>
+ <batchtest todir="${testreportdir}">
+ <fileset dir="src/test">
+ <include name="**/*Test*">
+ </include>
+ <exclude name="**/Abstract*">
+ </exclude>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+ <target name="junit-present" unless="Junit.present" depends="init">
+ <echo>================================= WARNING
================================</echo>
+ <echo>Junit isn't present in your ${ANT_HOME}/lib directory. Tests not
executed.</echo>
+
<echo>==========================================================================</echo>
+ </target>
+ <target name="compile-tests" if="Junit.present"
depends="junit-present,compile">
+ <mkdir dir="${testclassesdir}">
+ </mkdir>
+ <javac destdir="${testclassesdir}" deprecation="true" debug="true"
optimize="false" excludes="**/package.html">
+ <src>
+ <pathelement location="src/test">
+ </pathelement>
+ </src>
+ <classpath>
+ <path refid="build.classpath">
+ </path>
+ <pathelement path="${classesdir}">
+ </pathelement>
+ </classpath>
+ </javac>
+ <copy todir="${testclassesdir}">
+ <fileset dir="src/test">
+ <include name="**/*.xml">
+ </include>
+ <include name="**/*.properties">
+ </include>
+ </fileset>
+ </copy>
+ </target>
+ <target name="javadoc" description="o Generate javadoc" depends="get-deps">
+ <mkdir dir="${javadocdir}">
+ </mkdir>
+ <tstamp>
+ <format pattern="2003-yyyy" property="year">
+ </format>
+ </tstamp>
+ <property name="copyright" value="Copyright &copy; Apache Software
Foundation. All Rights Reserved.">
+ </property>
+ <property name="title" value="Naming Java 0.8 API">
+ </property>
+ <javadoc use="true" private="true" destdir="${javadocdir}" author="true"
version="true" sourcepath="src/java" packagenames="org.apache.naming.*">
+ <classpath>
+ <path refid="build.classpath">
+ </path>
+ </classpath>
+ </javadoc>
+ </target>
+ <target name="get-deps" unless="noget" depends="init">
+ <!--Proxy settings works only with a JDK 1.2 and higher.-->
+
+ <setproxy>
+ </setproxy>
+<!-- Replaced this maven-generated get with local reference above
+ <get dest="${libdir}/naming-core-0.8.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/incubator-directory/jars/naming-core-0.8.jar";>
+ </get>
+-->
+ <get dest="${libdir}/commons-logging-1.0.3.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-logging/jars/commons-logging-1.0.3.jar";>
+ </get>
+ <get dest="${libdir}/junit-3.8.1.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/junit/jars/junit-3.8.1.jar";>
+ </get>
+ </target>
+ <target name="install-maven">
+ <get dest="${user.home}/maven-install-latest.jar" usetimestamp="true"
src="${repo}/maven/maven-install-latest.jar">
+ </get>
+ <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
+ </unjar>
+ </target>
+</project>
Added: incubator/directory/naming/trunk/management/build.xml
Url:
http://svn.apache.org/viewcvs/incubator/directory/naming/trunk/management/build.xml?view=auto&rev=124233
==============================================================================
--- (empty file)
+++ incubator/directory/naming/trunk/management/build.xml Wed Jan 5
09:36:26 2005
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ This script is maven-generated, with the following changes:
+
+ - "parentdir" and "xxxjarlocation" properties are defined, where "xxx" is the
+ name of any other naming subproject jar that the subproject being built
+ depends on. The property value set is
+ ${parentdir}/xxx/target/xxx-core-0.8.jar"
+ - pathelements for each "xxxjarlocation" are added to the build.classpath
+ - in the copy task for the text files from parentdir, the generated absolute
+ path is changed to parentdir
+ - for all but the config build, the src/conf copy is eliminated
+ - the get tasks pointing to ibiblio for naming jars are eliminated
+
+ This script should NOT be regenerated unless the changes above are
+ post-applied, the maven ant plugin is extended to support multiprojects,
+ or maven.xml is modified to make equivalent changes automatically.
+-->
+
+<project default="jar" name="naming-management" basedir=".">
+ <!-- Additions to maven-generated content -->
+ <property name="parentdir" value=".."></property>
+ <property name="corejarlocation"
+ value="${parentdir}/core/target/naming-core-0.8.jar">
+ </property>
+ <!-- End additions to maven-generated content -->
+ <property name="defaulttargetdir" value="target">
+ </property>
+ <property name="libdir" value="target/lib">
+ </property>
+ <property name="classesdir" value="target/classes">
+ </property>
+ <property name="testclassesdir" value="target/test-classes">
+ </property>
+ <property name="distdir" value="dist">
+ </property>
+ <property name="javadocdir" value="dist/docs/api">
+ </property>
+ <property name="final.name" value="naming-management-0.8">
+ </property>
+ <path id="build.classpath">
+ <fileset dir="${libdir}">
+ <include name="**/*.jar">
+ </include>
+ </fileset>
+ <!-- Addition to maven-generated content -->
+ <pathelement location="${corejarlocation}"/>
+ </path>
+ <target name="init" description="o Initializes some properties">
+ <mkdir dir="${libdir}">
+ </mkdir>
+ <condition property="noget">
+ <equals arg2="only" arg1="${build.sysclasspath}">
+ </equals>
+ </condition>
+ <!--Test if JUNIT is present in ANT classpath-->
+
+ <available property="Junit.present" classname="junit.framework.Test">
+ </available>
+ </target>
+ <target name="compile" description="o Compile the code" depends="get-deps">
+ <mkdir dir="${classesdir}">
+ </mkdir>
+ <javac destdir="${classesdir}" deprecation="true" debug="true"
optimize="false" excludes="**/package.html">
+ <src>
+ <pathelement location="src/java">
+ </pathelement>
+ </src>
+ <classpath refid="build.classpath">
+ </classpath>
+ </javac>
+ <mkdir dir="${classesdir}/META-INF">
+ </mkdir>
+ <copy todir="${classesdir}/META-INF">
+<!-- Change from maven-generated abolute path -->
+ <fileset dir="${parentdir}">
+ <include name="LICENSE.txt">
+ </include>
+ <include name="NOTICE.txt">
+ </include>
+ <include name="INCUBATOR-DISCLAIMER.txt">
+ </include>
+ </fileset>
+ </copy>
+ <copy todir="${classesdir}">
+ <fileset dir="src/java">
+ <include name="**/*.properties">
+ </include>
+ </fileset>
+ </copy>
+<!-- Eliminate maven-generated content
+ <copy todir="${classesdir}">
+ <fileset dir="src/conf">
+ <include name="**/*.dtd">
+ </include>
+ </fileset>
+ </copy>
+-->
+ </target>
+ <target name="jar" description="o Create the jar" depends="compile,test">
+ <jar jarfile="${defaulttargetdir}/${final.name}.jar"
excludes="**/package.html" basedir="${classesdir}">
+ </jar>
+ </target>
+ <target name="clean" description="o Clean up the generated directories">
+ <delete dir="${defaulttargetdir}">
+ </delete>
+ <delete dir="${distdir}">
+ </delete>
+ </target>
+ <target name="dist" description="o Create a distribution" depends="jar,
javadoc">
+ <mkdir dir="dist">
+ </mkdir>
+ <copy todir="dist">
+ <fileset dir="${defaulttargetdir}" includes="*.jar">
+ </fileset>
+ <fileset dir="${basedir}" includes="LICENSE*, README*">
+ </fileset>
+ </copy>
+ </target>
+ <target name="test" description="o Run the test cases" if="test.failure"
depends="internal-test">
+ <fail message="There were test failures.">
+ </fail>
+ </target>
+ <target name="internal-test" if="Junit.present"
depends="junit-present,compile-tests">
+ </target>
+ <target name="junit-present" unless="Junit.present" depends="init">
+ <echo>================================= WARNING
================================</echo>
+ <echo>Junit isn't present in your ${ANT_HOME}/lib directory. Tests not
executed.</echo>
+
<echo>==========================================================================</echo>
+ </target>
+ <target name="compile-tests" if="Junit.present"
depends="junit-present,compile">
+ </target>
+ <target name="javadoc" description="o Generate javadoc" depends="get-deps">
+ <mkdir dir="${javadocdir}">
+ </mkdir>
+ <tstamp>
+ <format pattern="2003-yyyy" property="year">
+ </format>
+ </tstamp>
+ <property name="copyright" value="Copyright &copy; Apache Software
Foundation. All Rights Reserved.">
+ </property>
+ <property name="title" value="Naming Management 0.8 API">
+ </property>
+ <javadoc use="true" private="true" destdir="${javadocdir}" author="true"
version="true" sourcepath="src/java" packagenames="org.apache.naming.*">
+ <classpath>
+ <path refid="build.classpath">
+ </path>
+ </classpath>
+ </javadoc>
+ </target>
+ <target name="get-deps" unless="noget" depends="init">
+ <!--Proxy settings works only with a JDK 1.2 and higher.-->
+
+ <setproxy>
+ </setproxy>
+<!-- Replaced this maven-generated get with local reference above
+ <get dest="${libdir}/naming-core-0.8.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/incubator-directory/jars/naming-core-0.8.jar";>
+ </get>
+-->
+ <get dest="${libdir}/mx4j-jmx-1.1.1.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/mx4j/jars/mx4j-jmx-1.1.1.jar";>
+ </get>
+ <get dest="${libdir}/junit-3.8.1.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/junit/jars/junit-3.8.1.jar";>
+ </get>
+ </target>
+ <target name="install-maven">
+ <get dest="${user.home}/maven-install-latest.jar" usetimestamp="true"
src="${repo}/maven/maven-install-latest.jar">
+ </get>
+ <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
+ </unjar>
+ </target>
+</project>
Added: incubator/directory/naming/trunk/resources/build.xml
Url:
http://svn.apache.org/viewcvs/incubator/directory/naming/trunk/resources/build.xml?view=auto&rev=124233
==============================================================================
--- (empty file)
+++ incubator/directory/naming/trunk/resources/build.xml Wed Jan 5
09:36:26 2005
@@ -0,0 +1,224 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ This script is maven-generated, with the following changes:
+
+ - "parentdir" and "xxxjarlocation" properties are defined, where "xxx" is the
+ name of any other naming subproject jar that the subproject being built
+ depends on. The property value set is
+ ${parentdir}/xxx/target/xxx-core-0.8.jar"
+ - pathelements for each "xxxjarlocation" are added to the build.classpath
+ - in the copy task for the text files from parentdir, the generated absolute
+ path is changed to parentdir
+ - for all but the config build, the src/conf copy is eliminated
+ - the get tasks pointing to ibiblio for naming jars are eliminated
+
+ This script should NOT be regenerated unless the changes above are
+ post-applied, the maven ant plugin is extended to support multiprojects,
+ or maven.xml is modified to make equivalent changes automatically.
+-->
+
+<project default="jar" name="naming-resources" basedir=".">
+<!-- Additions to maven-generated content -->
+ <property name="parentdir" value=".."></property>
+ <property name="corejarlocation"
+ value="${parentdir}/core/target/naming-core-0.8.jar">
+ </property>
+<!-- End addition to maven-generated content -->
+ <property name="defaulttargetdir" value="target">
+ </property>
+ <property name="libdir" value="target/lib">
+ </property>
+ <property name="classesdir" value="target/classes">
+ </property>
+ <property name="testclassesdir" value="target/test-classes">
+ </property>
+ <property name="testclassesdir" value="target/test-classes">
+ </property>
+ <property name="testreportdir" value="target/test-reports">
+ </property>
+ <property name="distdir" value="dist">
+ </property>
+ <property name="javadocdir" value="dist/docs/api">
+ </property>
+ <property name="final.name" value="naming-resources-0.8">
+ </property>
+ <path id="build.classpath">
+ <fileset dir="${libdir}">
+ <include name="**/*.jar">
+ </include>
+ </fileset>
+ <!-- Addition to maven-generated content -->
+ <pathelement location="${corejarlocation}"/>
+ </path>
+ <target name="init" description="o Initializes some properties">
+ <mkdir dir="${libdir}">
+ </mkdir>
+ <condition property="noget">
+ <equals arg2="only" arg1="${build.sysclasspath}">
+ </equals>
+ </condition>
+ <!--Test if JUNIT is present in ANT classpath-->
+
+ <available property="Junit.present" classname="junit.framework.Test">
+ </available>
+ </target>
+ <target name="compile" description="o Compile the code" depends="get-deps">
+ <mkdir dir="${classesdir}">
+ </mkdir>
+ <javac destdir="${classesdir}" deprecation="true" debug="true"
optimize="false" excludes="**/package.html">
+ <src>
+ <pathelement location="src/java">
+ </pathelement>
+ </src>
+ <classpath refid="build.classpath">
+ </classpath>
+ </javac>
+ <mkdir dir="${classesdir}/META-INF">
+ </mkdir>
+ <copy todir="${classesdir}/META-INF">
+ <!-- Change from maven-generated abolute path -->
+ <fileset dir="${parentdir}">
+ <include name="LICENSE.txt">
+ </include>
+ <include name="NOTICE.txt">
+ </include>
+ <include name="INCUBATOR-DISCLAIMER.txt">
+ </include>
+ </fileset>
+ </copy>
+ <copy todir="${classesdir}">
+ <fileset dir="src/java">
+ <include name="**/*.properties">
+ </include>
+ </fileset>
+ </copy>
+<!-- Eliminate maven-generated contet
+ <copy todir="${classesdir}">
+ <fileset dir="src/conf">
+ <include name="**/*.dtd">
+ </include>
+ </fileset>
+ </copy>
+-->
+ </target>
+ <target name="jar" description="o Create the jar" depends="compile,test">
+ <jar jarfile="${defaulttargetdir}/${final.name}.jar"
excludes="**/package.html" basedir="${classesdir}">
+ </jar>
+ </target>
+ <target name="clean" description="o Clean up the generated directories">
+ <delete dir="${defaulttargetdir}">
+ </delete>
+ <delete dir="${distdir}">
+ </delete>
+ </target>
+ <target name="dist" description="o Create a distribution" depends="jar,
javadoc">
+ <mkdir dir="dist">
+ </mkdir>
+ <copy todir="dist">
+ <fileset dir="${defaulttargetdir}" includes="*.jar">
+ </fileset>
+ <fileset dir="${basedir}" includes="LICENSE*, README*">
+ </fileset>
+ </copy>
+ </target>
+ <target name="test" description="o Run the test cases" if="test.failure"
depends="internal-test">
+ <fail message="There were test failures.">
+ </fail>
+ </target>
+ <target name="internal-test" if="Junit.present"
depends="junit-present,compile-tests">
+ <mkdir dir="${testreportdir}">
+ </mkdir>
+ <junit dir="./" failureproperty="test.failure" printSummary="yes"
fork="true" haltonerror="true">
+ <sysproperty key="basedir" value=".">
+ </sysproperty>
+ <formatter type="xml">
+ </formatter>
+ <formatter usefile="false" type="plain">
+ </formatter>
+ <classpath>
+ <path refid="build.classpath">
+ </path>
+ <pathelement path="${testclassesdir}">
+ </pathelement>
+ <pathelement path="${classesdir}">
+ </pathelement>
+ </classpath>
+ <batchtest todir="${testreportdir}">
+ <fileset dir="src/test">
+ <include name="**/*Test*">
+ </include>
+ <exclude name="**/Abstract*">
+ </exclude>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+ <target name="junit-present" unless="Junit.present" depends="init">
+ <echo>================================= WARNING
================================</echo>
+ <echo>Junit isn't present in your ${ANT_HOME}/lib directory. Tests not
executed.</echo>
+
<echo>==========================================================================</echo>
+ </target>
+ <target name="compile-tests" if="Junit.present"
depends="junit-present,compile">
+ <mkdir dir="${testclassesdir}">
+ </mkdir>
+ <javac destdir="${testclassesdir}" deprecation="true" debug="true"
optimize="false" excludes="**/package.html">
+ <src>
+ <pathelement location="src/test">
+ </pathelement>
+ </src>
+ <classpath>
+ <path refid="build.classpath">
+ </path>
+ <pathelement path="${classesdir}">
+ </pathelement>
+ </classpath>
+ </javac>
+ <copy todir="${testclassesdir}">
+ <fileset dir="src/test">
+ <include name="**/*.xml">
+ </include>
+ <include name="**/*.properties">
+ </include>
+ </fileset>
+ </copy>
+ </target>
+ <target name="javadoc" description="o Generate javadoc" depends="get-deps">
+ <mkdir dir="${javadocdir}">
+ </mkdir>
+ <tstamp>
+ <format pattern="2003-yyyy" property="year">
+ </format>
+ </tstamp>
+ <property name="copyright" value="Copyright &copy; Apache Software
Foundation. All Rights Reserved.">
+ </property>
+ <property name="title" value="Naming Resources 0.8 API">
+ </property>
+ <javadoc use="true" private="true" destdir="${javadocdir}" author="true"
version="true" sourcepath="src/java" packagenames="org.apache.naming.*">
+ <classpath>
+ <path refid="build.classpath">
+ </path>
+ </classpath>
+ </javadoc>
+ </target>
+ <target name="get-deps" unless="noget" depends="init">
+ <!--Proxy settings works only with a JDK 1.2 and higher.-->
+
+ <setproxy>
+ </setproxy>
+<!-- Replaced this maven-generated get with local reference above
+ <get dest="${libdir}/naming-core-0.8.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/incubator-directory/jars/naming-core-0.8.jar";>
+ </get>
+-->
+ <get dest="${libdir}/commons-logging-1.0.3.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-logging/jars/commons-logging-1.0.3.jar";>
+ </get>
+ <get dest="${libdir}/junit-3.8.1.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/junit/jars/junit-3.8.1.jar";>
+ </get>
+ </target>
+ <target name="install-maven">
+ <get dest="${user.home}/maven-install-latest.jar" usetimestamp="true"
src="${repo}/maven/maven-install-latest.jar">
+ </get>
+ <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
+ </unjar>
+ </target>
+</project>
