Return-Path: 
 <commits-return-3250-apmail-cayenne-commits-archive=cayenne.apache.org@cayenne.apache.org>
Delivered-To: apmail-cayenne-commits-archive@www.apache.org
Received: (qmail 48107 invoked from network); 15 Nov 2007 00:26:51 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 15 Nov 2007 00:26:51 -0000
Received: (qmail 38202 invoked by uid 500); 15 Nov 2007 00:26:39 -0000
Delivered-To: apmail-cayenne-commits-archive@cayenne.apache.org
Received: (qmail 38183 invoked by uid 500); 15 Nov 2007 00:26:39 -0000
Mailing-List: contact commits-help@cayenne.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cayenne.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cayenne.apache.org>
List-Post: <mailto:commits@cayenne.apache.org>
List-Id: <commits.cayenne.apache.org>
Reply-To: dev@cayenne.apache.org
Delivered-To: mailing list commits@cayenne.apache.org
Received: (qmail 38172 invoked by uid 99); 15 Nov 2007 00:26:39 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 Nov 2007 16:26:39 -0800
X-ASF-Spam-Status: No, hits=-100.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 15 Nov 2007 00:26:36 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id C1CC51A9832; Wed, 14 Nov 2007 16:26:29 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r595155 - in /cayenne/main/trunk: ./
 build-tools/cayenne-regression-profiler/ docs/doc/src/main/resources/
 framework/cayenne-client/ framework/cayenne-jdk1.5-unpublished/
 framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne...
Date: Thu, 15 Nov 2007 00:26:28 -0000
To: commits@cayenne.apache.org
From: aadamchik@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20071115002629.C1CC51A9832@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: aadamchik
Date: Wed Nov 14 16:26:26 2007
New Revision: 595155

URL: http://svn.apache.org/viewvc?rev=595155&view=rev
Log:
CAY-904   Switch cayenne to Java 5: merge cayenne-jdk1.4-unpublished to cayenne-jdk1.5-unpublished (forth and final pass)

Modified:
    cayenne/main/trunk/build-tools/cayenne-regression-profiler/pom.xml
    cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt
    cayenne/main/trunk/framework/cayenne-client/pom.xml
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/pom.xml
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/reflect/PropertyUtilsTest.java
    cayenne/main/trunk/framework/cayenne-jpa-unpublished/pom.xml
    cayenne/main/trunk/framework/cayenne-modeler/pom.xml
    cayenne/main/trunk/framework/cayenne-server/pom.xml
    cayenne/main/trunk/framework/maven-cayenne-plugin/pom.xml
    cayenne/main/trunk/modeler/cayenne-modeler-java/pom.xml
    cayenne/main/trunk/modeler/cayenne-modeler-mac/pom.xml
    cayenne/main/trunk/modeler/cayenne-modeler-win/pom.xml
    cayenne/main/trunk/pom.xml

Modified: cayenne/main/trunk/build-tools/cayenne-regression-profiler/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/build-tools/cayenne-regression-profiler/pom.xml?rev=595155&r1=595154&r2=595155&view=diff
==============================================================================
--- cayenne/main/trunk/build-tools/cayenne-regression-profiler/pom.xml (original)
+++ cayenne/main/trunk/build-tools/cayenne-regression-profiler/pom.xml Wed Nov 14 16:26:26 2007
@@ -37,8 +37,8 @@
 			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<configuration>
-					<source>1.4</source>
-					<target>1.4</target>
+					<source>1.5</source>
+					<target>1.5</target>
 				</configuration>
 			</plugin>
 			<plugin>
@@ -83,7 +83,7 @@
 			<dependencies>
 				<dependency>
 					<groupId>org.apache.cayenne.core</groupId>
-					<artifactId>cayenne-jdk1.4</artifactId>
+					<artifactId>cayenne-jdk1.5</artifactId>
 					<version>${version}</version>
 				</dependency>
 				<dependency>

