cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject svn commit: r503209 - in /cayenne/main/trunk/framework/cayenne-jpa-unpublished/src: main/java/org/apache/cayenne/jpa/ main/java/org/apache/cayenne/jpa/reflect/ main/resources/META-INF/cayenne/templates/ test/java/org/apache/cayenne/jpa/
Date Sat, 03 Feb 2007 14:11:39 GMT
Author: aadamchik
Date: Sat Feb  3 06:11:38 2007
New Revision: 503209

URL: http://svn.apache.org/viewvc?view=rev&rev=503209
Log:
JPA package structure refactoring and provider class renaming

Added:
    cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/reflect/JpaClassDescriptorFactory.java
      - copied, changed from r503206, cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/reflect/CjpaClassDescriptorFactory.java
    cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/reflect/JpaCollectionFieldAccessor.java
      - copied, changed from r503206, cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/reflect/CjpaCollectionFieldAccessor.java
    cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/reflect/JpaToManyProperty.java
      - copied, changed from r503206, cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/reflect/CjpaToManyProperty.java
    cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/DefaultDataSourceFactoryTest.java
      - copied, changed from r503207, cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/CjpaDataSourceFactoryTest.java
    cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/JpaNativeQueryTest.java
      - copied, changed from r503207, cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/CjpaNativeQueryTest.java
Removed:
    cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/reflect/CjpaClassDescriptorFactory.java
    cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/reflect/CjpaCollectionFieldAccessor.java
    cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/reflect/CjpaToManyProperty.java
    cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/resources/META-INF/cayenne/templates/
    cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/CjpaDataSourceFactoryTest.java
    cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/CjpaNativeQueryTest.java
Modified:
    cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/JpaEntityManager.java
    cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/Provider.java

Modified: cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/JpaEntityManager.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/JpaEntityManager.java?view=diff&rev=503209&r1=503208&r2=503209
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/JpaEntityManager.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/JpaEntityManager.java
Sat Feb  3 06:11:38 2007
@@ -32,7 +32,7 @@
 import javax.persistence.spi.PersistenceUnitTransactionType;
 
 /**
- * Base implementation of a non-JTA EntityManager.
+ * Base implementation of EntityManager.
  * 
  * @author Andrus Adamchik
  */

Modified: cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/Provider.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/Provider.java?view=diff&rev=503209&r1=503208&r2=503209
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/Provider.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/Provider.java
Sat Feb  3 06:11:38 2007
@@ -46,7 +46,7 @@
 import org.apache.cayenne.jpa.enhancer.JpaEnhancerVisitorFactory;
 import org.apache.cayenne.jpa.instrument.UnitClassTranformer;
 import org.apache.cayenne.jpa.map.JpaClassDescriptor;
-import org.apache.cayenne.jpa.reflect.CjpaClassDescriptorFactory;
+import org.apache.cayenne.jpa.reflect.JpaClassDescriptorFactory;
 import org.apache.cayenne.map.DataMap;
 import org.apache.cayenne.map.DbEntity;
 import org.apache.cayenne.reflect.ClassDescriptorMap;
@@ -125,7 +125,7 @@
                     .getEntityResolver()
                     .getClassDescriptorMap();
 
-            descriptors.addFactory(new CjpaClassDescriptorFactory(descriptors));
+            descriptors.addFactory(new JpaClassDescriptorFactory(descriptors));
             configuration.addDomain(domain);
 
             EntityMapLoader loader = new EntityMapLoader(info);

