rdonkin 2004/05/10 12:48:03
Modified: beanutils build.xml project.xml
Removed: beanutils/src/java/org/apache/commons/beanutils
BeanComparator.java BeanPredicate.java
BeanPropertyValueChangeClosure.java
BeanPropertyValueEqualsPredicate.java
BeanToPropertyValueTransformer.java
beanutils/src/test/org/apache/commons/beanutils
BeanCollectionsTestSuite.java
BeanComparatorTestCase.java
BeanPredicateTestCase.java
BeanPropertyValueChangeClosureTest.java
BeanPropertyValueEqualsPredicateTest.java
BeanToPropertyValueTransformerTest.java
Log:
Moved classes depending on commons-collections into separate directory with separate
build.
Revision Changes Path
1.59 +12 -32 jakarta-commons/beanutils/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/beanutils/build.xml,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- build.xml 29 Feb 2004 21:17:51 -0000 1.58
+++ build.xml 10 May 2004 19:48:03 -0000 1.59
@@ -32,10 +32,6 @@
<!-- ========== External Dependencies ===================================== -->
-
- <!-- The home directory for the Commons collection classes distribution -->
- <property name="commons-collections.home" value="../collections/dist"/>
-
<!-- The home directory for the Commons collection classes distribution -->
<property name="commons-logging.home" value="../logging/dist"/>
@@ -46,13 +42,6 @@
<!-- ========== Derived Values ============================================ -->
-
- <!-- The pathname of the collections classes JAR file -->
- <property name="commons-collections.jar"
value="${commons-collections.home}/commons-collections.jar"/>
-
- <!-- The pathname of the logging classes JAR file -->
- <property name="commons-logging.jar"
value="${commons-logging.home}/commons-logging.jar"/>
-
<!-- The pathname of the "junit.jar" JAR file -->
<property name="junit.jar" value="${junit.home}/junit.jar"/>
@@ -103,7 +92,6 @@
<!-- Construct compile classpath -->
<path id="compile.classpath">
<pathelement location="${build.home}/classes"/>
- <pathelement location="${commons-collections.jar}"/>
<pathelement location="${commons-logging.jar}"/>
</path>
@@ -115,7 +103,6 @@
<path id="test.classpath">
<pathelement location="${build.home}/classes"/>
<pathelement location="${build.home}/tests"/>
- <pathelement location="${commons-collections.jar}"/>
<pathelement location="${commons-logging.jar}"/>
<pathelement location="${junit.jar}"/>
</path>
@@ -226,7 +213,7 @@
overview="src/java/overview.html"
doctitle="<h1>${component.title} (Version
${component.version})</h1>"
windowtitle="${component.title} (Version ${component.version})"
- bottom="Copyright (c) 2001-2003 - Apache Software Foundation">
+ bottom="Copyright (c) 2001-2004 - Apache Software Foundation">
<classpath refid="compile.classpath"/>
</javadoc>
</target>
@@ -241,7 +228,10 @@
todir="${dist.home}"/>
<copy file="RELEASE-NOTES.txt"
todir="${dist.home}"/>
+ <copy file="README.txt"
+ todir="${dist.home}"/>
<antcall target="jar"/>
+ <antcall target="bean-collections-dist"/>
</target>
@@ -253,9 +243,10 @@
tofile="${build.home}/classes/META-INF/LICENSE.txt"/>
<copy file="NOTICE.txt"
tofile="${build.home}/classes/META-INF/NOTICE.txt"/>
- <jar jarfile="${dist.home}/commons-${component.name}.jar"
+ <jar jarfile="${dist.home}/commons-beanutils.jar"
basedir="${build.home}/classes"
manifest="${build.home}/conf/MANIFEST.MF"/>
+ <copy tofile='${dist.home}/commons-beanutils-core.jar'
file='${dist.home}/commons-beanutils.jar'/>
</target>
@@ -268,6 +259,11 @@
</copy>
</target>
+<!-- ========== Sub Component Targets ===================================== -->
+
+ <target name='bean-collections-dist'>
+ <ant antfile='optional/bean-collections/build.xml' target='dist'
inheritAll='false'/>
+ </target>
<!-- ========== Unit Test Targets ========================================= -->
@@ -283,7 +279,6 @@
test.method,
test.dyna.result,
test.dyna.row,
- test.bean.collections,
test.locale.convert,
test.converters,
test.beanification
@@ -438,21 +433,6 @@
<sysproperty key="org.apache.commons.logging.simplelog.defaultlog"
value="${test.level}"/>
<arg value="org.apache.commons.beanutils.DynaRowSetTestCase"/>
- <classpath refid="test.classpath"/>
- </java>
- </target>
-
- <target name="test.bean.collections" depends="compile.tests">
- <echo message="Running bean collection utilities tests ..."/>
- <java classname="${test.runner}" fork="yes"
- failonerror="${test.failonerror}">
- <sysproperty key="org.apache.commons.logging.LogFactory"
- value="${test.factory}"/>
- <sysproperty key="org.apache.commons.logging.Log"
- value="${test.log}"/>
- <sysproperty key="org.apache.commons.logging.simplelog.defaultlog"
- value="${test.level}"/>
- <arg value="org.apache.commons.beanutils.BeanCollectionsTestSuite"/>
<classpath refid="test.classpath"/>
</java>
</target>
1.21 +17 -6 jakarta-commons/beanutils/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/beanutils/project.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- project.xml 9 Apr 2004 19:58:06 -0000 1.20
+++ project.xml 10 May 2004 19:48:03 -0000 1.21
@@ -24,8 +24,8 @@
<description>BeanUtils provides an easy-to-use but flexible wrapper around
reflection and introspection.</description>
<logo>/images/logo.png</logo>
- <package>org.apache.commons.${pom.artifactId.substring(8)}.*</package>
-
<url>http://jakarta.apache.org/commons/${pom.artifactId.substring(8)}/index.html</url>
+ <package>org.apache.commons.beanutils.*</package>
+ <url>http://jakarta.apache.org/commons/beanutils/index.html</url>
<organization>
<name>The Apache Software Foundation</name>
@@ -123,15 +123,26 @@
<organization>Apache Software Foundation</organization>
</developer>
</developers>
+
+ <contributors>
+ <contributor>
+ <name>Paul Jack</name>
+ <email></email>
+ </contributor>
+ <contributor>
+ <name>Stephen Colebourne</name>
+ <email></email>
+ </contributor>
+ <contributor>
+ <name>Berin Loritsch</name>
+ <email></email>
+ </contributor>
+ </contributors>
<dependencies>
<dependency>
<id>commons-logging</id>
<version>1.0.3</version>
- </dependency>
- <dependency>
- <id>commons-collections</id>
- <version>3.0</version>
</dependency>
</dependencies>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