Modified: cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt?rev=595155&r1=595154&r2=595155&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt Wed Nov 14 16:26:26 2007
@@ -18,6 +18,7 @@
 CAY-879 Storing lifecycle listeners and callbacks in the *.map.xml and loading them back
 CAY-885 merge changes between model and db
 CAY-900 Create CayenneModeler Swing UI for managing callbacks and lifecycle listeners
+CAY-904 Switch cayenne to Java 5: merge cayenne-jdk1.4-unpublished to cayenne-jdk1.5-unpublished
 CAY-916 Ordering should be able to ignore paths with null elements
 CAY-918 An exception during in-memory sorting of IncrementalFaultList
 

Modified: cayenne/main/trunk/framework/cayenne-client/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-client/pom.xml?rev=595155&r1=595154&r2=595155&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-client/pom.xml (original)
+++ cayenne/main/trunk/framework/cayenne-client/pom.xml Wed Nov 14 16:26:26 2007
@@ -32,18 +32,11 @@
 	<artifactId>cayenne-client</artifactId>
 	<packaging>jar</packaging>
 	<name>Cayenne Aggregated Client Jar</name>
-	<description>An aggregation of 1.4, 1.5 modules into an ROP client jar.</description>
+	<description>An aggregation of 1.5 module into an ROP client jar.</description>
 
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.cayenne.unpublished</groupId>
-			<artifactId>cayenne-jdk1.4-unpublished</artifactId>
-			<version>${version}</version>
-			<scope>provided</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.cayenne.unpublished</groupId>
 			<artifactId>cayenne-jdk1.5-unpublished</artifactId>
 			<version>${version}</version>
 			<scope>provided</scope>
@@ -94,11 +87,6 @@
 						<configuration>
 							<excludesFile>src/main/aggregator/excludes.txt</excludesFile>
 							<artifactItems>
-								<artifactItem>
-									<groupId>org.apache.cayenne.unpublished</groupId>
-									<artifactId>cayenne-jdk1.4-unpublished</artifactId>
-									<version>${version}</version>
-								</artifactItem>
 								<artifactItem>
 									<groupId>org.apache.cayenne.unpublished</groupId>
 									<artifactId>cayenne-jdk1.5-unpublished</artifactId>

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/pom.xml?rev=595155&r1=595154&r2=595155&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/pom.xml (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/pom.xml Wed Nov 14 16:26:26 2007
@@ -44,6 +44,16 @@
 		</dependency>
 
 		<dependency>
+                        <groupId>asm</groupId>
+                        <artifactId>asm</artifactId>
+                </dependency>
+
+                <dependency>
+                        <groupId>asm</groupId>
+                        <artifactId>asm-commons</artifactId>
+                </dependency>
+
+		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-core</artifactId>
 		</dependency>

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/reflect/PropertyUtilsTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/reflect/PropertyUtilsTest.java?rev=595155&r1=595154&r2=595155&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/reflect/PropertyUtilsTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/reflect/PropertyUtilsTest.java Wed Nov 14 16:26:26 2007
@@ -24,6 +24,8 @@
 import java.util.Map;
 
 import org.apache.cayenne.reflect.PropertyUtils;
+import org.apache.cayenne.access.types.MockEnum;
+import org.apache.cayenne.access.types.MockEnumHolder;
 
 import junit.framework.TestCase;
 
@@ -119,7 +121,7 @@
     }
     
     