Copied: cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/reflect/JpaClassDescriptorFactory.java
(from r503206, cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/reflect/CjpaClassDescriptorFactory.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/reflect/JpaClassDescriptorFactory.java?view=diff&rev=503209&p1=cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/reflect/CjpaClassDescriptorFactory.java&r1=503206&p2=cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/reflect/JpaClassDescriptorFactory.java&r2=503209
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/reflect/CjpaClassDescriptorFactory.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/reflect/JpaClassDescriptorFactory.java
Sat Feb  3 06:11:38 2007
@@ -26,9 +26,9 @@
 import org.apache.cayenne.reflect.PersistentDescriptor;
 import org.apache.cayenne.reflect.pojo.EnhancedPojoDescriptorFactory;
 
-public class CjpaClassDescriptorFactory extends EnhancedPojoDescriptorFactory {
+public class JpaClassDescriptorFactory extends EnhancedPojoDescriptorFactory {
 
-    public CjpaClassDescriptorFactory(ClassDescriptorMap descriptorMap) {
+    public JpaClassDescriptorFactory(ClassDescriptorMap descriptorMap) {
         super(descriptorMap);
     }
 
@@ -40,11 +40,11 @@
                 .getTargetEntityName());
         String reverseName = relationship.getReverseRelationshipName();
 
-        Accessor accessor = new CjpaCollectionFieldAccessor(
+        Accessor accessor = new JpaCollectionFieldAccessor(
                 descriptor.getObjectClass(),
                 relationship.getName(),
                 null);
-        descriptor.addDeclaredProperty(new CjpaToManyProperty(
+        descriptor.addDeclaredProperty(new JpaToManyProperty(
                 descriptor,
                 targetDescriptor,
                 accessor,

Copied: cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/reflect/JpaCollectionFieldAccessor.java
(from r503206, cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/reflect/CjpaCollectionFieldAccessor.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/reflect/JpaCollectionFieldAccessor.java?view=diff&rev=503209&p1=cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/reflect/CjpaCollectionFieldAccessor.java&r1=503206&p2=cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/reflect/JpaCollectionFieldAccessor.java&r2=503209
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/reflect/CjpaCollectionFieldAccessor.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/reflect/JpaCollectionFieldAccessor.java
Sat Feb  3 06:11:38 2007
@@ -24,9 +24,9 @@
 import org.apache.cayenne.reflect.FieldAccessor;
 import org.apache.cayenne.reflect.PropertyException;
 
-class CjpaCollectionFieldAccessor extends FieldAccessor {
+class JpaCollectionFieldAccessor extends FieldAccessor {
 
-    public CjpaCollectionFieldAccessor(Class objectClass, String propertyName,
+    public JpaCollectionFieldAccessor(Class objectClass, String propertyName,
             Class propertyType) {
         super(objectClass, propertyName, propertyType);
 

Copied: cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/reflect/JpaToManyProperty.java
(from r503206, cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/reflect/CjpaToManyProperty.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/reflect/JpaToManyProperty.java?view=diff&rev=503209&p1=cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/reflect/CjpaToManyProperty.java&r1=503206&p2=cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/reflect/JpaToManyProperty.java&r2=503209
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/reflect/CjpaToManyProperty.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/main/java/org/apache/cayenne/jpa/reflect/JpaToManyProperty.java
Sat Feb  3 06:11:38 2007
@@ -26,9 +26,9 @@
 
 // TODO: andrus 11/25/2006 - this should be modeled after EnhancedPojo instead of
 // DataObject to-many property.
-class CjpaToManyProperty extends ListProperty {
+class JpaToManyProperty extends ListProperty {
 
-    public CjpaToManyProperty(ClassDescriptor owner, ClassDescriptor targetDescriptor,
+    public JpaToManyProperty(ClassDescriptor owner, ClassDescriptor targetDescriptor,
             Accessor accessor, String reverseName) {
         super(owner, targetDescriptor, accessor, reverseName);
     }

Copied: cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/DefaultDataSourceFactoryTest.java
(from r503207, cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/CjpaDataSourceFactoryTest.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/DefaultDataSourceFactoryTest.java?view=diff&rev=503209&p1=cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/CjpaDataSourceFactoryTest.java&r1=503207&p2=cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/DefaultDataSourceFactoryTest.java&r2=503209
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/CjpaDataSourceFactoryTest.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/DefaultDataSourceFactoryTest.java
Sat Feb  3 06:11:38 2007
@@ -24,7 +24,7 @@
 
 import junit.framework.TestCase;
 
-public class CjpaDataSourceFactoryTest extends TestCase {
+public class DefaultDataSourceFactoryTest extends TestCase {
 
     public void testGetDriverKey() {
         DefaultDataSourceFactory factory = new DefaultDataSourceFactory();

Copied: cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/JpaNativeQueryTest.java
(from r503207, cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/CjpaNativeQueryTest.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/JpaNativeQueryTest.java?view=diff&rev=503209&p1=cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/CjpaNativeQueryTest.java&r1=503207&p2=cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/JpaNativeQueryTest.java&r2=503209
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/CjpaNativeQueryTest.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jpa-unpublished/src/test/java/org/apache/cayenne/jpa/JpaNativeQueryTest.java
Sat Feb  3 06:11:38 2007
@@ -25,7 +25,7 @@
 
 import junit.framework.TestCase;
 
-public class CjpaNativeQueryTest extends TestCase {
+public class JpaNativeQueryTest extends TestCase {
 
     public void testSetParameter1() {
         JpaNativeQuery q = new JpaNativeQuery(



Mime
View raw message