cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject svn commit: r424835 - in /incubator/cayenne/main/trunk/cayenne-jpa: ./ src/main/java/org/apache/cayenne/jpa/bridge/ src/main/java/org/apache/cayenne/jpa/conf/ src/main/java/org/apache/cayenne/jpa/cspi/ src/main/java/org/apache/cayenne/jpa/enhancer/ src...
Date Sun, 23 Jul 2006 22:04:13 GMT
Author: aadamchik
Date: Sun Jul 23 15:04:11 2006
New Revision: 424835

URL: http://svn.apache.org/viewvc?rev=424835&view=rev
Log:
switching JPA code to the 3.0-incubating-SNAPSHOT version of Cayenne dependency

Modified:
    incubator/cayenne/main/trunk/cayenne-jpa/pom.xml
    incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/bridge/DataMapConverter.java
    incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/bridge/JpaEjbQLQuery.java
    incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/bridge/JpaIndirectQuery.java
    incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/bridge/JpaProcedureQuery.java
    incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/bridge/JpaSQLTemplate.java
    incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/bridge/JpaSelectQuery.java
    incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/conf/ClassAnnotationProcessorFactory.java
    incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/conf/EntityMapAnnotationLoader.java
    incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/conf/EntityMapDefaultsProcessor.java
    incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/conf/EntityMapLoaderContext.java
    incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/conf/EntityMapXMLLoader.java
    incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaClassDescriptorFactory.java
    incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaCollectionFieldAccessor.java
    incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaCollectionProperty.java
    incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaDataSourceFactory.java
    incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaEntityDescriptor.java
    incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaEntityManager.java
    incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaEntityManagerFactory.java
    incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaEntityTransaction.java
    incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaNativeQuery.java
    incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaPersistenceProvider.java
    incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaQuery.java
    incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/enhancer/CglibEnhancer.java
    incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/enhancer/DataObjectAccessorInjector.java
    incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/enhancer/DataObjectDelegate.java
    incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/enhancer/DataObjectPropertyInjector.java
    incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/enhancer/InterfaceMethodInjector.java
    incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/map/JpaPropertyDescriptor.java
    incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/util/BaseTreeVisitor.java
    incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/util/HierarchicalTreeVisitor.java
    incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/util/TraversalUtil.java
    incubator/cayenne/main/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/bridge/DataMapConverterTest.java
    incubator/cayenne/main/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/bridge/DataMapMappingAssertion.java
    incubator/cayenne/main/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/cspi/CjpaNativeQueryTest.java
    incubator/cayenne/main/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/enhancer/EnhancerTest.java
    incubator/cayenne/main/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/entity/cayenne/MockCayenneEntity1.java
    incubator/cayenne/main/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/entity/cayenne/MockCayenneEntity2.java
    incubator/cayenne/main/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/util/BaseTreeVisitorTest.java
    incubator/cayenne/main/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/util/MockHierarchicalTreeVisitor.java

Modified: incubator/cayenne/main/trunk/cayenne-jpa/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne-jpa/pom.xml?rev=424835&r1=424834&r2=424835&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne-jpa/pom.xml (original)
+++ incubator/cayenne/main/trunk/cayenne-jpa/pom.xml Sun Jul 23 15:04:11 2006
@@ -97,6 +97,20 @@
 			<name>ObjectStyle Public Maven2 repo</name>
 			<url>http://objectstyle.org/maven2</url>
 		</repository>
+		<repository>
+            <id>apache-snapshots</id>
+            <name>Apache Snapshots Repository</name>
+            <url>http://people.apache.org/maven-snapshot-repository</url>
+            <layout>default</layout>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>daily</updatePolicy>
+                <checksumPolicy>ignore</checksumPolicy>
+            </snapshots>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+        </repository>
 	</repositories>
 
 	<dependencies>
@@ -112,7 +126,7 @@
 			<version>1.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
-			<groupId>org.objectstyle.cayenne</groupId>
+			<groupId>org.apache.cayenne</groupId>
 			<artifactId>cayenne-nodeps</artifactId>
 			<version>3.0-incubating-SNAPSHOT</version>
 		</dependency>

Modified: incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/bridge/DataMapConverter.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/bridge/DataMapConverter.java?rev=424835&r1=424834&r2=424835&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/bridge/DataMapConverter.java (original)
+++ incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/bridge/DataMapConverter.java Sun Jul 23 15:04:11 2006
@@ -38,20 +38,20 @@
 import org.apache.cayenne.jpa.map.JpaQueryHint;
 import org.apache.cayenne.jpa.map.JpaRelationship;
 import org.apache.cayenne.jpa.map.JpaTable;
+import org.apache.cayenne.map.DataMap;
+import org.apache.cayenne.map.DbAttribute;
+import org.apache.cayenne.map.DbEntity;
+import org.apache.cayenne.map.DbJoin;
+import org.apache.cayenne.map.DbRelationship;
+import org.apache.cayenne.map.ObjAttribute;
+import org.apache.cayenne.map.ObjEntity;
+import org.apache.cayenne.map.ObjRelationship;
+import org.apache.cayenne.project.ProjectPath;
 import org.apache.cayenne.util.BaseTreeVisitor;
 import org.apache.cayenne.util.HierarchicalTreeVisitor;
 import org.apache.cayenne.util.TraversalUtil;
