Skip to content

Commit 8f95e4a

Browse files
author
Robert James Oxspring
committed
Merged RESEARCH_CLI_2_ROXSPRING branch back to HEAD
git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/cli/trunk@130066 13f79535-47bb-0310-9956-ffa450edef68
1 parent d39c6c9 commit 8f95e4a

145 files changed

Lines changed: 16678 additions & 596 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.cvsignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ dist
33
target
44
velocity.log
55
.project
6-
76
maven.log
87
.classpath
8+
jcoverage.ser

‎LICENSE.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
Apache License
32
Version 2.0, January 2004
43
http://www.apache.org/licenses/
@@ -200,3 +199,4 @@
200199
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
201200
See the License for the specific language governing permissions and
202201
limitations under the License.
202+

‎build.xml‎

Lines changed: 118 additions & 109 deletions
Original file line numberDiff line numberDiff line change
@@ -1,158 +1,167 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

3+
<!--build.xml generated by maven from project.xml version 2.0
4+
on date April 22 2004, time 2325-->
5+
36
<project default="jar" name="commons-cli" basedir=".">
4-
5-
<property name="defaulttargetdir" value="target"></property>
6-
<property name="classesdir" value="target/classes"></property>
7-
<property name="testclassesdir" value="target/test-classes"></property>
8-
<property name="testreportdir" value="target/test-reports"></property>
9-
<property name="distdir" value="dist"></property>
10-
<property name="javadocdir" value="target/docs/apidocs"></property>
11-
<property name="final.name" value="commons-cli-1.0-beta-2-dev"></property>
12-
7+
<property name="defaulttargetdir" value="target">
8+
</property>
9+
<property name="libdir" value="target/lib">
10+
</property>
11+
<property name="classesdir" value="target/classes">
12+
</property>
13+
<property name="testclassesdir" value="target/test-classes">
14+
</property>
15+
<property name="testreportdir" value="target/test-reports">
16+
</property>
17+
<property name="distdir" value="dist">
18+
</property>
19+
<property name="javadocdir" value="dist/docs/api">
20+
</property>
21+
<property name="final.name" value="commons-cli-2.0">
22+
</property>
1323
<target name="init" description="o Initializes some properties">
14-
24+
<mkdir dir="${libdir}">
25+
</mkdir>
1526
<condition property="noget">
16-
<equals arg2="only" arg1="${build.sysclasspath}"></equals>
27+
<equals arg2="only" arg1="${build.sysclasspath}">
28+
</equals>
1729
</condition>
1830
</target>
19-
20-
<target name="jar" description="o Create the jar" depends="get-deps">
21-
22-
<mkdir dir="${classesdir}"></mkdir>
23-
31+
<target name="compile" description="o Compile the code" depends="get-deps">
32+
<mkdir dir="${classesdir}">
33+
</mkdir>
2434
<javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
2535
<src>
26-
<pathelement location="src/java"></pathelement>
36+
<pathelement location="src/java">
37+
</pathelement>
2738
</src>
2839
<classpath>
29-
<fileset dir="lib">
30-
<include name="*.jar"></include>
40+
<fileset dir="${libdir}">
41+
<include name="*.jar">
42+
</include>
3143
</fileset>
3244
</classpath>
3345
</javac>
34-
35-
36-
<jar jarfile="target/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}"></jar>
37-
46+
<copy todir="${classesdir}">
47+
<fileset dir="src/java/org/apache/commons/cli2">
48+
<include name="**/*.properties">
49+
</include>
50+
</fileset>
51+
</copy>
52+
</target>
53+
<target name="jar" description="o Create the jar" depends="compile,test">
54+
<jar jarfile="target/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}">
55+
</jar>
3856
</target>
39-
4057
<target name="clean" description="o Clean up the generated directories">
41-
<delete dir="${defaulttargetdir}"></delete>
42-
<delete dir="${distdir}"></delete>
58+
<delete dir="${defaulttargetdir}">
59+
</delete>
60+
<delete dir="${distdir}">
61+
</delete>
4362
</target>
44-
4563
<target name="dist" description="o Create a distribution" depends="jar, javadoc">
46-
<mkdir dir="dist"></mkdir>
64+
<mkdir dir="dist">
65+
</mkdir>
4766
<copy todir="dist">
48-
<fileset dir="${defaulttargetdir}"></fileset>
67+
<fileset dir="${defaulttargetdir}" includes="*.jar">
68+
</fileset>
69+
<fileset dir="${basedir}" includes="LICENSE*, README*">
70+
</fileset>
4971
</copy>
5072
</target>
51-
52-
<target name="test" description="o Run the test cases" depends="compile-tests">
53-
<mkdir dir="${testreportdir}"></mkdir>
54-
<junit dir="./" printSummary="yes" fork="true" haltonerror="true">
55-
<sysproperty key="basedir" value="src/test"></sysproperty>
56-
<formatter type="xml"></formatter>
57-
<formatter usefile="true" type="plain"></formatter>
73+
<target name="test" description="o Run the test cases" if="test.failure" depends="internal-test">
74+
<fail message="There were test failures.">
75+
</fail>
76+
</target>
77+
<target name="internal-test" depends="compile-tests">
78+
<mkdir dir="${testreportdir}">
79+
</mkdir>
80+
<junit dir="./" failureproperty="test.failure" printSummary="yes" fork="true" haltonerror="true">
81+
<sysproperty key="basedir" value=".">
82+
</sysproperty>
83+
<formatter type="xml">
84+
</formatter>
85+
<formatter usefile="false" type="plain">
86+
</formatter>
5887
<classpath>
59-
<fileset dir="lib">
60-
<include name="*.jar"></include>
88+
<fileset dir="${libdir}">
89+
<include name="*.jar">
90+
</include>
6191
</fileset>
62-
<pathelement location="target/${final.name}.jar"></pathelement>
63-
<pathelement path="${testclassesdir}"></pathelement>
92+
<pathelement path="${testclassesdir}">
93+
</pathelement>
94+
<pathelement path="${classesdir}">
95+
</pathelement>
6496
</classpath>
6597
<batchtest todir="${testreportdir}">
6698
<fileset dir="src/test">
67-
68-
<include name="**/*Test*.java"></include>
69-
70-
99+
<include name="**/Test*.java">
100+
</include>
101+
<include name="**/*Test.java">
102+
</include>
71103
</fileset>
72104
</batchtest>
73105
</junit>
74106
</target>
75-
76-
<target name="compile-tests" depends="jar">
77-
<mkdir dir="${testclassesdir}"></mkdir>
107+
<target name="compile-tests" depends="compile">
108+
<mkdir dir="${testclassesdir}">
109+
</mkdir>
78110
<javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
79111
<src>
80-
<pathelement location="src/test"></pathelement>
112+
<pathelement location="src/test">
113+
</pathelement>
81114
</src>
82115
<classpath>
83-
<fileset dir="lib">
84-
<include name="*.jar"></include>
116+
<fileset dir="${libdir}">
117+
<include name="*.jar">
118+
</include>
85119
</fileset>
86-
<pathelement location="target/${final.name}.jar"></pathelement>
120+
<pathelement path="${classesdir}">
121+
</pathelement>
87122
</classpath>
88123
</javac>
89-
90-
91-
92-
93-
94-
<copy todir="${testclassesdir}">
95-
<fileset dir="src/test">
96-
97-
98-
</fileset>
99-
</copy>
100-
101124
</target>
102-
103-
<target name="javadoc" description="o Generate javadoc" depends="jar">
104-
105-
106-
<mkdir dir="${javadocdir}"></mkdir>
107-
108-
125+
<target name="javadoc" description="o Generate javadoc">
126+
<mkdir dir="${javadocdir}">
127+
</mkdir>
109128
<tstamp>
110-
<format pattern="2002-yyyy" property="year"></format>
129+
<format pattern="2002-yyyy" property="year">
130+
</format>
111131
</tstamp>
112-
113-
<property name="copyright" value="Copyright &amp;copy; Apache Software Foundation. All Rights Reserved."></property>
114-
115-
<property name="title" value="CLI 1.0-beta-2-dev API"></property>
116-
117-
<javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="org.apache.commons.cli.*">
132+
<property name="copyright" value="Copyright &amp;copy; Apache Software Foundation. All Rights Reserved.">
133+
</property>
134+
<property name="title" value="CLI 2.0 API">
135+
</property>
136+
<javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="org.apache.commons.*.*">
118137
<classpath>
119-
<fileset dir="lib">
120-
<include name="*.jar"></include>
138+
<fileset dir="${libdir}">
139+
<include name="*.jar">
140+
</include>
121141
</fileset>
122-
<pathelement location="target/${final.name}.jar"></pathelement>
142+
<pathelement location="target/${final.name}.jar">
143+
</pathelement>
123144
</classpath>
124145
</javadoc>
125-
126146
</target>
127-
128147
<target name="get-deps" unless="noget" depends="init">
129-
130-
<mkdir dir="lib"></mkdir>
131-
132-
<get dest="lib/commons-logging-1.0.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-logging/jars/commons-logging-1.0.jar"></get>
133-
<get dest="lib/commons-lang-SNAPSHOT.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-lang/jars/commons-lang-SNAPSHOT.jar"></get>
134-
<get dest="lib/junit-3.7.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/junit/jars/junit-3.7.jar"></get>
135-
148+
<get dest="${libdir}/commons-lang-1.0.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-lang/jars/commons-lang-1.0.jar">
149+
</get>
150+
<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">
151+
</get>
152+
<get dest="${libdir}/jdepend-2.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/jdepend/jars/jdepend-2.5.jar">
153+
</get>
154+
<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">
155+
</get>
156+
<get dest="${libdir}/ant-1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/ant/jars/ant-1.5.jar">
157+
</get>
158+
<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">
159+
</get>
136160
</target>
137-
138-
139-
140-
141-
142-
143-
144-
145-
146-
147161
<target name="install-maven">
148-
149-
150-
151-
<get dest="${user.home}/maven-install-latest.jar" usetimestamp="true" src="${maven.repo.remote}/maven/maven-install-latest.jar"></get>
152-
153-
<unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar"></unjar>
154-
162+
<get dest="${user.home}/maven-install-latest.jar" usetimestamp="true" src="${repo}/maven/maven-install-latest.jar">
163+
</get>
164+
<unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
165+
</unjar>
155166
</target>
156-
157-
</project>
158-
167+
</project>

