Author: ebourg
Date: Tue Jul 29 06:44:08 2008
New Revision: 680694
URL: http://svn.apache.org/viewvc?rev=680694&view=rev
Log:
Generated a new Ant build with Maven 2 + minor tweaks
Removed the Maven 1 build
Updated the manifest used by Ant to include the OSGI stuff
Added:
commons/proper/cli/branches/cli-1.x/build.properties (with props)
Removed:
commons/proper/cli/branches/cli-1.x/maven.xml
commons/proper/cli/branches/cli-1.x/project.properties
commons/proper/cli/branches/cli-1.x/project.xml
Modified:
commons/proper/cli/branches/cli-1.x/NOTICE.txt
commons/proper/cli/branches/cli-1.x/build.xml
commons/proper/cli/branches/cli-1.x/pom.xml
commons/proper/cli/branches/cli-1.x/src/assembly/src.xml
commons/proper/cli/branches/cli-1.x/src/conf/MANIFEST.MF
Modified: commons/proper/cli/branches/cli-1.x/NOTICE.txt
URL:
http://svn.apache.org/viewvc/commons/proper/cli/branches/cli-1.x/NOTICE.txt?rev=680694&r1=680693&r2=680694&view=diff
==============================================================================
--- commons/proper/cli/branches/cli-1.x/NOTICE.txt (original)
+++ commons/proper/cli/branches/cli-1.x/NOTICE.txt Tue Jul 29 06:44:08 2008
@@ -1,5 +1,5 @@
Apache Commons CLI
-Copyright 2001-2007 The Apache Software Foundation
+Copyright 2001-2008 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Added: commons/proper/cli/branches/cli-1.x/build.properties
URL:
http://svn.apache.org/viewvc/commons/proper/cli/branches/cli-1.x/build.properties?rev=680694&view=auto
==============================================================================
--- commons/proper/cli/branches/cli-1.x/build.properties (added)
+++ commons/proper/cli/branches/cli-1.x/build.properties Tue Jul 29 06:44:08
2008
@@ -0,0 +1,45 @@
+#Generated by Maven Ant Plugin - DO NOT EDIT THIS FILE!
+#Tue Jul 29 14:31:04 CEST 2008
+commons.binary.suffix=
+commons.componentid=cli
+commons.deployment.protocol=scp
+commons.docEncoding=iso-8859-1
+commons.encoding=iso-8859-1
+commons.jira.id=CLI
+commons.jira.pid=12310463
+commons.manifestfile=target/osgi/MANIFEST.MF
+
+commons.osgi.dynamicImport=
+commons.osgi.export=org.apache.commons.*;version\=1.2-SNAPSHOT
+commons.osgi.import=*
+commons.osgi.private=
+commons.osgi.symbolicName=org.apache.commons.cli
+
+commons.rc.version=RC1
+commons.release.name=commons-cli-1.2
+commons.release.version=1.2
+
+maven.build.dir=target
+maven.build.finalName=commons-cli-1.2-SNAPSHOT
+maven.build.outputDir=${maven.build.dir}/classes
+maven.build.resourceDir.0=.
+maven.build.srcDir.0=src/java
+maven.build.testDir.0=src/test
+maven.build.testOutputDir=${maven.build.dir}/test-classes
+maven.build.testResourceDir.0=src/test/resources
+
+maven.compile.source=1.3
+maven.compile.target=1.3
+
+maven.repo.local=${user.home}/.m2/repository
+maven.reporting.outputDirectory=${maven.build.dir}/site
+
+maven.settings.interactiveMode=true
+maven.settings.offline=false
+
+maven.test.reports=${maven.build.dir}/test-reports
+
+organization.logo=http\://www.apache.org/images/asf_logo_wide.gif
+
+project.build.directory=${maven.build.dir}
+project.build.outputDirectory=${maven.build.outputDir}
Propchange: commons/proper/cli/branches/cli-1.x/build.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/proper/cli/branches/cli-1.x/build.properties
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: commons/proper/cli/branches/cli-1.x/build.xml
URL:
http://svn.apache.org/viewvc/commons/proper/cli/branches/cli-1.x/build.xml?rev=680694&r1=680693&r2=680694&view=diff
==============================================================================
--- commons/proper/cli/branches/cli-1.x/build.xml (original)
+++ commons/proper/cli/branches/cli-1.x/build.xml Tue Jul 29 06:44:08 2008
@@ -1,166 +1,257 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
-<!--build.xml generated by maven from project.xml version 1.1
- on date July 4 2007, time 1837-->
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project name="commons-cli-from-maven" default="package" basedir=".">
+
+ <!-- ======================================================================
-->
+ <!-- Build environment properties
-->
+ <!-- ======================================================================
-->
+
+ <property file="${user.home}/.m2/maven.properties"/>
+ <property file="build.properties"/>
+
+ <property name="maven.build.finalName" value="commons-cli-1.2-SNAPSHOT"/>
+ <property name="maven.build.dir" value="target"/>
+ <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
+ <property name="maven.build.srcDir.0" value="src/java"/>
+ <property name="maven.build.resourceDir.0" value="."/>
+ <property name="maven.build.testOutputDir"
value="${maven.build.dir}/test-classes"/>
+ <property name="maven.build.testDir.0" value="src/test"/>
+ <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
+ <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
+ <property name="maven.reporting.outputDirectory"
value="${maven.build.dir}/site"/>
+
+ <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
+ <property name="maven.settings.offline" value="false"/>
+ <property name="maven.settings.interactiveMode" value="true"/>
+
+ <!-- ======================================================================
-->
+ <!-- Defining classpaths
-->
+ <!-- ======================================================================
-->
-<project default="jar" name="commons-cli" basedir=".">
- <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="commons-cli-1.1">
- </property>
<path id="build.classpath">
- <fileset dir="${libdir}">
- <include name="**/*.jar">
- </include>
+ <fileset dir="${maven.repo.local}">
+ <include name="*.jar"/>
+ </fileset>
+ </path>
+ <path id="build.test.classpath">
+ <fileset dir="${maven.repo.local}">
+ <include name="junit/junit/3.8.1/junit-3.8.1.jar"/>
</fileset>
</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>
+ <!-- ======================================================================
-->
+ <!-- Cleaning up target
-->
+ <!-- ======================================================================
-->
+
+ <target name="clean" description="Clean the output directory">
+ <delete dir="${maven.build.dir}"/>
</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">
+
+ <!-- ======================================================================
-->
+ <!-- Compilation target
-->
+ <!-- ======================================================================
-->
+
+ <target name="compile" depends="get-deps" description="Compile the code">
+ <mkdir dir="${maven.build.outputDir}"/>
+ <javac destdir="${maven.build.outputDir}"
+ encoding="iso-8859-1"
+ nowarn="false"
+ debug="true"
+ optimize="false"
+ deprecation="true"
+ target="1.3"
+ verbose="false"
+ fork="false"
+ source="1.3">
<src>
- <pathelement location="src/java">
- </pathelement>
+ <pathelement location="${maven.build.srcDir.0}"/>
</src>
- <classpath refid="build.classpath">
- </classpath>
+ <classpath refid="build.classpath"/>
</javac>
- <mkdir dir="${classesdir}/META-INF">
- </mkdir>
- <copy todir="${classesdir}/META-INF">
- <fileset dir=".">
- <include name="NOTICE.txt">
- </include>
+ <mkdir dir="${maven.build.outputDir}/META-INF"/>
+ <copy todir="${maven.build.outputDir}/META-INF">
+ <fileset dir="${maven.build.resourceDir.0}">
+ <include name="NOTICE.txt"/>
+ <include name="LICENSE.txt"/>
</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.java">
- </include>
- </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">
+
+ <!-- ======================================================================
-->
+ <!-- Test-compilation target
-->
+ <!-- ======================================================================
-->
+
+ <target name="compile-tests"
+ depends="compile"
+ description="Compile the test code"
+ unless="maven.test.skip">
+ <mkdir dir="${maven.build.testOutputDir}"/>
+ <javac destdir="${maven.build.testOutputDir}"
+ encoding="iso-8859-1"
+ nowarn="false"
+ debug="true"
+ optimize="false"
+ deprecation="true"
+ target="1.3"
+ verbose="false"
+ fork="false"
+ source="1.3">
<src>
- <pathelement location="src/test">
- </pathelement>
+ <pathelement location="${maven.build.testDir.0}"/>
</src>
<classpath>
- <path refid="build.classpath">
- </path>
- <pathelement path="${classesdir}">
- </pathelement>
+ <path refid="build.test.classpath"/>
+ <pathelement location="${maven.build.outputDir}"/>
</classpath>
</javac>
</target>
- <target name="javadoc" description="o Generate javadoc" depends="get-deps">
- <mkdir dir="${javadocdir}">
- </mkdir>
- <tstamp>
- <format pattern="2002-yyyy" property="year">
- </format>
- </tstamp>
- <property name="copyright" value="Copyright &copy; Apache Software
Foundation. All Rights Reserved.">
- </property>
- <property name="title" value="CLI 1.1 API">
- </property>
- <javadoc use="true" private="true" destdir="${javadocdir}" author="true"
version="true" sourcepath="src/java" packagenames="org.apache.commons.*">
+
+ <!-- ======================================================================
-->
+ <!-- Run all tests
-->
+ <!-- ======================================================================
-->
+
+ <target name="test"
+ depends="compile-tests, junit-missing"
+ unless="junit.skipped"
+ description="Run the test cases">
+ <mkdir dir="${maven.test.reports}"/>
+ <junit printSummary="yes" haltonerror="true" haltonfailure="true"
fork="true" dir=".">
+ <sysproperty key="basedir" value="."/>
+ <formatter type="xml"/>
+ <formatter type="plain"/>
<classpath>
- <path refid="build.classpath">
- </path>
+ <path refid="build.test.classpath"/>
+ <pathelement location="${maven.build.outputDir}"/>
+ <pathelement location="${maven.build.testOutputDir}"/>
</classpath>
+ <batchtest todir="${maven.test.reports}" unless="test">
+ <fileset dir="${maven.build.testDir.0}">
+ <include name="**/Test*.java"/>
+ <include name="**/*Test.java"/>
+ <include name="**/*TestCase.java"/>
+ <exclude name="**/*Abstract*Test.java"/>
+ </fileset>
+ </batchtest>
+ <batchtest todir="${maven.test.reports}" if="test">
+ <fileset dir="${maven.build.testDir.0}">
+ <include name="**/${test}.java"/>
+ <exclude name="**/*Abstract*Test.java"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+
+ <target name="test-junit-present">
+ <available classname="junit.framework.Test" property="junit.present"/>
+ </target>
+
+ <target name="test-junit-status"
+ depends="test-junit-present">
+ <condition property="junit.missing">
+ <and>
+ <isfalse value="${junit.present}"/>
+ <isfalse value="${maven.test.skip}"/>
+ </and>
+ </condition>
+ <condition property="junit.skipped">
+ <or>
+ <isfalse value="${junit.present}"/>
+ <istrue value="${maven.test.skip}"/>
+ </or>
+ </condition>
+ </target>
+
+ <target name="junit-missing"
+ depends="test-junit-status"
+ if="junit.missing">
+ <echo>=================================== WARNING
===================================</echo>
+ <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not
executed.</echo>
+
<echo>===============================================================================</echo>
+ </target>
+
+ <!-- ======================================================================
-->
+ <!-- Javadoc target
-->
+ <!-- ======================================================================
-->
+
+ <target name="javadoc" description="Generates the Javadoc of the
application">
+ <javadoc sourcepath="${maven.build.srcDir.0}"
+ packagenames="*"
+ destdir="${maven.reporting.outputDirectory}/apidocs"
+ access="protected"
+ old="false"
+ verbose="false"
+ version="true"
+ use="true"
+ author="true"
+ splitindex="false"
+ nodeprecated="false"
+ nodeprecatedlist="false"
+ notree="false"
+ noindex="false"
+ nohelp="false"
+ nonavbar="false"
+ serialwarn="false"
+ charset="ISO-8859-1"
+ linksource="true"
+ breakiterator="false">
+ <link href="http://java.sun.com/javase/6/docs/api"/>
</javadoc>
</target>
- <target name="get-deps" unless="noget" depends="init">
- <!--Proxy settings works only with a JDK 1.2 and higher.-->
- <setproxy>
- </setproxy>
- <get dest="${libdir}/junit-3.8.1.jar" usetimestamp="true"
ignoreerrors="true"
src="http://repo1.maven.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>
+ <!-- ======================================================================
-->
+ <!-- Package target
-->
+ <!-- ======================================================================
-->
+
+ <target name="package" depends="compile,test" description="Package the
application">
+ <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
+ compress="true"
+ index="false"
+ manifest="src/conf/MANIFEST.MF"
+ basedir="${maven.build.outputDir}"
+ excludes="**/package.html"/>
</target>
-</project>
\ No newline at end of file
+
+ <!-- ======================================================================
-->
+ <!-- A dummy target for the package named after the type it creates
-->
+ <!-- ======================================================================
-->
+
+ <target name="jar" depends="package" description="Builds the jar for the
application"/>
+
+ <!-- ======================================================================
-->
+ <!-- Download dependencies target
-->
+ <!-- ======================================================================
-->
+
+ <target name="test-offline">
+ <condition property="maven.mode.offline">
+ <equals arg1="${maven.settings.offline}" arg2="true"/>
+ </condition>
+ </target>
+
+ <target name="get-deps"
+ depends="test-offline"
+ description="Download all dependencies"
+ unless="maven.mode.offline">
+ <mkdir dir="${maven.repo.local}"/>
+ <mkdir dir="${maven.repo.local}/junit/junit/3.8.1"/>
+ <get src="http://repo1.maven.org/maven2/junit/junit/3.8.1/junit-3.8.1.jar";
+ dest="${maven.repo.local}/junit/junit/3.8.1/junit-3.8.1.jar"
+ usetimestamp="false"
+ ignoreerrors="true"/>
+ </target>
+
+</project>
Modified: commons/proper/cli/branches/cli-1.x/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/cli/branches/cli-1.x/pom.xml?rev=680694&r1=680693&r2=680694&view=diff
==============================================================================
--- commons/proper/cli/branches/cli-1.x/pom.xml (original)
+++ commons/proper/cli/branches/cli-1.x/pom.xml Tue Jul 29 06:44:08 2008
@@ -29,8 +29,7 @@
<inceptionYear>2002</inceptionYear>
<description>
- Commons CLI provides a simple API for presenting, processing and
- validating a command line interface.
+ Commons CLI provides a simple API for presenting, processing and
validating a command line interface.
</description>
<url>http://commons.apache.org/cli/</url>
@@ -133,7 +132,7 @@
<maven.compile.target>1.3</maven.compile.target>
<commons.componentid>cli</commons.componentid>
<commons.release.version>1.2</commons.release.version>
-
<commons.release.name>commons-configuration-${commons.release.version}</commons.release.name>
+
<commons.release.name>commons-cli-${commons.release.version}</commons.release.name>
<commons.osgi.symbolicName>org.apache.commons.cli</commons.osgi.symbolicName>
<commons.binary.suffix></commons.binary.suffix>
<commons.jira.id>CLI</commons.jira.id>
@@ -164,6 +163,12 @@
<tarLongFileMode>gnu</tarLongFileMode>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-ant-plugin</artifactId>
+ <version>2.1.1-SNAPSHOT</version>
+ </plugin>
+
</plugins>
</build>
Modified: commons/proper/cli/branches/cli-1.x/src/assembly/src.xml
URL:
http://svn.apache.org/viewvc/commons/proper/cli/branches/cli-1.x/src/assembly/src.xml?rev=680694&r1=680693&r2=680694&view=diff
==============================================================================
--- commons/proper/cli/branches/cli-1.x/src/assembly/src.xml (original)
+++ commons/proper/cli/branches/cli-1.x/src/assembly/src.xml Tue Jul 29
06:44:08 2008
@@ -25,14 +25,12 @@
<fileSet>
<includes>
<include>build.xml</include>
+ <include>build.properties</include>
<include>CLI2Converter.java</include>
<include>CLI2ConverterTest.java</include>
<include>LICENSE.txt</include>
- <include>maven.xml</include>
<include>NOTICE.txt</include>
<include>pom.xml</include>
- <include>project.properties</include>
- <include>project.xml</include>
<include>README.txt</include>
<include>RELEASE-NOTES.txt</include>
</includes>
Modified: commons/proper/cli/branches/cli-1.x/src/conf/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/commons/proper/cli/branches/cli-1.x/src/conf/MANIFEST.MF?rev=680694&r1=680693&r2=680694&view=diff
==============================================================================
--- commons/proper/cli/branches/cli-1.x/src/conf/MANIFEST.MF (original)
+++ commons/proper/cli/branches/cli-1.x/src/conf/MANIFEST.MF Tue Jul 29
06:44:08 2008
@@ -1,4 +1,23 @@
-Implementation-Title: Apache Commons CLI
-Specification-Title: Apache Commons CLI
-Specification-Vendor: Apache Software Foundation
-Specification-Version: 1.1
+Manifest-Version: 1.0
+Implementation-Title: Commons CLI
+Implementation-Vendor: The Apache Software Foundation
+Implementation-Vendor-Id: org.apache
+Implementation-Version: 1.2-SNAPSHOT
+Specification-Title: Commons CLI
+Specification-Vendor: The Apache Software Foundation
+Specification-Version: 1.2-SNAPSHOT
+X-Compile-Source-JDK: 1.3
+X-Compile-Target-JDK: 1.3
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Import-Package: org.apache.commons.cli;version="1.2.0.SNAPSHOT"
+Bnd-LastModified: 1217335218750
+Export-Package: org.apache.commons.cli;version="1.2.0.SNAPSHOT"
+Bundle-Version: 1.2.0.SNAPSHOT
+Bundle-Name: Commons CLI
+Bundle-Description: Commons CLI provides a simple API for presenting,
+ processing and validating a command line interface.
+Bundle-DocURL: http://commons.apache.org/cli/
+Bundle-ManifestVersion: 2
+Bundle-Vendor: The Apache Software Foundation
+Bundle-SymbolicName: org.apache.commons.cli
+Tool: Bnd-0.0.238
