Author: niallp
Date: Thu Jul 19 15:28:49 2007
New Revision: 557796
URL: http://svn.apache.org/viewvc?view=rev&rev=557796
Log:
BEANUTILS-290 - Merge Bean-Collections back into core BeanUtils and remove
Bean-Collections sub-project
Added:
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/BeanComparator.java
- copied unchanged from r557757,
jakarta/commons/proper/beanutils/trunk/optional/bean-collections/src/java/org/apache/commons/beanutils/BeanComparator.java
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/BeanMap.java
- copied unchanged from r557757,
jakarta/commons/proper/beanutils/trunk/optional/bean-collections/src/java/org/apache/commons/beanutils/BeanMap.java
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/BeanPredicate.java
- copied unchanged from r557757,
jakarta/commons/proper/beanutils/trunk/optional/bean-collections/src/java/org/apache/commons/beanutils/BeanPredicate.java
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/BeanPropertyValueChangeClosure.java
- copied unchanged from r557757,
jakarta/commons/proper/beanutils/trunk/optional/bean-collections/src/java/org/apache/commons/beanutils/BeanPropertyValueChangeClosure.java
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/BeanPropertyValueEqualsPredicate.java
- copied unchanged from r557757,
jakarta/commons/proper/beanutils/trunk/optional/bean-collections/src/java/org/apache/commons/beanutils/BeanPropertyValueEqualsPredicate.java
jakarta/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/BeanToPropertyValueTransformer.java
- copied unchanged from r557757,
jakarta/commons/proper/beanutils/trunk/optional/bean-collections/src/java/org/apache/commons/beanutils/BeanToPropertyValueTransformer.java
jakarta/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/BeanComparatorTestCase.java
- copied unchanged from r557757,
jakarta/commons/proper/beanutils/trunk/optional/bean-collections/src/test/org/apache/commons/beanutils/BeanComparatorTestCase.java
jakarta/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/BeanMapTestCase.java
- copied, changed from r557757,
jakarta/commons/proper/beanutils/trunk/optional/bean-collections/src/test/org/apache/commons/beanutils/TestBeanMap.java
jakarta/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/BeanPredicateTestCase.java
- copied unchanged from r557757,
jakarta/commons/proper/beanutils/trunk/optional/bean-collections/src/test/org/apache/commons/beanutils/BeanPredicateTestCase.java
jakarta/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/BeanPropertyValueChangeClosureTestCase.java
- copied, changed from r557757,
jakarta/commons/proper/beanutils/trunk/optional/bean-collections/src/test/org/apache/commons/beanutils/BeanPropertyValueChangeClosureTest.java
jakarta/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/BeanPropertyValueEqualsPredicateTestCase.java
- copied, changed from r557757,
jakarta/commons/proper/beanutils/trunk/optional/bean-collections/src/test/org/apache/commons/beanutils/BeanPropertyValueEqualsPredicateTest.java
jakarta/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/BeanToPropertyValueTransformerTestCase.java
- copied, changed from r557757,
jakarta/commons/proper/beanutils/trunk/optional/bean-collections/src/test/org/apache/commons/beanutils/BeanToPropertyValueTransformerTest.java
jakarta/commons/proper/beanutils/trunk/xdocs/bean-collections.xml
- copied unchanged from r557757,
jakarta/commons/proper/beanutils/trunk/optional/bean-collections/xdocs/index.xml
Removed:
jakarta/commons/proper/beanutils/trunk/optional/
Modified:
jakarta/commons/proper/beanutils/trunk/build.properties.sample
jakarta/commons/proper/beanutils/trunk/build.xml
jakarta/commons/proper/beanutils/trunk/pom.xml
jakarta/commons/proper/beanutils/trunk/project.xml
jakarta/commons/proper/beanutils/trunk/src/site/site.xml
jakarta/commons/proper/beanutils/trunk/xdocs/navigation.xml
Modified: jakarta/commons/proper/beanutils/trunk/build.properties.sample
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/build.properties.sample?view=diff&rev=557796&r1=557795&r2=557796
==============================================================================
--- jakarta/commons/proper/beanutils/trunk/build.properties.sample (original)
+++ jakarta/commons/proper/beanutils/trunk/build.properties.sample Thu Jul 19
15:28:49 2007
@@ -19,6 +19,7 @@
# The pathname of the collections classes JAR file
commons-collections.home=${repository}/commons-collections/jars
commons-collections.jar=${commons-collections.home}/commons-collections-3.2.jar
+commons-collections-testframework.jar=${commons-collections.home}/commons-collections-testframework-3.2.jar
# The pathname of the Commons Logging JAR file
commons-logging.home=${repository}/commons-logging/jars
Modified: jakarta/commons/proper/beanutils/trunk/build.xml
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/build.xml?view=diff&rev=557796&r1=557795&r2=557796
==============================================================================
--- jakarta/commons/proper/beanutils/trunk/build.xml (original)
+++ jakarta/commons/proper/beanutils/trunk/build.xml Thu Jul 19 15:28:49 2007
@@ -78,6 +78,7 @@
<path id="compile.classpath">
<pathelement location="${build.home}/classes"/>
<pathelement location="${commons-logging.jar}"/>
+ <pathelement location="${commons-collections.jar}"/>
</path>
@@ -88,6 +89,8 @@
<path id="test.classpath">
<pathelement location="${build.home}/classes"/>
<pathelement location="${build.home}/tests"/>
+ <pathelement location="${commons-collections.jar}"/>
+ <pathelement location="${commons-collections-testframework.jar}"/>
<pathelement location="${commons-logging.jar}"/>
<pathelement location="${junit.jar}"/>
</path>
@@ -216,7 +219,6 @@
<copy file="README.txt"
todir="${dist.home}"/>
<antcall target="jar"/>
- <antcall target="bean-collections-dist"/>
</target>
@@ -231,7 +233,6 @@
<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>
@@ -242,12 +243,6 @@
<include name="commons-${component.name}.jar"/>
</fileset>
</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 ========================================= -->
Modified: jakarta/commons/proper/beanutils/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/pom.xml?view=diff&rev=557796&r1=557795&r2=557796
==============================================================================
--- jakarta/commons/proper/beanutils/trunk/pom.xml (original)
+++ jakarta/commons/proper/beanutils/trunk/pom.xml Thu Jul 19 15:28:49 2007
@@ -143,6 +143,18 @@
<version>1.0.4</version>
</dependency>
<dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections-testframework</artifactId>
+ <version>3.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
Modified: jakarta/commons/proper/beanutils/trunk/project.xml
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/project.xml?view=diff&rev=557796&r1=557795&r2=557796
==============================================================================
--- jakarta/commons/proper/beanutils/trunk/project.xml (original)
+++ jakarta/commons/proper/beanutils/trunk/project.xml Thu Jul 19 15:28:49 2007
@@ -174,6 +174,35 @@
</dependency>
<dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2</version>
+ <url>http://jakarta.apache.org/commons/collections/</url>
+ <properties>
+ <optional>true</optional>
+ <comment>
+ <strong>Optional</strong> - only required if using
+ BeanComparator, BeanMap, BeanPredicate,
BeanPropertyValueChangeClosure,
+ BeanPropertyValueEqualsPredicate or
BeanToPropertyValueTransformer
+ </comment>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections-testframework</artifactId>
+ <version>3.2</version>
+ <url>http://jakarta.apache.org/commons/collections/</url>
+ <properties>
+ <scope>test</scope>
+ <comment>
+ <strong>Test Only</strong> - required only for
+ running the some of the unit tests.
+ </comment>
+ </properties>
+ </dependency>
+
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
Modified: jakarta/commons/proper/beanutils/trunk/src/site/site.xml
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/src/site/site.xml?view=diff&rev=557796&r1=557795&r2=557796
==============================================================================
--- jakarta/commons/proper/beanutils/trunk/src/site/site.xml (original)
+++ jakarta/commons/proper/beanutils/trunk/src/site/site.xml Thu Jul 19
15:28:49 2007
@@ -40,7 +40,7 @@
<item name="Latest">
<item name="User Guide"
href="/apidocs/org/apache/commons/beanutils/package-summary.html#package_description"/>
<item name="API" href="/apidocs/index.html"/>
- <item name="Bean Collections"
href="/bean-collections/index.html"/>
+ <item name="Bean Collections" href="/bean-collections.html"/>
</item>
<item name="1.7.0 Release">
<item name="User Guide"
href="http://jakarta.apache.org/commons/beanutils/commons-beanutils-1.7.0/docs/api/org/apache/commons/beanutils/package-summary.html#package_description"/>
Copied:
jakarta/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/BeanMapTestCase.java
(from r557757,
jakarta/commons/proper/beanutils/trunk/optional/bean-collections/src/test/org/apache/commons/beanutils/TestBeanMap.java)
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/BeanMapTestCase.java?view=diff&rev=557796&p1=jakarta/commons/proper/beanutils/trunk/optional/bean-collections/src/test/org/apache/commons/beanutils/TestBeanMap.java&r1=557757&p2=jakarta/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/BeanMapTestCase.java&r2=557796
==============================================================================
---
jakarta/commons/proper/beanutils/trunk/optional/bean-collections/src/test/org/apache/commons/beanutils/TestBeanMap.java
(original)
+++
jakarta/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/BeanMapTestCase.java
Thu Jul 19 15:28:49 2007
@@ -36,9 +36,9 @@
* @author Morgan Delagrange
* @author Stephen Colebourne
*/
-public class TestBeanMap extends AbstractTestMap {
+public class BeanMapTestCase extends AbstractTestMap {
- public TestBeanMap(String testName) {
+ public BeanMapTestCase(String testName) {
super(testName);
}
@@ -47,7 +47,7 @@
}
public static Test suite() {
- return BulkTest.makeSuite(TestBeanMap.class);
+ return BulkTest.makeSuite(BeanMapTestCase.class);
}
/*
Copied:
jakarta/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/BeanPropertyValueChangeClosureTestCase.java
(from r557757,
jakarta/commons/proper/beanutils/trunk/optional/bean-collections/src/test/org/apache/commons/beanutils/BeanPropertyValueChangeClosureTest.java)
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/BeanPropertyValueChangeClosureTestCase.java?view=diff&rev=557796&p1=jakarta/commons/proper/beanutils/trunk/optional/bean-collections/src/test/org/apache/commons/beanutils/BeanPropertyValueChangeClosureTest.java&r1=557757&p2=jakarta/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/BeanPropertyValueChangeClosureTestCase.java&r2=557796
==============================================================================
---
jakarta/commons/proper/beanutils/trunk/optional/bean-collections/src/test/org/apache/commons/beanutils/BeanPropertyValueChangeClosureTest.java
(original)
+++
jakarta/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/BeanPropertyValueChangeClosureTestCase.java
Thu Jul 19 15:28:49 2007
@@ -25,7 +25,7 @@
*
* @author Norm Deane
*/
-public class BeanPropertyValueChangeClosureTest extends TestCase {
+public class BeanPropertyValueChangeClosureTestCase extends TestCase {
private static final Integer expectedIntegerValue = new Integer(123);
private static final Float expectedFloatValue = new Float(123.123f);
@@ -38,7 +38,7 @@
*
* @param name Name of this test case.
*/
- public BeanPropertyValueChangeClosureTest(String name) {
+ public BeanPropertyValueChangeClosureTestCase(String name) {
super(name);
}
Copied:
jakarta/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/BeanPropertyValueEqualsPredicateTestCase.java
(from r557757,
jakarta/commons/proper/beanutils/trunk/optional/bean-collections/src/test/org/apache/commons/beanutils/BeanPropertyValueEqualsPredicateTest.java)
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/BeanPropertyValueEqualsPredicateTestCase.java?view=diff&rev=557796&p1=jakarta/commons/proper/beanutils/trunk/optional/bean-collections/src/test/org/apache/commons/beanutils/BeanPropertyValueEqualsPredicateTest.java&r1=557757&p2=jakarta/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/BeanPropertyValueEqualsPredicateTestCase.java&r2=557796
==============================================================================
---
jakarta/commons/proper/beanutils/trunk/optional/bean-collections/src/test/org/apache/commons/beanutils/BeanPropertyValueEqualsPredicateTest.java
(original)
+++
jakarta/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/BeanPropertyValueEqualsPredicateTestCase.java
Thu Jul 19 15:28:49 2007
@@ -25,7 +25,7 @@
*
* @author Norm Deane
*/
-public class BeanPropertyValueEqualsPredicateTest extends TestCase {
+public class BeanPropertyValueEqualsPredicateTestCase extends TestCase {
private static final Integer expectedIntegerValue = new Integer(123);
private static final Float expectedFloatValue = new Float(123.123f);
@@ -38,7 +38,7 @@
*
* @param name Name of this test case.
*/
- public BeanPropertyValueEqualsPredicateTest(String name) {
+ public BeanPropertyValueEqualsPredicateTestCase(String name) {
super(name);
}
Copied:
jakarta/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/BeanToPropertyValueTransformerTestCase.java
(from r557757,
jakarta/commons/proper/beanutils/trunk/optional/bean-collections/src/test/org/apache/commons/beanutils/BeanToPropertyValueTransformerTest.java)
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/BeanToPropertyValueTransformerTestCase.java?view=diff&rev=557796&p1=jakarta/commons/proper/beanutils/trunk/optional/bean-collections/src/test/org/apache/commons/beanutils/BeanToPropertyValueTransformerTest.java&r1=557757&p2=jakarta/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/BeanToPropertyValueTransformerTestCase.java&r2=557796
==============================================================================
---
jakarta/commons/proper/beanutils/trunk/optional/bean-collections/src/test/org/apache/commons/beanutils/BeanToPropertyValueTransformerTest.java
(original)
+++
jakarta/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/BeanToPropertyValueTransformerTestCase.java
Thu Jul 19 15:28:49 2007
@@ -25,7 +25,7 @@
*
* @author Norm Deane
*/
-public class BeanToPropertyValueTransformerTest extends TestCase {
+public class BeanToPropertyValueTransformerTestCase extends TestCase {
private static final Integer expectedIntegerValue = new Integer(123);
private static final Long expectedLongValue = new Long(123);
@@ -35,11 +35,11 @@
private static final Byte expectedByteValue = new Byte("12");
/**
- * Constructor for BeanToPropertyValueTransformerTest.
+ * Constructor for BeanToPropertyValueTransformerTestCase.
*
* @param name Name of this test case.
*/
- public BeanToPropertyValueTransformerTest(String name) {
+ public BeanToPropertyValueTransformerTestCase(String name) {
super(name);
}
Modified: jakarta/commons/proper/beanutils/trunk/xdocs/navigation.xml
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/beanutils/trunk/xdocs/navigation.xml?view=diff&rev=557796&r1=557795&r2=557796
==============================================================================
--- jakarta/commons/proper/beanutils/trunk/xdocs/navigation.xml (original)
+++ jakarta/commons/proper/beanutils/trunk/xdocs/navigation.xml Thu Jul 19
15:28:49 2007
@@ -34,6 +34,7 @@
<item name="Overview" href="/index.html"/>
<item name="Download" href="/downloads.html"/>
<item name="User Guide (SVN latest)"
href="apidocs/org/apache/commons/beanutils/package-summary.html#package_description"/>
+ <item name="Bean-Collections" href="/bean-collections.html"/>
<item name='1.7.0 Release'>
<item name='User Guide'
href='http://jakarta.apache.org/commons/beanutils/commons-beanutils-1.7.0/docs/api/org/apache/commons/beanutils/package-summary.html#package_description'/>
@@ -51,9 +52,6 @@
href='http://jakarta.apache.org/commons/beanutils/commons-beanutils-1.6.1/docs/api/'/>
<item name='Release Notes'
href='http://jakarta.apache.org/commons/beanutils/commons-beanutils-1.6.1/RELEASE-NOTES.txt'/>
- </item>
- <item name='Modules'>
- <item name="Bean Collections" href="bean-collections/index.html"/>
</item>
<item name="Wiki"
href="http://wiki.apache.org/jakarta-commons/BeanUtils"/>
</menu>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