‎gump.xml‎

Lines changed: 31 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,36 @@
1-
<module name="commons-cli">
2-
1+
<?xml version="1.0" encoding="UTF-8"?>
32

3+
<module name="commons-cli">
44
<description>Commons CLI</description>
5-
<url href="http://jakarta.apache.org/commons/sandbox/cli.html"/>
6-
7-
<cvs repository="jakarta"/>
8-
9-
<!-- This is really the cvs module. We need to change this but -->
10-
<!-- I will leave this for now until everything works. -->
11-
5+
<url href="http://jakarta.apache.org/commons/index.html">
6+
</url>
7+
<cvs module="jakarta-commons" repository="jakarta">
8+
</cvs>
129
<project name="commons-cli">
13-
14-
<!-- Standard Maven target to produce Javadocs, source -->
15-
<!-- and binary distributions. -->
16-
<ant buildfile="build-gump.xml" target="jar">
17-
<property name="maven.final.name" value="commons-cli-@@DATE@@"/>
10+
<ant buildfile="build.xml" target="dist">
11+
<property name="final.name" value="commons-cli-@@DATE@@">
12+
</property>
1813
</ant>
19-
20-
<package>org.apache.commons.cli</package>
21-
22-
<!-- All Maven projects need Ant and Xerces to build. -->
23-
<depend project="jakarta-ant"/>
24-
<depend project="xml-xerces"/>
25-
26-
<depend project="commons-logging"/>
27-
<depend project="commons-lang"/>
28-
29-
<work nested="target/classes"/>
30-
<home nested="target"/>
31-
<jar name="commons-cli-@@DATE@@.jar"/>
32-
<javadoc nested="docs/apidocs"/>
33-
34-
<nag from="Maven Developers &lt;turbine-maven-dev@jakarta.apache.org&gt;"
35-
to="commons-dev@jakarta.apache.org"/>
36-
37-
14+
<package>org.apache.commons.*</package>
15+
<depend project="commons-lang">
16+
</depend>
17+
<depend project="jakarta-ant">
18+
</depend>
19+
<depend project="jdepend">
20+
</depend>
21+
<depend project="junit">
22+
</depend>
23+
<depend project="xml-xerces">
24+
</depend>
25+
<work nested="target/classes">
26+
</work>
27+
<home nested="target">
28+
</home>
29+
<jar name="commons-cli-@@DATE@@.jar">
30+
</jar>
31+
<javadoc module="jakarta-commons" nested="target/docs/apidocs">
32+
</javadoc>
33+
<nag to="commons-dev@jakarta.apache.org" from="commons-cli development &lt;commons-dev@jakarta.apache.org&gt;">
34+
</nag>
3835
</project>
39-
40-
</module>
36+
</module>

‎maven.xml‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,16 @@
1-
<project default="java:jar"
2-
xmlns:j="jelly:core">
1+
<!--
2+
Copyright 2002-2004 The Apache Software Foundation.
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
37
4-
</project>
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
-->
16+
<project default="jar:jar"/>

0 commit comments

Comments
 (0)