You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2009/12/17 16:27:41 UTC
svn commit: r891761 - in /cayenne/main/trunk: ./ framework/cayenne-jdk1.5-unpublished/ framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/enhancer/ framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/instrument/ fra...

Author: aadamchik
Date: Thu Dec 17 15:27:31 2009
New Revision: 891761

URL: http://svn.apache.org/viewvc?rev=891761&view=rev
Log:
cleanup - removing remaining class enhancer code

Removed:
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/enhancer/
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/instrument/
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/pojo/
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/enhancer/
Modified:
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/pom.xml
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/EntityResolver.java
    cayenne/main/trunk/framework/cayenne-server/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/framework/cayenne-jdk1.5-unpublished/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/pom.xml?rev=891761&r1=891760&r2=891761&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/pom.xml (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/pom.xml Thu Dec 17 15:27:31 2009
@@ -37,14 +37,6 @@
 			<version>${version}</version>
 		</dependency>
 		<dependency>
-			<groupId>asm</groupId>
-			<artifactId>asm</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>asm</groupId>
-			<artifactId>asm-commons</artifactId>
-		</dependency>
-		<dependency>
 			<groupId>org.objectstyle</groupId>
 			<artifactId>jdbc4-compat</artifactId>
 		</dependency>

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/EntityResolver.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/EntityResolver.java?rev=891761&r1=891760&r2=891761&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/EntityResolver.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/EntityResolver.java Thu Dec 17 15:27:31 2009
@@ -38,7 +38,6 @@
 import org.apache.cayenne.reflect.LifecycleCallbackRegistry;
 import org.apache.cayenne.reflect.SingletonFaultFactory;
 import org.apache.cayenne.reflect.generic.DataObjectDescriptorFactory;
-import org.apache.cayenne.reflect.pojo.EnhancedPojoDescriptorFactory;
 import org.apache.cayenne.reflect.valueholder.ValueHolderDescriptorFactory;
 import org.apache.cayenne.util.Util;
 import org.apache.commons.collections.collection.CompositeCollection;
@@ -852,9 +851,6 @@
             // add factories in reverse of the desired chain order
             classDescriptorMap.addFactory(new ValueHolderDescriptorFactory(
                     classDescriptorMap));
-            classDescriptorMap.addFactory(new EnhancedPojoDescriptorFactory(
-                    classDescriptorMap,
-                    faultFactory));
             classDescriptorMap.addFactory(new DataObjectDescriptorFactory(
                     classDescriptorMap,
                     faultFactory));

Modified: cayenne/main/trunk/framework/cayenne-server/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-server/pom.xml?rev=891761&r1=891760&r2=891761&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-server/pom.xml (original)
+++ cayenne/main/trunk/framework/cayenne-server/pom.xml Thu Dec 17 15:27:31 2009
@@ -49,14 +49,6 @@
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
-			<groupId>asm</groupId>
-			<artifactId>asm</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>asm</groupId>
-			<artifactId>asm-commons</artifactId>
-		</dependency>
-		<dependency>
 			<groupId>commons-collections</groupId>
 			<artifactId>commons-collections</artifactId>
 		</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=891761&r1=891760&r2=891761&view=diff
==============================================================================
--- cayenne/main/trunk/modeler/cayenne-modeler-java/pom.xml (original)
+++ cayenne/main/trunk/modeler/cayenne-modeler-java/pom.xml Thu Dec 17 15:27:31 2009
@@ -69,9 +69,6 @@
 					<name>CayenneModeler</name>
 					<mainClass>org.apache.cayenne.modeler.Main</mainClass>
 					<os>java</os>
-					<excludes>
-						<exclude>asm</exclude>
-					</excludes>
 				</configuration>
 				<executions>
 					<execution>

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=891761&r1=891760&r2=891761&view=diff
==============================================================================
--- cayenne/main/trunk/modeler/cayenne-modeler-mac/pom.xml (original)
+++ cayenne/main/trunk/modeler/cayenne-modeler-mac/pom.xml Thu Dec 17 15:27:31 2009
@@ -80,9 +80,6 @@
 					<os>mac</os>
 					<jvm>1.5+</jvm>
 					<jvmOptions>-Xmx500m</jvmOptions>
-					<excludes>
-						<exclude>asm</exclude>
-					</excludes>
 				</configuration>
 				<executions>
 					<execution>

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=891761&r1=891760&r2=891761&view=diff
==============================================================================
--- cayenne/main/trunk/modeler/cayenne-modeler-win/pom.xml (original)
+++ cayenne/main/trunk/modeler/cayenne-modeler-win/pom.xml Thu Dec 17 15:27:31 2009
@@ -72,9 +72,6 @@
 					<os>windows</os>
 					<jvm>1.5+</jvm>
 					<jvmOptions>-Xmx500m</jvmOptions>
-					<excludes>
-						<exclude>asm</exclude>
-					</excludes>
 				</configuration>
 				<executions>
 					<execution>

Modified: cayenne/main/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/pom.xml?rev=891761&r1=891760&r2=891761&view=diff
==============================================================================
--- cayenne/main/trunk/pom.xml (original)
+++ cayenne/main/trunk/pom.xml Thu Dec 17 15:27:31 2009
@@ -230,16 +230,6 @@
 				<version>2.0</version>
 			</dependency>
 			<dependency>
-				<groupId>asm</groupId>
-				<artifactId>asm</artifactId>
-				<version>3.0</version>
-			</dependency>
-			<dependency>
-				<groupId>asm</groupId>
-				<artifactId>asm-commons</artifactId>
-				<version>3.0</version>
-			</dependency>
-			<dependency>
 				<groupId>commons-collections</groupId>
 				<artifactId>commons-collections</artifactId>
 				<version>3.1</version>