-import org.objectstyle.cayenne.map.DataMap;
-import org.objectstyle.cayenne.map.DbAttribute;
-import org.objectstyle.cayenne.map.DbEntity;
-import org.objectstyle.cayenne.map.DbJoin;
-import org.objectstyle.cayenne.map.DbRelationship;
-import org.objectstyle.cayenne.map.ObjAttribute;
-import org.objectstyle.cayenne.map.ObjEntity;
-import org.objectstyle.cayenne.map.ObjRelationship;
-import org.objectstyle.cayenne.project.ProjectPath;
-import org.objectstyle.cayenne.util.Util;
-import org.objectstyle.cayenne.validation.SimpleValidationFailure;
+import org.apache.cayenne.util.Util;
+import org.apache.cayenne.validation.SimpleValidationFailure;
 
 /**
  * A converter between {@link org.apache.cayenne.jpa.map.JpaEntityMap} and Cayenne

Modified: incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/bridge/JpaEjbQLQuery.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/bridge/JpaEjbQLQuery.java?rev=424835&r1=424834&r2=424835&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/bridge/JpaEjbQLQuery.java (original)
+++ incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/bridge/JpaEjbQLQuery.java Sun Jul 23 15:04:11 2006
@@ -15,8 +15,8 @@
  */
 package org.apache.cayenne.jpa.bridge;
 