-    public void testSetConverted() {
+    public void testSetConvertedEnum() {
         MockEnumHolder o1 = new MockEnumHolder();
 
         // String to Enum

Modified: cayenne/main/trunk/framework/cayenne-jpa-unpublished/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jpa-unpublished/pom.xml?rev=595155&r1=595154&r2=595155&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jpa-unpublished/pom.xml (original)
+++ cayenne/main/trunk/framework/cayenne-jpa-unpublished/pom.xml Wed Nov 14 16:26:26 2007
@@ -53,12 +53,6 @@
 
 		<dependency>
 			<groupId>org.apache.cayenne.unpublished</groupId>
-			<artifactId>cayenne-jdk1.4-unpublished</artifactId>
-			<version>${version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.cayenne.unpublished</groupId>
 			<artifactId>cayenne-jdk1.5-unpublished</artifactId>
 			<version>${version}</version>
 		</dependency>

Modified: cayenne/main/trunk/framework/cayenne-modeler/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/pom.xml?rev=595155&r1=595154&r2=595155&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/pom.xml (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/pom.xml Wed Nov 14 16:26:26 2007
@@ -100,13 +100,6 @@
 		
 		<dependency>
 			<groupId>org.apache.cayenne.unpublished</groupId>
-			<artifactId>cayenne-jdk1.4-unpublished</artifactId>
-			<version>${version}</version>
-			<scope>provided</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.cayenne.unpublished</groupId>
 			<artifactId>cayenne-jdk1.5-unpublished</artifactId>
 			<version>${version}</version>
 			<scope>provided</scope>
@@ -156,8 +149,8 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<configuration>
-					<source>1.4</source>
-					<target>1.4</target>
+					<source>1.5</source>
+					<target>1.5</target>
 				</configuration>
 			</plugin>
 		</plugins>

Modified: cayenne/main/trunk/framework/cayenne-server/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-server/pom.xml?rev=595155&r1=595154&r2=595155&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-server/pom.xml (original)
+++ cayenne/main/trunk/framework/cayenne-server/pom.xml Wed Nov 14 16:26:26 2007
@@ -32,19 +32,12 @@
 	<artifactId>cayenne-server</artifactId>
 	<packaging>jar</packaging>
 	<name>Cayenne Aggregated Server Jar</name>
-	<description>An aggregation of 1.4, 1.5 and JPA modules.</description>
+	<description>An aggregation of 1.5 and JPA modules.</description>
 
 	<dependencies>
 
 		<dependency>
 			<groupId>org.apache.cayenne.unpublished</groupId>
-			<artifactId>cayenne-jdk1.4-unpublished</artifactId>
-			<version>${version}</version>
-			<scope>provided</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.cayenne.unpublished</groupId>
 			<artifactId>cayenne-jdk1.5-unpublished</artifactId>
 			<version>${version}</version>
 			<scope>provided</scope>
@@ -106,11 +99,6 @@
 						</goals>
 						<configuration>
 							<artifactItems>
-								<artifactItem>
-									<groupId>org.apache.cayenne.unpublished</groupId>
-									<artifactId>cayenne-jdk1.4-unpublished</artifactId>
-									<version>${version}</version>
-								</artifactItem>
 								<artifactItem>
 									<groupId>org.apache.cayenne.unpublished</groupId>
 									<artifactId>cayenne-jdk1.5-unpublished</artifactId>

Modified: cayenne/main/trunk/framework/maven-cayenne-plugin/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/maven-cayenne-plugin/pom.xml?rev=595155&r1=595154&r2=595155&view=diff
==============================================================================
--- cayenne/main/trunk/framework/maven-cayenne-plugin/pom.xml (original)
+++ cayenne/main/trunk/framework/maven-cayenne-plugin/pom.xml Wed Nov 14 16:26:26 2007
@@ -65,7 +65,7 @@
 		-->
 		<dependency>
 			<groupId>org.apache.cayenne.unpublished</groupId>
-			<artifactId>cayenne-jdk1.4-unpublished</artifactId>
+			<artifactId>cayenne-jdk1.5-unpublished</artifactId>
 			<version>${version}</version>
 			<scope>provided</scope>
 		</dependency>

Modified: cayenne/main/trunk/modeler/cayenne-modeler-java/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/modeler/cayenne-modeler-java/pom.xml?rev=595155&r1=595154&r2=595155&view=diff
==============================================================================
--- cayenne/main/trunk/modeler/cayenne-modeler-java/pom.xml (original)
+++ cayenne/main/trunk/modeler/cayenne-modeler-java/pom.xml Wed Nov 14 16:26:26 2007
@@ -48,12 +48,6 @@
 		-->
 		<dependency>
 			<groupId>org.apache.cayenne.unpublished</groupId>
-			<artifactId>cayenne-jdk1.4-unpublished</artifactId>
-			<version>${version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.cayenne.unpublished</groupId>
 			<artifactId>cayenne-jdk1.5-unpublished</artifactId>
 			<version>${version}</version>
 		</dependency>

Modified: cayenne/main/trunk/modeler/cayenne-modeler-mac/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/modeler/cayenne-modeler-mac/pom.xml?rev=595155&r1=595154&r2=595155&view=diff
==============================================================================
--- cayenne/main/trunk/modeler/cayenne-modeler-mac/pom.xml (original)
+++ cayenne/main/trunk/modeler/cayenne-modeler-mac/pom.xml Wed Nov 14 16:26:26 2007
@@ -53,12 +53,6 @@
 		-->
 		<dependency>
 			<groupId>org.apache.cayenne.unpublished</groupId>
-			<artifactId>cayenne-jdk1.4-unpublished</artifactId>
-			<version>${version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.cayenne.unpublished</groupId>
 			<artifactId>cayenne-jdk1.5-unpublished</artifactId>
 			<version>${version}</version>
 		</dependency>
@@ -84,7 +78,7 @@
 					<mainClass>org.apache.cayenne.modeler.MacOSXMain</mainClass>
 					<icon>src/japplication/resources/CayenneModeler.icns</icon>
 					<os>mac</os>
-					<jvm>1.4+</jvm>
+					<jvm>1.5+</jvm>
 					<jvmOptions>-Xmx500m</jvmOptions>
 					<excludes>
 						<exclude>asm</exclude>

Modified: cayenne/main/trunk/modeler/cayenne-modeler-win/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/modeler/cayenne-modeler-win/pom.xml?rev=595155&r1=595154&r2=595155&view=diff
==============================================================================
--- cayenne/main/trunk/modeler/cayenne-modeler-win/pom.xml (original)
+++ cayenne/main/trunk/modeler/cayenne-modeler-win/pom.xml Wed Nov 14 16:26:26 2007
@@ -48,12 +48,6 @@
 		-->
 		<dependency>
 			<groupId>org.apache.cayenne.unpublished</groupId>
-			<artifactId>cayenne-jdk1.4-unpublished</artifactId>
-			<version>${version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.cayenne.unpublished</groupId>
 			<artifactId>cayenne-jdk1.5-unpublished</artifactId>
 			<version>${version}</version>
 		</dependency>
@@ -76,7 +70,7 @@
 					<mainClass>org.apache.cayenne.modeler.Main</mainClass>
 					<icon>src/japplication/resources/CayenneModeler.ico</icon>
 					<os>windows</os>
-					<jvm>1.4+</jvm>
+					<jvm>1.5+</jvm>
 					<jvmOptions>-Xmx500m</jvmOptions>
 					<excludes>
 						<exclude>asm</exclude>

Modified: cayenne/main/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/pom.xml?rev=595155&r1=595154&r2=595155&view=diff
==============================================================================
--- cayenne/main/trunk/pom.xml (original)
+++ cayenne/main/trunk/pom.xml Wed Nov 14 16:26:26 2007
@@ -603,7 +603,6 @@
 					<showProtected>true</showProtected>
 					<showPackage>false</showPackage>
 					<links>
-						<link>http://java.sun.com/j2ee/1.4/docs/api</link>
 						<link>http://java.sun.com/j2se/1.5.0/docs/api</link>
 						<link>
 							http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_0/