Skip to content

Commit fbd85f1

Browse files
mdiggorymdiggory
committed
Removed Dependency on BeanUtils and regenereated build.xml to reflect changes.
git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/math/trunk@141266 13f79535-47bb-0310-9956-ffa450edef68
1 parent 55141ba commit fbd85f1

2 files changed

Lines changed: 99 additions & 81 deletions

File tree

‎build.xml‎

Lines changed: 98 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,44 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

3-
<!--
4-
Copyright 2003-2004 The Apache Software Foundation
3+
<!--build.xml generated by maven from project.xml version 1.0-dev
4+
on date June 1 2004, time 1737-->
55

6-
Licensed under the Apache License, Version 2.0 (the "License");
7-
you may not use this file except in compliance with the License.
8-
You may obtain a copy of the License at
9-
10-
http://www.apache.org/licenses/LICENSE-2.0
11-
12-
Unless required by applicable law or agreed to in writing, software
13-
distributed under the License is distributed on an "AS IS" BASIS,
14-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15-
See the License for the specific language governing permissions and
16-
limitations under the License.
17-
-->
18-
196
<project default="jar" name="commons-math" basedir=".">
20-
<property name="defaulttargetdir" value="target"/>
21-
<property name="libdir" value="target/lib"/>
22-
<property name="classesdir" value="target/classes"/>
23-
<property name="testclassesdir" value="target/test-classes"/>
24-
<property name="testreportdir" value="target/test-reports"/>
25-
<property name="distdir" value="dist"/>
26-
<property name="javadocdir" value="dist/docs/api"/>
27-
<property name="final.name" value="commons-math-1.0-dev"/>
28-
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-math-1.0-dev">
22+
</property>
2923
<target name="init" description="o Initializes some properties">
30-
<mkdir dir="${libdir}"/>
24+
<mkdir dir="${libdir}">
25+
</mkdir>
3126
<condition property="noget">
3227
<equals arg2="only" arg1="${build.sysclasspath}">
3328
</equals>
3429
</condition>
3530
</target>
36-
3731
<target name="compile" description="o Compile the code" depends="get-deps">
38-
<mkdir dir="${classesdir}"/>
32+
<mkdir dir="${classesdir}">
33+
</mkdir>
3934
<javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
4035
<src>
4136
<pathelement location="src/java"/>
4237
</src>
4338
<classpath>
4439
<fileset dir="${libdir}">
45-
<include name="*.jar"/>
40+
<include name="*.jar">
41+
</include>
4642
</fileset>
4743
</classpath>
4844
</javac>
@@ -53,93 +49,119 @@
5349
</fileset>
5450
</copy>
5551
</target>
56-
57-
<target name="jar" description="Create the jar" depends="compile,test">
58-
<mkdir dir="${classesdir}/META-INF"/>
59-
<copy file="LICENSE.txt" tofile="${classesdir}/META-INF/LICENSE.txt"/>
60-
<copy file="NOTICE.txt" tofile="${classesdir}/META-INF/NOTICE.txt"/>
61-
<jar jarfile="target/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}"/>
52+
<target name="jar" description="o Create the jar" depends="compile,test">
53+
<jar jarfile="target/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}">
54+
</jar>
6255
</target>
63-
6456
<target name="clean" description="o Clean up the generated directories">
65-
<delete dir="${defaulttargetdir}"/>
66-
<delete dir="${distdir}"/>
57+
<delete dir="${defaulttargetdir}">
58+
</delete>
59+
<delete dir="${distdir}">
60+
</delete>
6761
</target>
68-
6962
<target name="dist" description="o Create a distribution" depends="jar, javadoc">
70-
<mkdir dir="dist"/>
63+
<mkdir dir="dist">
64+
</mkdir>
7165
<copy todir="dist">
72-
<fileset dir="${defaulttargetdir}" includes="*.jar"/>
73-
<fileset dir="${basedir}" includes="LICENSE*, README*"/>
66+
<fileset dir="${defaulttargetdir}" includes="*.jar">
67+
</fileset>
68+
<fileset dir="${basedir}" includes="LICENSE*, README*">
69+
</fileset>
7470
</copy>
7571
</target>
76-
7772
<target name="test" description="o Run the test cases" if="test.failure" depends="internal-test">
78-
<fail message="There were test failures."/>
73+
<fail message="There were test failures.">
74+
</fail>
7975
</target>
80-
8176
<target name="internal-test" depends="compile-tests">
82-
<mkdir dir="${testreportdir}"/>
77+
<mkdir dir="${testreportdir}">
78+
</mkdir>
8379
<junit dir="./" failureproperty="test.failure" printSummary="yes" fork="true" haltonerror="true">
84-
<sysproperty key="basedir" value="."/>
85-
<formatter type="xml"/>
86-
<formatter usefile="false" type="plain"/>
80+
<sysproperty key="basedir" value=".">
81+
</sysproperty>
82+
<formatter type="xml">
83+
</formatter>
84+
<formatter usefile="false" type="plain">
85+
</formatter>
8786
<classpath>
8887
<fileset dir="${libdir}">
89-
<include name="*.jar"/>
88+
<include name="*.jar">
89+
</include>
9090
</fileset>
91-
<pathelement path="${testclassesdir}"/>
92-
<pathelement path="${classesdir}"/>
91+
<pathelement path="${testclassesdir}">
92+
</pathelement>
93+
<pathelement path="${classesdir}">
94+
</pathelement>
9395
</classpath>
9496
<batchtest todir="${testreportdir}">
9597
<fileset dir="src/test">
96-
<include name="**/*Test.java"/>
97-
<exclude name="**/*AbstractTest.java"/>
98+
<include name="**/*Test.java">
99+
</include>
100+
<exclude name="**/*AbstractTest.java">
101+
</exclude>
98102
</fileset>
99103
</batchtest>
100104
</junit>
101105
</target>
102-
103106
<target name="compile-tests" depends="compile">
104-
<mkdir dir="${testclassesdir}"/>
107+
<mkdir dir="${testclassesdir}">
108+
</mkdir>
105109
<javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
106110
<src>
107111
<pathelement location="src/test"/>
108112
</src>
109113
<classpath>
110114
<fileset dir="${libdir}">
111-
<include name="*.jar"/>
115+
<include name="*.jar">
116+
</include>
112117
</fileset>
113-
<pathelement path="${classesdir}"/>
118+
<pathelement path="${classesdir}">
119+
</pathelement>
114120
</classpath>
115121
</javac>
116122
</target>
117-
118-
<target name="javadoc" description="Generate javadoc" depends="jar">
119-
<mkdir dir="${javadocdir}"/>
123+
<target name="javadoc" description="o Generate javadoc" depends="jar">
124+
<mkdir dir="${javadocdir}">
125+
</mkdir>
120126
<tstamp>
121-
<format pattern="2003-yyyy" property="year"/>
127+
<format pattern="2003-yyyy" property="year">
128+
</format>
122129
</tstamp>
123-
<property name="copyright" value="Copyright &amp;copy; 2003-2004 The Apache Software Foundation. All Rights Reserved."/>
124-
<property name="title" value="Math 0.1 API"/>
125-
<javadoc bottom="Copyright &amp;copy; 2003-2004 The Apache Software Foundation. All Rights Reserved." windowtitle="Math 0.1 API" use="true" private="true" destdir="${javadocdir}" author="true" doctitle="Math 0.1 API" version="true" sourcepath="src/java" packagenames="org.apache.commons.*.*">
130+
<property name="copyright" value="Copyright &amp;copy; The Apache Software Foundation. All Rights Reserved.">
131+
</property>
132+
<property name="title" value="Math 1.0-dev API">
133+
</property>
134+
<javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="/home/mdiggory/workspace/jakarta-commons/math/src/java" packagenames="org.apache.commons.math.*">
126135
<classpath>
127136
<fileset dir="${libdir}">
128-
<include name="*.jar"/>
137+
<include name="*.jar">
138+
</include>
129139
</fileset>
130-
<pathelement location="target/${final.name}.jar"/>
140+
<pathelement location="target/${final.name}.jar">
141+
</pathelement>
131142
</classpath>
132143
</javadoc>
133144
</target>
134-
135145
<target name="get-deps" unless="noget" depends="init">
136-
<get dest="${libdir}/commons-beanutils-1.6.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.apache.org/dist/java-repository/commons-beanutils/jars/commons-beanutils-1.6.1.jar"/>
137-
<get dest="${libdir}/commons-collections-3.0.jar" usetimestamp="true" ignoreerrors="true" src="http://www.apache.org/dist/java-repository/commons-collections/jars/commons-collections-3.0.jar"/>
138-
<get dest="${libdir}/commons-lang-2.0.jar" usetimestamp="true" ignoreerrors="true" src="http://www.apache.org/dist/java-repository/commons-lang/jars/commons-lang-2.0.jar"/>
139-
<get dest="${libdir}/commons-logging-1.0.3.jar" usetimestamp="true" ignoreerrors="true" src="http://www.apache.org/dist/java-repository/commons-logging/jars/commons-logging-1.0.3.jar"/>
140-
<get dest="${libdir}/commons-discovery-0.2.jar" usetimestamp="true" ignoreerrors="true" src="http://www.apache.org/dist/java-repository/commons-discovery/jars/commons-discovery-0.2.jar"/>
141-
<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"/>
142-
<get dest="${libdir}/ant-1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.apache.org/dist/java-repository/ant/jars/ant-1.5.jar"/>
143-
<get dest="${libdir}/ant-optional-1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.apache.org/dist/java-repository/ant/jars/ant-optional-1.5.jar"/>
146+
<get dest="${libdir}/commons-collections-3.0.jar" usetimestamp="true" ignoreerrors="true" src="http://www.apache.org/dist/java-repository/commons-collections/jars/commons-collections-3.0.jar">
147+
</get>
148+
<get dest="${libdir}/commons-lang-2.0.jar" usetimestamp="true" ignoreerrors="true" src="http://www.apache.org/dist/java-repository/commons-lang/jars/commons-lang-2.0.jar">
149+
</get>
150+
<get dest="${libdir}/commons-logging-1.0.3.jar" usetimestamp="true" ignoreerrors="true" src="http://www.apache.org/dist/java-repository/commons-logging/jars/commons-logging-1.0.3.jar">
151+
</get>
152+
<get dest="${libdir}/commons-discovery-0.2.jar" usetimestamp="true" ignoreerrors="true" src="http://www.apache.org/dist/java-repository/commons-discovery/jars/commons-discovery-0.2.jar">
153+
</get>
154+
<get dest="${libdir}/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.apache.org/dist/java-repository/junit/jars/junit-3.8.1.jar">
155+
</get>
156+
<get dest="${libdir}/ant-1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.apache.org/dist/java-repository/ant/jars/ant-1.5.jar">
157+
</get>
158+
<get dest="${libdir}/ant-optional-1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.apache.org/dist/java-repository/ant/jars/ant-optional-1.5.jar">
159+
</get>
160+
</target>
161+
<target name="install-maven">
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>
144166
</target>
145-
</project>
167+
</project>

‎project.xml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
See the License for the specific language governing permissions and
1515
limitations under the License.
1616
-->
17-
<!-- $Revision: 1.44 $ $Date: 2004/04/24 18:40:22 $ -->
17+
<!-- $Revision: 1.45 $ $Date: 2004/06/01 23:55:31 $ -->
1818
<project>
1919
<pomVersion>3</pomVersion>
2020

@@ -120,10 +120,6 @@
120120
</contributor>
121121
</contributors>
122122
<dependencies>
123-
<dependency>
124-
<id>commons-beanutils</id>
125-
<version>1.6.1</version>
126-
</dependency>
127123
<dependency>
128124
<id>commons-collections</id>
129125
<version>3.0</version>

0 commit comments

Comments
 (0)