-import org.objectstyle.cayenne.map.EntityResolver;
-import org.objectstyle.cayenne.query.Query;
+import org.apache.cayenne.map.EntityResolver;
+import org.apache.cayenne.query.Query;
 
 public class JpaEjbQLQuery extends JpaIndirectQuery {
 

Modified: incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/bridge/JpaIndirectQuery.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/bridge/JpaIndirectQuery.java?rev=424835&r1=424834&r2=424835&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/bridge/JpaIndirectQuery.java (original)
+++ incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/bridge/JpaIndirectQuery.java Sun Jul 23 15:04:11 2006
@@ -19,11 +19,11 @@
 
 import org.apache.cayenne.jpa.JpaProviderException;
 import org.apache.cayenne.jpa.map.JpaNamedQuery;
-import org.objectstyle.cayenne.map.DataMap;
-import org.objectstyle.cayenne.map.ObjEntity;
-import org.objectstyle.cayenne.query.IndirectQuery;
-import org.objectstyle.cayenne.query.ParameterizedQuery;
-import org.objectstyle.cayenne.query.Query;
+import org.apache.cayenne.map.DataMap;
+import org.apache.cayenne.map.ObjEntity;
+import org.apache.cayenne.query.IndirectQuery;
+import org.apache.cayenne.query.ParameterizedQuery;
+import org.apache.cayenne.query.Query;
 
 /**
  * A superclass of indirect queries that map JPA to Cayenne queries.

Modified: incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/bridge/JpaProcedureQuery.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/bridge/JpaProcedureQuery.java?rev=424835&r1=424834&r2=424835&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/bridge/JpaProcedureQuery.java (original)
+++ incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/bridge/JpaProcedureQuery.java Sun Jul 23 15:04:11 2006
@@ -15,8 +15,8 @@
  */
 package org.apache.cayenne.jpa.bridge;
 
-import org.objectstyle.cayenne.map.EntityResolver;
-import org.objectstyle.cayenne.query.Query;
+import org.apache.cayenne.map.EntityResolver;
+import org.apache.cayenne.query.Query;
 
 /**
  * An indirect query that resolves to Cayenne ProcedureQuery using information from JPA

Modified: incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/bridge/JpaSQLTemplate.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/bridge/JpaSQLTemplate.java?rev=424835&r1=424834&r2=424835&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/bridge/JpaSQLTemplate.java (original)
+++ incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/bridge/JpaSQLTemplate.java Sun Jul 23 15:04:11 2006
@@ -18,10 +18,10 @@
 import java.util.Collections;
 
 import org.apache.cayenne.jpa.map.JpaQueryHint;
-import org.objectstyle.cayenne.CayenneRuntimeException;
-import org.objectstyle.cayenne.map.EntityResolver;
-import org.objectstyle.cayenne.query.Query;
-import org.objectstyle.cayenne.query.SQLTemplate;
+import org.apache.cayenne.CayenneRuntimeException;
+import org.apache.cayenne.map.EntityResolver;
+import org.apache.cayenne.query.Query;
+import org.apache.cayenne.query.SQLTemplate;
 
 /**
  * An indirect query that resolves to Cayenne SQLTemplate using information from JPA query

Modified: incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/bridge/JpaSelectQuery.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/bridge/JpaSelectQuery.java?rev=424835&r1=424834&r2=424835&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/bridge/JpaSelectQuery.java (original)
+++ incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/bridge/JpaSelectQuery.java Sun Jul 23 15:04:11 2006
@@ -18,11 +18,11 @@
 import java.util.Collections;
 
 import org.apache.cayenne.jpa.map.JpaQueryHint;
-import org.objectstyle.cayenne.CayenneRuntimeException;
-import org.objectstyle.cayenne.exp.Expression;
-import org.objectstyle.cayenne.map.EntityResolver;
-import org.objectstyle.cayenne.query.Query;
-import org.objectstyle.cayenne.query.SelectQuery;
+import org.apache.cayenne.CayenneRuntimeException;
+import org.apache.cayenne.exp.Expression;
+import org.apache.cayenne.map.EntityResolver;
+import org.apache.cayenne.query.Query;
+import org.apache.cayenne.query.SelectQuery;
 
 /**
  * An indirect query that resolves to Cayenne SelectQuery using information from JPA query

Modified: incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/conf/ClassAnnotationProcessorFactory.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/conf/ClassAnnotationProcessorFactory.java?rev=424835&r1=424834&r2=424835&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/conf/ClassAnnotationProcessorFactory.java (original)
+++ incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/conf/ClassAnnotationProcessorFactory.java Sun Jul 23 15:04:11 2006
@@ -55,7 +55,7 @@
 import org.apache.cayenne.jpa.map.JpaSqlResultSetMapping;
 import org.apache.cayenne.jpa.map.JpaTable;
 import org.apache.cayenne.jpa.map.JpaTableGenerator;
-import org.objectstyle.cayenne.util.Util;
+import org.apache.cayenne.util.Util;
 
 /**
  * A factory of class annotation processors.

Modified: incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/conf/EntityMapAnnotationLoader.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/conf/EntityMapAnnotationLoader.java?rev=424835&r1=424834&r2=424835&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/conf/EntityMapAnnotationLoader.java (original)
+++ incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/conf/EntityMapAnnotationLoader.java Sun Jul 23 15:04:11 2006
@@ -47,8 +47,8 @@
 import org.apache.cayenne.jpa.map.JpaManagedAttribute;
 import org.apache.cayenne.jpa.map.JpaManagedClass;
 import org.apache.cayenne.jpa.map.JpaPropertyDescriptor;
-import org.objectstyle.cayenne.util.Util;
-import org.objectstyle.cayenne.validation.SimpleValidationFailure;
+import org.apache.cayenne.util.Util;
+import org.apache.cayenne.validation.SimpleValidationFailure;
 
 /**
  * {@link org.apache.cayenne.jpa.map.JpaEntityMap} loader that reads mapping information

Modified: incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/conf/EntityMapDefaultsProcessor.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/conf/EntityMapDefaultsProcessor.java?rev=424835&r1=424834&r2=424835&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/conf/EntityMapDefaultsProcessor.java (original)
+++ incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/conf/EntityMapDefaultsProcessor.java Sun Jul 23 15:04:11 2006
@@ -41,9 +41,9 @@
 import org.apache.cayenne.util.BaseTreeVisitor;
 import org.apache.cayenne.util.HierarchicalTreeVisitor;
 import org.apache.cayenne.util.TraversalUtil;
-import org.objectstyle.cayenne.project.ProjectPath;
-import org.objectstyle.cayenne.util.Util;
-import org.objectstyle.cayenne.validation.SimpleValidationFailure;
+import org.apache.cayenne.project.ProjectPath;
+import org.apache.cayenne.util.Util;
+import org.apache.cayenne.validation.SimpleValidationFailure;
 
 /**
  * Initializes JPA specification compatible mapping defaults.

Modified: incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/conf/EntityMapLoaderContext.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/conf/EntityMapLoaderContext.java?rev=424835&r1=424834&r2=424835&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/conf/EntityMapLoaderContext.java (original)
+++ incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/conf/EntityMapLoaderContext.java Sun Jul 23 15:04:11 2006
@@ -18,8 +18,8 @@
 import javax.persistence.spi.PersistenceUnitInfo;
 
 import org.apache.cayenne.jpa.map.JpaEntityMap;
-import org.objectstyle.cayenne.validation.ValidationFailure;
-import org.objectstyle.cayenne.validation.ValidationResult;
+import org.apache.cayenne.validation.ValidationFailure;
+import org.apache.cayenne.validation.ValidationResult;
 
 /**
  * A common context shared by different loaders during JPA mapping information processing.

Modified: incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/conf/EntityMapXMLLoader.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/conf/EntityMapXMLLoader.java?rev=424835&r1=424834&r2=424835&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/conf/EntityMapXMLLoader.java (original)
+++ incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/conf/EntityMapXMLLoader.java Sun Jul 23 15:04:11 2006
@@ -27,7 +27,7 @@
 import javax.xml.validation.SchemaFactory;
 
 import org.apache.cayenne.jpa.map.JpaEntityMap;
-import org.objectstyle.cayenne.xml.XMLDecoder;
+import org.apache.cayenne.xml.XMLDecoder;
 import org.xml.sax.SAXException;
 
 /**

Modified: incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaClassDescriptorFactory.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaClassDescriptorFactory.java?rev=424835&r1=424834&r2=424835&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaClassDescriptorFactory.java (original)
+++ incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaClassDescriptorFactory.java Sun Jul 23 15:04:11 2006
@@ -15,11 +15,11 @@
  */
 package org.apache.cayenne.jpa.cspi;
 
-import org.objectstyle.cayenne.map.EntityDescriptor;
-import org.objectstyle.cayenne.map.EntityDescriptorFactory;
-import org.objectstyle.cayenne.map.EntityResolver;
-import org.objectstyle.cayenne.map.ObjEntity;
-import org.objectstyle.cayenne.property.ClassDescriptor;
+import org.apache.cayenne.map.EntityDescriptor;
+import org.apache.cayenne.map.EntityDescriptorFactory;
+import org.apache.cayenne.map.EntityResolver;
+import org.apache.cayenne.map.ObjEntity;
+import org.apache.cayenne.property.ClassDescriptor;
 
 public class CjpaClassDescriptorFactory extends EntityDescriptorFactory {
 

Modified: incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaCollectionFieldAccessor.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaCollectionFieldAccessor.java?rev=424835&r1=424834&r2=424835&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaCollectionFieldAccessor.java (original)
+++ incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaCollectionFieldAccessor.java Sun Jul 23 15:04:11 2006
@@ -15,10 +15,10 @@
  */
 package org.apache.cayenne.jpa.cspi;
 
-import org.objectstyle.cayenne.Fault;
-import org.objectstyle.cayenne.Persistent;
-import org.objectstyle.cayenne.property.FieldAccessor;
-import org.objectstyle.cayenne.property.PropertyAccessException;
+import org.apache.cayenne.Fault;
+import org.apache.cayenne.Persistent;
+import org.apache.cayenne.property.FieldAccessor;
+import org.apache.cayenne.property.PropertyAccessException;
 
 class CjpaCollectionFieldAccessor extends FieldAccessor {
 

Modified: incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaCollectionProperty.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaCollectionProperty.java?rev=424835&r1=424834&r2=424835&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaCollectionProperty.java (original)
+++ incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaCollectionProperty.java Sun Jul 23 15:04:11 2006
@@ -15,10 +15,10 @@
  */
 package org.apache.cayenne.jpa.cspi;
 
-import org.objectstyle.cayenne.property.ClassDescriptor;
-import org.objectstyle.cayenne.property.PropertyAccessException;
-import org.objectstyle.cayenne.property.PropertyAccessor;
-import org.objectstyle.cayenne.property.ToManyListProperty;
+import org.apache.cayenne.property.ClassDescriptor;
+import org.apache.cayenne.property.PropertyAccessException;
+import org.apache.cayenne.property.PropertyAccessor;
+import org.apache.cayenne.property.ToManyListProperty;
 
 class CjpaCollectionProperty extends ToManyListProperty {
 

Modified: incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaDataSourceFactory.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaDataSourceFactory.java?rev=424835&r1=424834&r2=424835&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaDataSourceFactory.java (original)
+++ incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaDataSourceFactory.java Sun Jul 23 15:04:11 2006
@@ -24,11 +24,11 @@
 import org.apache.cayenne.jpa.JpaProviderException;
 import org.apache.cayenne.jpa.spi.JndiJpaDataSourceFactory;
 import org.apache.cayenne.jpa.spi.JpaDataSourceFactory;
-import org.objectstyle.cayenne.access.ConnectionLogger;
-import org.objectstyle.cayenne.access.QueryLogger;
-import org.objectstyle.cayenne.conf.ConnectionProperties;
-import org.objectstyle.cayenne.conn.PoolManager;
-import org.objectstyle.cayenne.util.Util;
+import org.apache.cayenne.access.ConnectionLogger;
+import org.apache.cayenne.access.QueryLogger;
+import org.apache.cayenne.conf.ConnectionProperties;
+import org.apache.cayenne.conn.PoolManager;
+import org.apache.cayenne.util.Util;
 
 /**
  * A {@link JpaDataSourceFactory} that attempts to create a DataSource based on Cayenne

Modified: incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaEntityDescriptor.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaEntityDescriptor.java?rev=424835&r1=424834&r2=424835&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaEntityDescriptor.java (original)
+++ incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaEntityDescriptor.java Sun Jul 23 15:04:11 2006
@@ -18,15 +18,15 @@
 import java.util.Iterator;
 import java.util.Map;
 
-import org.objectstyle.cayenne.map.EntityDescriptor;
-import org.objectstyle.cayenne.map.EntityResolver;
-import org.objectstyle.cayenne.map.ObjEntity;
-import org.objectstyle.cayenne.map.ObjRelationship;
-import org.objectstyle.cayenne.property.ClassDescriptor;
-import org.objectstyle.cayenne.property.FieldAccessor;
-import org.objectstyle.cayenne.property.ListProperty;
-import org.objectstyle.cayenne.property.PropertyAccessException;
-import org.objectstyle.cayenne.property.PropertyAccessor;
+import org.apache.cayenne.map.EntityDescriptor;
+import org.apache.cayenne.map.EntityResolver;
+import org.apache.cayenne.map.ObjEntity;
+import org.apache.cayenne.map.ObjRelationship;
+import org.apache.cayenne.property.ClassDescriptor;
+import org.apache.cayenne.property.FieldAccessor;
+import org.apache.cayenne.property.ListProperty;
+import org.apache.cayenne.property.PropertyAccessException;
+import org.apache.cayenne.property.PropertyAccessor;
 
 class CjpaEntityDescriptor extends EntityDescriptor {
 

Modified: incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaEntityManager.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaEntityManager.java?rev=424835&r1=424834&r2=424835&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaEntityManager.java (original)
+++ incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaEntityManager.java Sun Jul 23 15:04:11 2006
@@ -21,11 +21,11 @@
 import javax.persistence.Query;
 
 import org.apache.cayenne.jpa.JpaEntityManager;
-import org.objectstyle.cayenne.CayenneRuntimeException;
-import org.objectstyle.cayenne.DataObject;
-import org.objectstyle.cayenne.DataObjectUtils;
-import org.objectstyle.cayenne.Persistent;
-import org.objectstyle.cayenne.access.DataContext;
+import org.apache.cayenne.CayenneRuntimeException;
+import org.apache.cayenne.DataObject;
+import org.apache.cayenne.DataObjectUtils;
+import org.apache.cayenne.Persistent;
+import org.apache.cayenne.access.DataContext;
 
 public class CjpaEntityManager extends JpaEntityManager {
 

Modified: incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaEntityManagerFactory.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaEntityManagerFactory.java?rev=424835&r1=424834&r2=424835&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaEntityManagerFactory.java (original)
+++ incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaEntityManagerFactory.java Sun Jul 23 15:04:11 2006
@@ -20,7 +20,7 @@
 import javax.persistence.spi.PersistenceUnitInfo;
 
 import org.apache.cayenne.jpa.JpaEntityManagerFactory;
-import org.objectstyle.cayenne.access.DataDomain;
+import org.apache.cayenne.access.DataDomain;
 
 /**
  * A default EntityManagerFactory used by Cayenne JPA provider.

Modified: incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaEntityTransaction.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaEntityTransaction.java?rev=424835&r1=424834&r2=424835&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaEntityTransaction.java (original)
+++ incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaEntityTransaction.java Sun Jul 23 15:04:11 2006
@@ -20,8 +20,8 @@
 import javax.persistence.EntityTransaction;
 import javax.persistence.PersistenceException;
 
-import org.objectstyle.cayenne.CayenneException;
-import org.objectstyle.cayenne.access.Transaction;
+import org.apache.cayenne.CayenneException;
+import org.apache.cayenne.access.Transaction;
 
 /**
  * A JPA wrapper around a cayenne Transaction

Modified: incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaNativeQuery.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaNativeQuery.java?rev=424835&r1=424834&r2=424835&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaNativeQuery.java (original)
+++ incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaNativeQuery.java Sun Jul 23 15:04:11 2006
@@ -17,8 +17,8 @@
 
 import javax.persistence.Query;
 
-import org.objectstyle.cayenne.access.DataContext;
-import org.objectstyle.cayenne.query.SQLTemplate;
+import org.apache.cayenne.access.DataContext;
+import org.apache.cayenne.query.SQLTemplate;
 
 public class CjpaNativeQuery extends CjpaQuery {
 

Modified: incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaPersistenceProvider.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaPersistenceProvider.java?rev=424835&r1=424834&r2=424835&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaPersistenceProvider.java (original)
+++ incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaPersistenceProvider.java Sun Jul 23 15:04:11 2006
@@ -35,17 +35,17 @@
 import org.apache.cayenne.jpa.spi.JpaPersistenceProvider;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.objectstyle.cayenne.access.DataDomain;
-import org.objectstyle.cayenne.access.DataNode;
-import org.objectstyle.cayenne.conf.Configuration;
-import org.objectstyle.cayenne.conf.ConnectionProperties;
-import org.objectstyle.cayenne.dba.AutoAdapter;
-import org.objectstyle.cayenne.dba.DbAdapter;
-import org.objectstyle.cayenne.map.DataMap;
-import org.objectstyle.cayenne.util.ResourceLocator;
-import org.objectstyle.cayenne.util.Util;
-import org.objectstyle.cayenne.validation.SimpleValidationFailure;
-import org.objectstyle.cayenne.validation.ValidationResult;
+import org.apache.cayenne.access.DataDomain;
+import org.apache.cayenne.access.DataNode;
+import org.apache.cayenne.conf.Configuration;
+import org.apache.cayenne.conf.ConnectionProperties;
+import org.apache.cayenne.dba.AutoAdapter;
+import org.apache.cayenne.dba.DbAdapter;
+import org.apache.cayenne.map.DataMap;
+import org.apache.cayenne.util.ResourceLocator;
+import org.apache.cayenne.util.Util;
+import org.apache.cayenne.validation.SimpleValidationFailure;
+import org.apache.cayenne.validation.ValidationResult;
 
 /**
  * A PersistenceProvider implementation based on Cayenne stack. Wraps a Cayenne

Modified: incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaQuery.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaQuery.java?rev=424835&r1=424834&r2=424835&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaQuery.java (original)
+++ incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/cspi/CjpaQuery.java Sun Jul 23 15:04:11 2006
@@ -27,11 +27,11 @@
 import javax.persistence.TemporalType;
 import javax.persistence.TransactionRequiredException;
 
-import org.objectstyle.cayenne.access.DataContext;
-import org.objectstyle.cayenne.query.ParameterizedQuery;
-import org.objectstyle.cayenne.query.ProcedureQuery;
-import org.objectstyle.cayenne.query.SQLTemplate;
-import org.objectstyle.cayenne.query.SelectQuery;
+import org.apache.cayenne.access.DataContext;
+import org.apache.cayenne.query.ParameterizedQuery;
+import org.apache.cayenne.query.ProcedureQuery;
+import org.apache.cayenne.query.SQLTemplate;
+import org.apache.cayenne.query.SelectQuery;
 
 /**
  * A jpa Query that wraps a Cayenne Query.
@@ -39,7 +39,7 @@
 public class CjpaQuery implements Query {
 
     protected Map<String, Object> parameters = new HashMap<String, Object>();
-    protected org.objectstyle.cayenne.query.Query cayenneQuery;
+    protected org.apache.cayenne.query.Query cayenneQuery;
     protected DataContext context;
 
     public CjpaQuery(DataContext ctxt) {
@@ -55,7 +55,7 @@
     public CjpaQuery(DataContext context, String name) {
         this(context);
 
-        org.objectstyle.cayenne.query.Query q = context.getEntityResolver().lookupQuery(
+        org.apache.cayenne.query.Query q = context.getEntityResolver().lookupQuery(
                 name);
 
         if (q == null) {
@@ -65,18 +65,18 @@
         setQuery(q);
     }
 
-    protected void setQuery(org.objectstyle.cayenne.query.Query q) {
+    protected void setQuery(org.apache.cayenne.query.Query q) {
         this.cayenneQuery = q;
     }
 
-    protected org.objectstyle.cayenne.query.Query getQuery() {
+    protected org.apache.cayenne.query.Query getQuery() {
         return cayenneQuery;
     }
 
     /**
      * Return the same query with parameters set.
      */
-    private org.objectstyle.cayenne.query.Query queryWithParameters() {
+    private org.apache.cayenne.query.Query queryWithParameters() {
         if (parameters.size() == 0) {
             return cayenneQuery;
         }

Modified: incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/enhancer/CglibEnhancer.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/enhancer/CglibEnhancer.java?rev=424835&r1=424834&r2=424835&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/enhancer/CglibEnhancer.java (original)
+++ incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/enhancer/CglibEnhancer.java Sun Jul 23 15:04:11 2006
@@ -37,8 +37,8 @@
 import net.sf.cglib.transform.TransformingClassGenerator;
 
 import org.apache.cayenne.jpa.map.JpaClassDescriptor;
-import org.objectstyle.cayenne.CayenneRuntimeException;
-import org.objectstyle.cayenne.DataObject;
+import org.apache.cayenne.CayenneRuntimeException;
+import org.apache.cayenne.DataObject;
 
 /**
  * A JPA class transformer based on Cglib library.

Modified: incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/enhancer/DataObjectAccessorInjector.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/enhancer/DataObjectAccessorInjector.java?rev=424835&r1=424834&r2=424835&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/enhancer/DataObjectAccessorInjector.java (original)
+++ incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/enhancer/DataObjectAccessorInjector.java Sun Jul 23 15:04:11 2006
@@ -27,7 +27,7 @@
 import org.apache.cayenne.jpa.JpaProviderException;
 import org.apache.cayenne.jpa.map.JpaClassDescriptor;
 import org.apache.cayenne.jpa.map.JpaPropertyDescriptor;
-import org.objectstyle.cayenne.Persistent;
+import org.apache.cayenne.Persistent;
 
 /**
  * Injects persistence code to the property accessors.

Modified: incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/enhancer/DataObjectDelegate.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/enhancer/DataObjectDelegate.java?rev=424835&r1=424834&r2=424835&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/enhancer/DataObjectDelegate.java (original)
+++ incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/enhancer/DataObjectDelegate.java Sun Jul 23 15:04:11 2006
@@ -20,27 +20,27 @@
 import java.util.List;
 import java.util.Map;
 
-import org.objectstyle.cayenne.CayenneRuntimeException;
-import org.objectstyle.cayenne.DataObject;
-import org.objectstyle.cayenne.ObjectContext;
-import org.objectstyle.cayenne.ObjectId;
-import org.objectstyle.cayenne.Persistent;
-import org.objectstyle.cayenne.access.DataContext;
-import org.objectstyle.cayenne.access.DataNode;
-import org.objectstyle.cayenne.access.types.ExtendedTypeMap;
-import org.objectstyle.cayenne.map.DbAttribute;
-import org.objectstyle.cayenne.map.DbJoin;
-import org.objectstyle.cayenne.map.DbRelationship;
-import org.objectstyle.cayenne.map.EntityResolver;
-import org.objectstyle.cayenne.map.ObjAttribute;
-import org.objectstyle.cayenne.map.ObjEntity;
-import org.objectstyle.cayenne.map.ObjRelationship;
-import org.objectstyle.cayenne.property.ClassDescriptor;
-import org.objectstyle.cayenne.property.Property;
-import org.objectstyle.cayenne.property.PropertyUtils;
-import org.objectstyle.cayenne.validation.BeanValidationFailure;
-import org.objectstyle.cayenne.validation.ValidationFailure;
-import org.objectstyle.cayenne.validation.ValidationResult;
+import org.apache.cayenne.CayenneRuntimeException;
+import org.apache.cayenne.DataObject;
+import org.apache.cayenne.ObjectContext;
+import org.apache.cayenne.ObjectId;
+import org.apache.cayenne.Persistent;
+import org.apache.cayenne.access.DataContext;
+import org.apache.cayenne.access.DataNode;
+import org.apache.cayenne.access.types.ExtendedTypeMap;
+import org.apache.cayenne.map.DbAttribute;
+import org.apache.cayenne.map.DbJoin;
+import org.apache.cayenne.map.DbRelationship;
+import org.apache.cayenne.map.EntityResolver;
+import org.apache.cayenne.map.ObjAttribute;
+import org.apache.cayenne.map.ObjEntity;
+import org.apache.cayenne.map.ObjRelationship;
+import org.apache.cayenne.property.ClassDescriptor;
+import org.apache.cayenne.property.Property;
+import org.apache.cayenne.property.PropertyUtils;
+import org.apache.cayenne.validation.BeanValidationFailure;
+import org.apache.cayenne.validation.ValidationFailure;
+import org.apache.cayenne.validation.ValidationResult;
 
 /**
  * A static delegate for DataObject callbacks. To obtain class descriptors,

Modified: incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/enhancer/DataObjectPropertyInjector.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/enhancer/DataObjectPropertyInjector.java?rev=424835&r1=424834&r2=424835&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/enhancer/DataObjectPropertyInjector.java (original)
+++ incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/enhancer/DataObjectPropertyInjector.java Sun Jul 23 15:04:11 2006
@@ -15,8 +15,8 @@
  */
 package org.apache.cayenne.jpa.enhancer;
 
-import org.objectstyle.cayenne.ObjectContext;
-import org.objectstyle.cayenne.ObjectId;
+import org.apache.cayenne.ObjectContext;
+import org.apache.cayenne.ObjectId;
 
 public class DataObjectPropertyInjector extends PropertyInjector {
 

Modified: incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/enhancer/InterfaceMethodInjector.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/enhancer/InterfaceMethodInjector.java?rev=424835&r1=424834&r2=424835&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/enhancer/InterfaceMethodInjector.java (original)
+++ incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/enhancer/InterfaceMethodInjector.java Sun Jul 23 15:04:11 2006
@@ -27,7 +27,7 @@
 import net.sf.cglib.core.Signature;
 import net.sf.cglib.transform.ClassEmitterTransformer;
 
-import org.objectstyle.cayenne.CayenneRuntimeException;
+import org.apache.cayenne.CayenneRuntimeException;
 
 /**
  * A class transformer that delegates execution of the interface methods to the

Modified: incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/map/JpaPropertyDescriptor.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/map/JpaPropertyDescriptor.java?rev=424835&r1=424834&r2=424835&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/map/JpaPropertyDescriptor.java (original)
+++ incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/map/JpaPropertyDescriptor.java Sun Jul 23 15:04:11 2006
@@ -27,7 +27,7 @@
 import javax.persistence.TemporalType;
 
 import org.apache.cayenne.jpa.JpaProviderException;
-import org.objectstyle.cayenne.dba.TypesMapping;
+import org.apache.cayenne.dba.TypesMapping;
 
 /**
  * A descriptor of a class property that may or may not be persistent.

Modified: incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/util/BaseTreeVisitor.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/util/BaseTreeVisitor.java?rev=424835&r1=424834&r2=424835&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/util/BaseTreeVisitor.java (original)
+++ incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/util/BaseTreeVisitor.java Sun Jul 23 15:04:11 2006
@@ -18,7 +18,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.objectstyle.cayenne.project.ProjectPath;
+import org.apache.cayenne.project.ProjectPath;
 
 /**
  * A common superclass for specialized tree visitors. Can also be used as a noop

Modified: incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/util/HierarchicalTreeVisitor.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/util/HierarchicalTreeVisitor.java?rev=424835&r1=424834&r2=424835&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/util/HierarchicalTreeVisitor.java (original)
+++ incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/util/HierarchicalTreeVisitor.java Sun Jul 23 15:04:11 2006
@@ -15,7 +15,7 @@
  */
 package org.apache.cayenne.util;
 
-import org.objectstyle.cayenne.project.ProjectPath;
+import org.apache.cayenne.project.ProjectPath;
 
 /**
  * A hierarchical visitor interface used for tree structures traversal.

Modified: incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/util/TraversalUtil.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/util/TraversalUtil.java?rev=424835&r1=424834&r2=424835&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/util/TraversalUtil.java (original)
+++ incubator/cayenne/main/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/util/TraversalUtil.java Sun Jul 23 15:04:11 2006
@@ -22,7 +22,7 @@
 import java.util.Map;
 
 import org.apache.cayenne.jpa.JpaProviderException;
-import org.objectstyle.cayenne.project.ProjectPath;
+import org.apache.cayenne.project.ProjectPath;
 
 /**
  * Defines tree traversal utility methods. Object tree sematics is determined using

Modified: incubator/cayenne/main/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/bridge/DataMapConverterTest.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/bridge/DataMapConverterTest.java?rev=424835&r1=424834&r2=424835&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/bridge/DataMapConverterTest.java (original)
+++ incubator/cayenne/main/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/bridge/DataMapConverterTest.java Sun Jul 23 15:04:11 2006
@@ -27,7 +27,7 @@
 import org.apache.cayenne.jpa.entity.cayenne.MockCayenneTargetEntity2;
 import org.apache.cayenne.jpa.map.JpaEntityMap;
 import org.apache.cayenne.jpa.spi.MockPersistenceUnitInfo;
-import org.objectstyle.cayenne.map.DataMap;
+import org.apache.cayenne.map.DataMap;
 
 public class DataMapConverterTest extends TestCase {
 

Modified: incubator/cayenne/main/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/bridge/DataMapMappingAssertion.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/bridge/DataMapMappingAssertion.java?rev=424835&r1=424834&r2=424835&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/bridge/DataMapMappingAssertion.java (original)
+++ incubator/cayenne/main/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/bridge/DataMapMappingAssertion.java Sun Jul 23 15:04:11 2006
@@ -24,14 +24,14 @@
 
 import org.apache.cayenne.jpa.entity.cayenne.MockCayenneEntity1;
 import org.apache.cayenne.jpa.entity.cayenne.MockCayenneEntity2;
-import org.objectstyle.cayenne.dba.TypesMapping;
-import org.objectstyle.cayenne.map.DataMap;
-import org.objectstyle.cayenne.map.DbAttribute;
-import org.objectstyle.cayenne.map.DbEntity;
-import org.objectstyle.cayenne.map.DbRelationship;
-import org.objectstyle.cayenne.map.ObjAttribute;
-import org.objectstyle.cayenne.map.ObjEntity;
-import org.objectstyle.cayenne.map.ObjRelationship;
+import org.apache.cayenne.dba.TypesMapping;
+import org.apache.cayenne.map.DataMap;
+import org.apache.cayenne.map.DbAttribute;
+import org.apache.cayenne.map.DbEntity;
+import org.apache.cayenne.map.DbRelationship;
+import org.apache.cayenne.map.ObjAttribute;
+import org.apache.cayenne.map.ObjEntity;
+import org.apache.cayenne.map.ObjRelationship;
 
 public class DataMapMappingAssertion extends Assert {
 

Modified: incubator/cayenne/main/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/cspi/CjpaNativeQueryTest.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/cspi/CjpaNativeQueryTest.java?rev=424835&r1=424834&r2=424835&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/cspi/CjpaNativeQueryTest.java (original)
+++ incubator/cayenne/main/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/cspi/CjpaNativeQueryTest.java Sun Jul 23 15:04:11 2006
@@ -15,7 +15,7 @@
  */
 package org.apache.cayenne.jpa.cspi;
 
-import org.objectstyle.cayenne.access.DataContext;
+import org.apache.cayenne.access.DataContext;
 
 import junit.framework.TestCase;
 

Modified: incubator/cayenne/main/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/enhancer/EnhancerTest.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/enhancer/EnhancerTest.java?rev=424835&r1=424834&r2=424835&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/enhancer/EnhancerTest.java (original)
+++ incubator/cayenne/main/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/enhancer/EnhancerTest.java Sun Jul 23 15:04:11 2006
@@ -28,10 +28,10 @@
 import org.apache.cayenne.jpa.map.JpaClassDescriptor;
 import org.apache.cayenne.jpa.map.JpaEntityMap;
 import org.apache.cayenne.jpa.spi.JpaUnitClassLoader;
-import org.objectstyle.cayenne.DataObject;
-import org.objectstyle.cayenne.ObjectId;
-import org.objectstyle.cayenne.PersistenceState;
-import org.objectstyle.cayenne.property.PropertyUtils;
+import org.apache.cayenne.DataObject;
+import org.apache.cayenne.ObjectId;
+import org.apache.cayenne.PersistenceState;
+import org.apache.cayenne.property.PropertyUtils;
 
 public class EnhancerTest extends TestCase {
 

Modified: incubator/cayenne/main/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/entity/cayenne/MockCayenneEntity1.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/entity/cayenne/MockCayenneEntity1.java?rev=424835&r1=424834&r2=424835&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/entity/cayenne/MockCayenneEntity1.java (original)
+++ incubator/cayenne/main/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/entity/cayenne/MockCayenneEntity1.java Sun Jul 23 15:04:11 2006
@@ -38,8 +38,8 @@
 import javax.persistence.Version;
 
 import org.apache.cayenne.jpa.entity.MockTargetEntity2;
-import org.objectstyle.cayenne.CayenneDataObject;
-import org.objectstyle.cayenne.ObjectId;
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.ObjectId;
 
 @Entity
 @Table(name = "mock_persistent_1", catalog = "catalog1", schema = "schema1")

Modified: incubator/cayenne/main/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/entity/cayenne/MockCayenneEntity2.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/entity/cayenne/MockCayenneEntity2.java?rev=424835&r1=424834&r2=424835&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/entity/cayenne/MockCayenneEntity2.java (original)
+++ incubator/cayenne/main/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/entity/cayenne/MockCayenneEntity2.java Sun Jul 23 15:04:11 2006
@@ -18,8 +18,8 @@
 import javax.persistence.Entity;
 import javax.persistence.IdClass;
 
-import org.objectstyle.cayenne.CayenneDataObject;
-import org.objectstyle.cayenne.ObjectId;
+import org.apache.cayenne.CayenneDataObject;
+import org.apache.cayenne.ObjectId;
 
 @Entity
 @IdClass(ObjectId.class)

Modified: incubator/cayenne/main/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/util/BaseTreeVisitorTest.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/util/BaseTreeVisitorTest.java?rev=424835&r1=424834&r2=424835&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/util/BaseTreeVisitorTest.java (original)
+++ incubator/cayenne/main/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/util/BaseTreeVisitorTest.java Sun Jul 23 15:04:11 2006
@@ -17,7 +17,7 @@
 
 import junit.framework.TestCase;
 
-import org.objectstyle.cayenne.project.ProjectPath;
+import org.apache.cayenne.project.ProjectPath;
 
 public class BaseTreeVisitorTest extends TestCase {
 

Modified: incubator/cayenne/main/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/util/MockHierarchicalTreeVisitor.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/util/MockHierarchicalTreeVisitor.java?rev=424835&r1=424834&r2=424835&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/util/MockHierarchicalTreeVisitor.java (original)
+++ incubator/cayenne/main/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/util/MockHierarchicalTreeVisitor.java Sun Jul 23 15:04:11 2006
@@ -15,7 +15,7 @@
  */
 package org.apache.cayenne.util;
 
-import org.objectstyle.cayenne.project.ProjectPath;
+import org.apache.cayenne.project.ProjectPath;
 
 public class MockHierarchicalTreeVisitor implements HierarchicalTreeVisitor {
 



Mime
View raw message