cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject svn commit: r396933 - in /incubator/cayenne/trunk/cayenne-jpa/src: main/java/org/apache/cayenne/jpa/spi/ main/resources/META-INF/cayenne/ test/java/org/apache/cayenne/jpa/conf/ test/java/org/apache/cayenne/jpa/cspi/ test/java/org/apache/cayenne/jpa/spi...
Date Tue, 25 Apr 2006 17:30:13 GMT
Author: aadamchik
Date: Tue Apr 25 10:30:12 2006
New Revision: 396933

URL: http://svn.apache.org/viewcvs?rev=396933&view=rev
Log:
package migration and cleanup

Removed:
    incubator/cayenne/trunk/cayenne-jpa/src/main/java/org/apache/cayenne/jpa/spi/TransformingClassLoader.java
    incubator/cayenne/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/cspi/HelperEnhancingClassLoader.java
    incubator/cayenne/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/cspi/PersistentEnhancerTest.java
    incubator/cayenne/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/cspi/TestPojo.java
    incubator/cayenne/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/spi/TransformingClassLoaderTest.java
    incubator/cayenne/trunk/cayenne-jpa/src/test/java/org/objectstyle/
    incubator/cayenne/trunk/cayenne-jpa/src/tests/
Modified:
    incubator/cayenne/trunk/cayenne-jpa/src/main/resources/META-INF/cayenne/orm-coder.xml
    incubator/cayenne/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/conf/MappingAssertion.java
    incubator/cayenne/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/util/BaseTreeVisitorTest.java
    incubator/cayenne/trunk/cayenne-jpa/src/test/resources/xml-samples/orm-schema-headers-full.xml
    incubator/cayenne/trunk/cayenne-jpa/src/test/resources/xml-samples/orm-schema-headers.xml

Modified: incubator/cayenne/trunk/cayenne-jpa/src/main/resources/META-INF/cayenne/orm-coder.xml
URL: http://svn.apache.org/viewcvs/incubator/cayenne/trunk/cayenne-jpa/src/main/resources/META-INF/cayenne/orm-coder.xml?rev=396933&r1=396932&r2=396933&view=diff
==============================================================================
--- incubator/cayenne/trunk/cayenne-jpa/src/main/resources/META-INF/cayenne/orm-coder.xml
(original)
+++ incubator/cayenne/trunk/cayenne-jpa/src/main/resources/META-INF/cayenne/orm-coder.xml
Tue Apr 25 10:30:12 2006
@@ -3,7 +3,7 @@
 <model>
 	
 	<!-- ROOT Element - must be listed first in the mapping per mapping descriptor spec.
-->
-	<entity name="org.objectstyle.cayenne.jpa.map.JpaEntityMap" xmlTag="entity-mappings">
+	<entity name="org.apache.cayenne.jpa.map.JpaEntityMap" xmlTag="entity-mappings">
 		
 		<property name="entities" xmlTag="entity"/>
 		<property name="embeddables" xmlTag="embeddable"/>
@@ -23,7 +23,7 @@
 		<property name="flushMode" xmlTag="flush-mode" attribute="YES"/>
 	</entity>
 	
-	<entity name="org.objectstyle.cayenne.jpa.map.JpaAttribute" xmlTag="attribute">
+	<entity name="org.apache.cayenne.jpa.map.JpaAttribute" xmlTag="attribute">
 		<property name="basic" xmlTag="basic"/>
 		<property name="version" xmlTag="version"/>
 		<property name="manyToOne" xmlTag="many-to-one"/>
@@ -46,17 +46,17 @@
 		<property name="name" xmlTag="name" attribute="YES"/>
 	</entity>
 	
-	<entity name="org.objectstyle.cayenne.jpa.map.JpaAttributeOverride" xmlTag="attribute-override">
+	<entity name="org.apache.cayenne.jpa.map.JpaAttributeOverride" xmlTag="attribute-override">
 		<property name="column" xmlTag="column"/>
 		<property name="name" xmlTag="name" attribute="YES"/>
 	</entity>
 	
-	<entity name="org.objectstyle.cayenne.jpa.map.JpaBasic" xmlTag="basic">
+	<entity name="org.apache.cayenne.jpa.map.JpaBasic" xmlTag="basic">
 		<property name="fetch" xmlTag="fetch" attribute="YES"/>
 		<property name="optional" xmlTag="optional" attribute="YES"/>
 	</entity>
 	
-	<entity name="org.objectstyle.cayenne.jpa.map.JpaColumn" xmlTag="column">
+	<entity name="org.apache.cayenne.jpa.map.JpaColumn" xmlTag="column">
 		<property name="name" xmlTag="name" attribute="YES"/>
 		<property name="unique" xmlTag="unique" attribute="YES"/>
 		<property name="nullable" xmlTag="nullable" attribute="YES"/>
@@ -69,31 +69,31 @@
 		<property name="scale" xmlTag="scale" attribute="YES"/>
 	</entity>
 	
-	<entity name="org.objectstyle.cayenne.jpa.map.JpaColumnResult" xmlTag="column-result">
+	<entity name="org.apache.cayenne.jpa.map.JpaColumnResult" xmlTag="column-result">
 		<property name="name" xmlTag="name" attribute="YES"/>
 	</entity>
 	
-	<entity name="org.objectstyle.cayenne.jpa.map.JpaDiscriminatorColumn" xmlTag="discriminator-column">
+	<entity name="org.apache.cayenne.jpa.map.JpaDiscriminatorColumn" xmlTag="discriminator-column">
 		<property name="name" xmlTag="name" attribute="YES"/>
 		<property name="discriminatorType" xmlTag="discriminator-type" attribute="YES"/>
 		<property name="columnDefinition" xmlTag="column-definition" attribute="YES"/>
 		<property name="length" xmlTag="length" attribute="YES"/>
 	</entity>
 	
-	<entity name="org.objectstyle.cayenne.jpa.map.JpaEmbeddedId" xmlTag="embedded-id">
+	<entity name="org.apache.cayenne.jpa.map.JpaEmbeddedId" xmlTag="embedded-id">
 		<property name="attributeOverrides" xmlTag="attribute-override"/>
 		
 		<property name="name" xmlTag="name" attribute="YES"/>
 	</entity>
 	
-	<entity name="org.objectstyle.cayenne.jpa.map.JpaEmbeddable" xmlTag="embeddable">
+	<entity name="org.apache.cayenne.jpa.map.JpaEmbeddable" xmlTag="embeddable">
 		<property name="className" xmlTag="class" attribute="YES"/>
 		<property name="access" xmlTag="access" attribute="YES"/>
 		
 		<property name="embeddableAttributes" xmlTag="embeddable-attribute"/>
 	</entity>
 	
-	<entity name="org.objectstyle.cayenne.jpa.map.JpaEmbeddableAttribute" xmlTag="embeddable-attribute">
+	<entity name="org.apache.cayenne.jpa.map.JpaEmbeddableAttribute" xmlTag="embeddable-attribute">
 		<property name="basic" xmlTag="basic"/>
 		<property name="lobTrue" xmlTag="lob"/>
 		<property name="temporal" xmlTag="temporal"/>
@@ -103,7 +103,7 @@
 		<property name="name" xmlTag="name" attribute="YES"/>
 	</entity>
 	
-	<entity name="org.objectstyle.cayenne.jpa.map.JpaEntity" xmlTag="entity">
+	<entity name="org.apache.cayenne.jpa.map.JpaEntity" xmlTag="entity">
 		<property name="table" xmlTag="table"/>
 		<property name="secondaryTables" xmlTag="secondary-table"/>
 		<property name="primaryKeyJoinColumns" xmlTag="primary-key-join-column"/>
@@ -136,7 +136,7 @@
 		<property name="access" xmlTag="access" attribute="YES"/>
 	</entity>
 
-	<entity name="org.objectstyle.cayenne.jpa.map.JpaEntityListener" xmlTag="entity-listener">
+	<entity name="org.apache.cayenne.jpa.map.JpaEntityListener" xmlTag="entity-listener">
 		<property name="prePersist" xmlTag="pre-persist"/>
 		<property name="postPersist" xmlTag="post-persist"/>
 		<property name="preRemove" xmlTag="pre-remove"/>
@@ -148,32 +148,32 @@
 		<property name="className" xmlTag="class" attribute="YES"/>
 	</entity>
 	
-	<entity name="org.objectstyle.cayenne.jpa.map.JpaEntityListeners" xmlTag="entity-listeners">
+	<entity name="org.apache.cayenne.jpa.map.JpaEntityListeners" xmlTag="entity-listeners">
 		<property name="entityListeners" xmlTag="entity-listener"/>
 	</entity>
 	
-	<entity name="org.objectstyle.cayenne.jpa.map.JpaEntityListeners" xmlTag="default-entity-listeners">
+	<entity name="org.apache.cayenne.jpa.map.JpaEntityListeners" xmlTag="default-entity-listeners">
 		<property name="entityListeners" xmlTag="entity-listener"/>
 	</entity>
 	
-	<entity name="org.objectstyle.cayenne.jpa.map.JpaEntityResult" xmlTag="entity-result">
+	<entity name="org.apache.cayenne.jpa.map.JpaEntityResult" xmlTag="entity-result">
 		<property name="fieldResults" xmlTag="field-result"/>
 		
 		<property name="entityClassName" xmlTag="entity-class" attribute="YES"/>
 		<property name="discriminatorColumn" xmlTag="discriminator-column" attribute="YES"/>
 	</entity>
 	
-	<entity name="org.objectstyle.cayenne.jpa.map.JpaFieldResult" xmlTag="field-result">
+	<entity name="org.apache.cayenne.jpa.map.JpaFieldResult" xmlTag="field-result">
 		<property name="column" xmlTag="column" attribute="YES"/>
 		<property name="name" xmlTag="name" attribute="YES"/>
 	</entity>
 	
-	<entity name="org.objectstyle.cayenne.jpa.map.JpaGeneratedValue" xmlTag="generated-value">
+	<entity name="org.apache.cayenne.jpa.map.JpaGeneratedValue" xmlTag="generated-value">
 		<property name="strategy" xmlTag="strategy" attribute="YES"/>
 		<property name="generator" xmlTag="generator" attribute="YES"/>
 	</entity>
 	
-	<entity name="org.objectstyle.cayenne.jpa.map.JpaId" xmlTag="id">
+	<entity name="org.apache.cayenne.jpa.map.JpaId" xmlTag="id">
 		<property name="column" xmlTag="column"/>
 		<property name="generatedValue" xmlTag="generated-value"/>
 		<property name="temporal" xmlTag="temporal"/>
@@ -181,11 +181,11 @@
 		<property name="name" xmlTag="name" attribute="YES"/>
 	</entity>
 	
-	<entity name="org.objectstyle.cayenne.jpa.map.JpaInheritance" xmlTag="inheritance">
+	<entity name="org.apache.cayenne.jpa.map.JpaInheritance" xmlTag="inheritance">
 		<property name="strategy" xmlTag="strategy" attribute="YES"/>
 	</entity>
 	
-	<entity name="org.objectstyle.cayenne.jpa.map.JpaJoinColumn" xmlTag="join-column">
+	<entity name="org.apache.cayenne.jpa.map.JpaJoinColumn" xmlTag="join-column">
 		<property name="name" xmlTag="name" attribute="YES"/>
 		<property name="referencedColumnName" xmlTag="referenced-column-name" attribute="YES"/>
 		<property name="unique" xmlTag="unique" attribute="YES"/>
@@ -196,7 +196,7 @@
 		<property name="table" xmlTag="table" attribute="YES"/>
 	</entity>
 	
-	<entity name="org.objectstyle.cayenne.jpa.map.JpaJoinTable" xmlTag="join-table">
+	<entity name="org.apache.cayenne.jpa.map.JpaJoinTable" xmlTag="join-table">
 		<property name="joinColumns" xmlTag="join-column"/>
 		<property name="inverseJoinColumns" xmlTag="inverse-join-column"/>
 		<property name="uniqueConstraints" xmlTag="unique-constraint"/>
@@ -206,49 +206,49 @@
 		<property name="schema" xmlTag="schema" attribute="YES"/>
 	</entity>
 	
-	<entity name="org.objectstyle.cayenne.jpa.map.JpaLifecycleCallback" xmlTag="pre-persist">
+	<entity name="org.apache.cayenne.jpa.map.JpaLifecycleCallback" xmlTag="pre-persist">
 		<property name="methodName" xmlTag="method-name" attribute="YES"/>
 	</entity>
 	
-	<entity name="org.objectstyle.cayenne.jpa.map.JpaLifecycleCallback" xmlTag="post-persist">
+	<entity name="org.apache.cayenne.jpa.map.JpaLifecycleCallback" xmlTag="post-persist">
 		<property name="methodName" xmlTag="method-name" attribute="YES"/>
 	</entity>
 	
-	<entity name="org.objectstyle.cayenne.jpa.map.JpaLifecycleCallback" xmlTag="pre-remove">
+	<entity name="org.apache.cayenne.jpa.map.JpaLifecycleCallback" xmlTag="pre-remove">
 		<property name="methodName" xmlTag="method-name" attribute="YES"/>
 	</entity>
 	
-	<entity name="org.objectstyle.cayenne.jpa.map.JpaLifecycleCallback" xmlTag="post-remove">
+	<entity name="org.apache.cayenne.jpa.map.JpaLifecycleCallback" xmlTag="post-remove">
 		<property name="methodName" xmlTag="method-name" attribute="YES"/>
 	</entity>
 	
-	<entity name="org.objectstyle.cayenne.jpa.map.JpaLifecycleCallback" xmlTag="pre-update">
+	<entity name="org.apache.cayenne.jpa.map.JpaLifecycleCallback" xmlTag="pre-update">
 		<property name="methodName" xmlTag="method-name" attribute="YES"/>
 	</entity>
 	
-	<entity name="org.objectstyle.cayenne.jpa.map.JpaLifecycleCallback" xmlTag="post-update">
+	<entity name="org.apache.cayenne.jpa.map.JpaLifecycleCallback" xmlTag="post-update">
 		<property name="methodName" xmlTag="method-name" attribute="YES"/>
 	</entity>
 	
-	<entity name="org.objectstyle.cayenne.jpa.map.JpaLifecycleCallback" xmlTag="post-load">
+	<entity name="org.apache.cayenne.jpa.map.JpaLifecycleCallback" xmlTag="post-load">
 		<property name="methodName" xmlTag="method-name" attribute="YES"/>
 	</entity>
 	
-	<entity name="org.objectstyle.cayenne.jpa.map.JpaManyToMany" xmlTag="many-to-many">
+	<entity name="org.apache.cayenne.jpa.map.JpaManyToMany" xmlTag="many-to-many">
 		<property name="cascades" xmlTag="cascade"/>
 		<property name="targetEntityName" xmlTag="target-entity" attribute="YES"/>
 		<property name="fetch" xmlTag="fetch" attribute="YES"/>
 		<property name="mappedBy" xmlTag="mapped-by" attribute="YES"/>
 	</entity>
 	
-	<entity name="org.objectstyle.cayenne.jpa.map.JpaManyToOne" xmlTag="many-to-one">
+	<entity name="org.apache.cayenne.jpa.map.JpaManyToOne" xmlTag="many-to-one">
 		<property name="cascades" xmlTag="cascade"/>
 		<property name="targetEntityName" xmlTag="target-entity" attribute="YES"/>
 		<property name="fetch" xmlTag="fetch" attribute="YES"/>
 		<property name="optional" xmlTag="optional" attribute="YES"/>
 	</entity>
 	
-	<entity name="org.objectstyle.cayenne.jpa.map.JpaMappedSuperclass" xmlTag="mapped-superclass">
+	<entity name="org.apache.cayenne.jpa.map.JpaMappedSuperclass" xmlTag="mapped-superclass">
 		<property name="idClassName" xmlTag="id-class"/>
 		<property name="excludeDefaultListeners" xmlTag="exclude-default-listeners"/>
 		<property name="excludeSuperclassListeners" xmlTag="exclude-superclass-listeners"/>
@@ -268,7 +268,7 @@
 		<property name="access" xmlTag="access" attribute="YES"/>
 	</entity>
 	
-	<entity name="org.objectstyle.cayenne.jpa.map.JpaNamedNativeQuery" xmlTag="named-native-query">
+	<entity name="org.apache.cayenne.jpa.map.JpaNamedNativeQuery" xmlTag="named-native-query">
 		<property name="hints" xmlTag="hint"/>
 		
 		<property name="name" xmlTag="name" attribute="YES"/>
@@ -277,14 +277,14 @@
 		<property name="resultSetMapping" xmlTag="result-set-mapping" attribute="YES"/>
 	</entity>
 	
-	<entity name="org.objectstyle.cayenne.jpa.map.JpaNamedQuery" xmlTag="named-query">
+	<entity name="org.apache.cayenne.jpa.map.JpaNamedQuery" xmlTag="named-query">
 		<property name="hints" xmlTag="hint"/>
 		
 		<property name="name" xmlTag="name" attribute="YES"/>
 		<property name="query" xmlTag="query" attribute="YES"/>
 	</entity>
 	
-	<entity name="org.objectstyle.cayenne.jpa.map.JpaOneToMany" xmlTag="one-to-many">
+	<entity name="org.apache.cayenne.jpa.map.JpaOneToMany" xmlTag="one-to-many">
 		<property name="cascades" xmlTag="cascade"/>
 		
 		<property name="targetEntityName" xmlTag="target-entity" attribute="YES"/>
@@ -292,7 +292,7 @@
 		<property name="mappedBy" xmlTag="mapped-by" attribute="YES"/>
 	</entity>
 	
-	<entity name="org.objectstyle.cayenne.jpa.map.JpaOneToOne" xmlTag="one-to-one">
+	<entity name="org.apache.cayenne.jpa.map.JpaOneToOne" xmlTag="one-to-one">
 		<property name="cascades" xmlTag="cascade"/>
 		
 		<property name="targetEntityName" xmlTag="target-entity" attribute="YES"/>
@@ -301,18 +301,18 @@
 		<property name="mappedBy" xmlTag="mapped-by" attribute="YES"/>
 	</entity>
 	
-	<entity name="org.objectstyle.cayenne.jpa.map.JpaPrimaryKeyJoinColumn" xmlTag="primary-key-join-column">
+	<entity name="org.apache.cayenne.jpa.map.JpaPrimaryKeyJoinColumn" xmlTag="primary-key-join-column">
 		<property name="name" xmlTag="name" attribute="YES"/>
 		<property name="referencedColumnName" xmlTag="referenced-column-name" attribute="YES"/>
 		<property name="columnDefinition" xmlTag="column-definition" attribute="YES"/>
 	</entity>
 	
-	<entity name="org.objectstyle.cayenne.jpa.map.JpaQueryHint" xmlTag="hint">
+	<entity name="org.apache.cayenne.jpa.map.JpaQueryHint" xmlTag="hint">
 		<property name="name" xmlTag="name" attribute="YES"/>
 		<property name="value" xmlTag="value" attribute="YES"/>
 	</entity>
 	
-	<entity name="org.objectstyle.cayenne.jpa.map.JpaSecondaryTable" xmlTag="secondary-table">
+	<entity name="org.apache.cayenne.jpa.map.JpaSecondaryTable" xmlTag="secondary-table">
 		<property name="primaryKeyJoinColumns" xmlTag="primary-key-join-column"/>
 		<property name="uniqueConstraints" xmlTag="unique-constraint"/>
 		
@@ -321,21 +321,21 @@
 		<property name="schema" xmlTag="schema" attribute="YES"/>
 	</entity>
 	
-	<entity name="org.objectstyle.cayenne.jpa.map.JpaSequenceGenerator" xmlTag="sequence-generator">
+	<entity name="org.apache.cayenne.jpa.map.JpaSequenceGenerator" xmlTag="sequence-generator">
 		<property name="name" xmlTag="name" attribute="YES"/>
 		<property name="sequenceName" xmlTag="sequence-name" attribute="YES"/>
 		<property name="initialValue" xmlTag="initial-value" attribute="YES"/>
 		<property name="allocationSize" xmlTag="allocation-size" attribute="YES"/>
 	</entity>
 	
-	<entity name="org.objectstyle.cayenne.jpa.map.JpaSqlResultSetMapping" xmlTag="sql-result-set-mapping">
+	<entity name="org.apache.cayenne.jpa.map.JpaSqlResultSetMapping" xmlTag="sql-result-set-mapping">
 		<property name="entityResults" xmlTag="entity-result"/>
 		<property name="columnResults" xmlTag="column-result"/>
 		
 		<property name="name" xmlTag="name" attribute="YES"/>
 	</entity>
 	
-	<entity name="org.objectstyle.cayenne.jpa.map.JpaTable" xmlTag="table">
+	<entity name="org.apache.cayenne.jpa.map.JpaTable" xmlTag="table">
 		<property name="uniqueConstraints" xmlTag="unique-constraint"/>
 		
 		<property name="name" xmlTag="name" attribute="YES"/>
@@ -343,7 +343,7 @@
 		<property name="schema" xmlTag="schema" attribute="YES"/>
 	</entity>
 	
-	<entity name="org.objectstyle.cayenne.jpa.map.JpaTableGenerator" xmlTag="table-generator">
+	<entity name="org.apache.cayenne.jpa.map.JpaTableGenerator" xmlTag="table-generator">
 		<property name="uniqueConstraints" xmlTag="unique-constraint"/>
 		
 		<property name="name" xmlTag="name" attribute="YES"/>
@@ -357,7 +357,7 @@
 		<property name="allocationSize" xmlTag="allocation-size" attribute="YES"/>
 	</entity>
 	
-	<entity name="org.objectstyle.cayenne.jpa.map.JpaUniqueConstraint" xmlTag="unique-constraint">
+	<entity name="org.apache.cayenne.jpa.map.JpaUniqueConstraint" xmlTag="unique-constraint">
 		<property name="columnNames" xmlTag="column-name"/>
 	</entity>
 </model>

Modified: incubator/cayenne/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/conf/MappingAssertion.java
URL: http://svn.apache.org/viewcvs/incubator/cayenne/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/conf/MappingAssertion.java?rev=396933&r1=396932&r2=396933&view=diff
==============================================================================
--- incubator/cayenne/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/conf/MappingAssertion.java
(original)
+++ incubator/cayenne/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/conf/MappingAssertion.java
Tue Apr 25 10:30:12 2006
@@ -155,7 +155,7 @@
     }
 
     protected void assertEmbeddable1(JpaEmbeddable embeddable1) {
-        assertEquals("org.objectstyle.cayenne.jpa.entity.MockEmbed1", embeddable1
+        assertEquals("org.apache.cayenne.jpa.entity.MockEmbed1", embeddable1
                 .getClassName());
 
         assertEquals(2, embeddable1.getEmbeddableAttributes().size());
@@ -183,7 +183,7 @@
     protected void assertEntity1(JpaEntity entity1) {
         assertNotNull(entity1);
         assertEquals("MockEntity1", entity1.getName());
-        assertEquals("org.objectstyle.cayenne.jpa.entity.MockEntity1", entity1
+        assertEquals("org.apache.cayenne.jpa.entity.MockEntity1", entity1
                 .getClassName());
 
         assertTable(entity1.getTable());
@@ -197,7 +197,7 @@
         JpaSecondaryTable secondaryTable2 = secondaryTableIt.next();
         assertEquals("secondary2", secondaryTable2.getName());
 
-        assertEquals("org.objectstyle.cayenne.jpa.entity.MockIdClass", entity1
+        assertEquals("org.apache.cayenne.jpa.entity.MockIdClass", entity1
                 .getIdClassName());
 
         assertSequenceGenerator1(entity1.getSequenceGenerator());
@@ -247,8 +247,7 @@
 
     protected void assertEntity2(JpaEntity entity2) {
         assertNotNull(entity2);
-        assertEquals("org.objectstyle.cayenne.jpa.entity.MockEntity2", entity2
-                .getClassName());
+        assertEquals("org.apache.cayenne.jpa.entity.MockEntity2", entity2.getClassName());
         assertEquals("MockEntity2", entity2.getName());
 
         assertEquals(2, entity2.getPrimaryKeyJoinColumns().size());
@@ -286,8 +285,7 @@
 
     protected void assertEntity3(JpaEntity entity3) {
         assertNotNull(entity3);
-        assertEquals("org.objectstyle.cayenne.jpa.entity.MockEntity3", entity3
-                .getClassName());
+        assertEquals("org.apache.cayenne.jpa.entity.MockEntity3", entity3.getClassName());
         assertEquals("MockEntity3", entity3.getName());
 
         assertNotNull(entity3.getInheritance());
@@ -304,8 +302,7 @@
 
     protected void assertEntity4(JpaEntity entity4) {
         assertNotNull(entity4);
-        assertEquals("org.objectstyle.cayenne.jpa.entity.MockEntity4", entity4
-                .getClassName());
+        assertEquals("org.apache.cayenne.jpa.entity.MockEntity4", entity4.getClassName());
         assertEquals("MockEntity4", entity4.getName());
         assertEmbeddedId(entity4.getEmbeddedId());
     }
@@ -413,7 +410,7 @@
     protected void assertNativeNamedQuery3(JpaNamedNativeQuery namedQuery) {
         assertEquals("query3", namedQuery.getName());
         assertEquals("select z", namedQuery.getQuery());
-        assertEquals("org.objectstyle.cayenne.jpa.entity.MockResultClass", namedQuery
+        assertEquals("org.apache.cayenne.jpa.entity.MockResultClass", namedQuery
                 .getResultClassName());
         assertEquals("rs-mapping1", namedQuery.getResultSetMapping());
         assertEquals(2, namedQuery.getHints().size());
@@ -441,7 +438,7 @@
 
         Iterator<JpaEntityResult> erIt = mapping.getEntityResults().iterator();
         JpaEntityResult er1 = erIt.next();
-        assertEquals("org.objectstyle.cayenne.jpa.entity.MockEntityX", er1
+        assertEquals("org.apache.cayenne.jpa.entity.MockEntityX", er1
                 .getEntityClassName());
         assertEquals("column1", er1.getDiscriminatorColumn());
         assertEquals(2, er1.getFieldResults().size());
@@ -456,7 +453,7 @@
         assertEquals("column2", fr12.getColumn());
 
         JpaEntityResult er2 = erIt.next();
-        assertEquals("org.objectstyle.cayenne.jpa.entity.MockEntityY", er2
+        assertEquals("org.apache.cayenne.jpa.entity.MockEntityY", er2
                 .getEntityClassName());
         assertEquals("column2", er2.getDiscriminatorColumn());
         assertEquals(2, er2.getFieldResults().size());
@@ -482,7 +479,7 @@
         Iterator<JpaEntityListener> elIt = listeners.getEntityListeners().iterator();
         JpaEntityListener listener1 = elIt.next();
 
-        assertEquals("org.objectstyle.cayenne.jpa.entity.MockEntityListener1", listener1
+        assertEquals("org.apache.cayenne.jpa.entity.MockEntityListener1", listener1
                 .getClassName());
 
         assertNotNull(listener1.getPrePersist());
@@ -502,7 +499,7 @@
 
         JpaEntityListener listener2 = elIt.next();
 
-        assertEquals("org.objectstyle.cayenne.jpa.entity.MockEntityListener2", listener2
+        assertEquals("org.apache.cayenne.jpa.entity.MockEntityListener2", listener2
                 .getClassName());
 
         assertNull(listener2.getPrePersist());
@@ -558,10 +555,10 @@
         assertNotNull(mappedSuperclass1);
 
         assertEquals(
-                "org.objectstyle.cayenne.jpa.entity.MockMappedSuperclass1",
+                "org.apache.cayenne.jpa.entity.MockMappedSuperclass1",
                 mappedSuperclass1.getClassName());
 
-        assertEquals("org.objectstyle.cayenne.jpa.entity.MockIdClass", mappedSuperclass1
+        assertEquals("org.apache.cayenne.jpa.entity.MockIdClass", mappedSuperclass1
                 .getIdClassName());
 
         assertTrue(mappedSuperclass1.isExcludeDefaultListeners());
@@ -571,7 +568,7 @@
         JpaEntityListeners listeners = mappedSuperclass1.getEntityListeners();
         assertEquals(1, listeners.getEntityListeners().size());
         Iterator<JpaEntityListener> elIt = listeners.getEntityListeners().iterator();
-        assertEquals("org.objectstyle.cayenne.jpa.entity.MockEntityListener1", elIt
+        assertEquals("org.apache.cayenne.jpa.entity.MockEntityListener1", elIt
                 .next()
                 .getClassName());
 
@@ -597,7 +594,7 @@
     protected void assertMappedSuperclass2(JpaMappedSuperclass mappedSuperclass2) {
         assertNotNull(mappedSuperclass2);
         assertEquals(
-                "org.objectstyle.cayenne.jpa.entity.MockMappedSuperclass2",
+                "org.apache.cayenne.jpa.entity.MockMappedSuperclass2",
                 mappedSuperclass2.getClassName());
 
         assertEmbeddedId(mappedSuperclass2.getEmbeddedId());
@@ -626,7 +623,7 @@
         // ONE-TO_ONE
         assertNull(attributes.get(1).getOneToOne());
         assertNotNull(attributes.get(2).getOneToOne());
-        assertEquals("org.objectstyle.cayenne.jpa.entity.MockTargetEntity1", attributes
+        assertEquals("org.apache.cayenne.jpa.entity.MockTargetEntity1", attributes
                 .get(2)
                 .getOneToOne()
                 .getTargetEntityName());
@@ -643,7 +640,7 @@
         assertNull(attributes.get(2).getOneToMany());
         assertNotNull(attributes.get(3).getOneToMany());
         JpaOneToMany otm = attributes.get(3).getOneToMany();
-        assertEquals("org.objectstyle.cayenne.jpa.entity.MockTargetEntity2", otm
+        assertEquals("org.apache.cayenne.jpa.entity.MockTargetEntity2", otm
                 .getTargetEntityName());
         assertSame(FetchType.LAZY, otm.getFetch());
         assertEquals("mb2", otm.getMappedBy());

Modified: incubator/cayenne/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/util/BaseTreeVisitorTest.java
URL: http://svn.apache.org/viewcvs/incubator/cayenne/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/util/BaseTreeVisitorTest.java?rev=396933&r1=396932&r2=396933&view=diff
==============================================================================
--- incubator/cayenne/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/util/BaseTreeVisitorTest.java
(original)
+++ incubator/cayenne/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/util/BaseTreeVisitorTest.java
Tue Apr 25 10:30:12 2006
@@ -63,6 +63,7 @@
 
     public void testChildVisitor() {
         BaseTreeVisitor visitor = new BaseTreeVisitor();
+        visitor.setTerminatingOnNoChildVisitor(false);
         assertSame(visitor, visitor.childVisitor(new ProjectPath(), String.class));
 
         MockHierarchicalTreeVisitor stringVisitor = new MockHierarchicalTreeVisitor();

Modified: incubator/cayenne/trunk/cayenne-jpa/src/test/resources/xml-samples/orm-schema-headers-full.xml
URL: http://svn.apache.org/viewcvs/incubator/cayenne/trunk/cayenne-jpa/src/test/resources/xml-samples/orm-schema-headers-full.xml?rev=396933&r1=396932&r2=396933&view=diff
==============================================================================
--- incubator/cayenne/trunk/cayenne-jpa/src/test/resources/xml-samples/orm-schema-headers-full.xml
(original)
+++ incubator/cayenne/trunk/cayenne-jpa/src/test/resources/xml-samples/orm-schema-headers-full.xml
Tue Apr 25 10:30:12 2006
@@ -11,7 +11,7 @@
 	<!-- ENTITIES -->
 	
 	<!-- no inheritance -->
-	<entity name="MockEntity1" class="org.objectstyle.cayenne.jpa.entity.MockEntity1" access="PROPERTY">
+	<entity name="MockEntity1" class="org.apache.cayenne.jpa.entity.MockEntity1" access="PROPERTY">
 		
 		<table name="mock_persistent_1" catalog="catalog1" schema="schema1">
 			<unique-constraint>
@@ -34,7 +34,7 @@
 		
 		<secondary-table name="secondary2"/>
 
-		<id-class>org.objectstyle.cayenne.jpa.entity.MockIdClass</id-class>
+		<id-class>org.apache.cayenne.jpa.entity.MockIdClass</id-class>
 		
 		<sequence-generator name="sg-name" sequence-name="seq-name" initial-value="5" allocation-size="10"/>
 		
@@ -52,7 +52,7 @@
 		
 		<named-query name="query2" query="select y"/>
 		
-		<named-native-query name="query3" query="select z" result-class="org.objectstyle.cayenne.jpa.entity.MockResultClass"
result-set-mapping="rs-mapping1">
+		<named-native-query name="query3" query="select z" result-class="org.apache.cayenne.jpa.entity.MockResultClass"
result-set-mapping="rs-mapping1">
 			<hint name="hint3" value="value3"/>
 			<hint name="hint4" value="value4"/>
 		</named-native-query>
@@ -60,11 +60,11 @@
 		<named-native-query name="query4" query="select a"/>
 		
 		<sql-result-set-mapping name="result-map1">
-			<entity-result entity-class="org.objectstyle.cayenne.jpa.entity.MockEntityX" discriminator-column="column1">
+			<entity-result entity-class="org.apache.cayenne.jpa.entity.MockEntityX" discriminator-column="column1">
 				<field-result name="field1" column="column1"/>
 				<field-result name="field2" column="column2"/>
 			</entity-result>
-			<entity-result entity-class="org.objectstyle.cayenne.jpa.entity.MockEntityY" discriminator-column="column2">
+			<entity-result entity-class="org.apache.cayenne.jpa.entity.MockEntityY" discriminator-column="column2">
 				<field-result name="field3" column="column3"/>
 				<field-result name="field4" column="column4"/>
 			</entity-result>
@@ -76,7 +76,7 @@
 		<exclude-superclass-listeners>true</exclude-superclass-listeners>
 		
 		<entity-listeners>
-			<entity-listener class="org.objectstyle.cayenne.jpa.entity.MockEntityListener1">
+			<entity-listener class="org.apache.cayenne.jpa.entity.MockEntityListener1">
 				<pre-persist method-name="prePersist"/>
 				<post-persist method-name="postPersist"/>
 				<pre-remove method-name="preRemove"/>
@@ -86,7 +86,7 @@
 				<post-load method-name="postLoad"/>
 			</entity-listener>
 			
-			<entity-listener class="org.objectstyle.cayenne.jpa.entity.MockEntityListener2">
+			<entity-listener class="org.apache.cayenne.jpa.entity.MockEntityListener2">
 				<post-persist method-name="postPersist"/>
 			</entity-listener>
 			
@@ -109,7 +109,7 @@
 	</entity>
 	
 	<!-- JOINED inheritance -->
-	<entity name="MockEntity2" class="org.objectstyle.cayenne.jpa.entity.MockEntity2">
+	<entity name="MockEntity2" class="org.apache.cayenne.jpa.entity.MockEntity2">
 		<primary-key-join-column name="pk_column1" referenced-column-name="super_column1" column-definition="count(1)"/>
 		<primary-key-join-column name="pk_column2"/>
 		<inheritance strategy="JOINED"/>
@@ -126,14 +126,14 @@
 	</entity>
 	
 	<!-- SINGLE_TABLE inheritance -->
-	<entity name="MockEntity3" class="org.objectstyle.cayenne.jpa.entity.MockEntity3">
+	<entity name="MockEntity3" class="org.apache.cayenne.jpa.entity.MockEntity3">
 		<inheritance strategy="SINGLE_TABLE"/>
 		<discriminator-value>DV</discriminator-value>
 		<discriminator-column name="column1" discriminator-type="CHAR" column-definition="count(1)"
length="5"/>
 	</entity>
 	
 	<!-- EMBEDDED Id -->
-	<entity name="MockEntity4" class="org.objectstyle.cayenne.jpa.entity.MockEntity4">
+	<entity name="MockEntity4" class="org.apache.cayenne.jpa.entity.MockEntity4">
 		<embedded-id name="embeddedId">
 			<attribute-override name="attribute1">
 				<column name="ao_column1"/>
@@ -145,7 +145,7 @@
 	</entity>
 	
 	<!-- Entity with Attributes -->
-	<entity name="MockEntity5" class="org.objectstyle.cayenne.jpa.entity.MockEntity5">
+	<entity name="MockEntity5" class="org.apache.cayenne.jpa.entity.MockEntity5">
 		<!-- basic attribute -->
 		<attribute name="attribute1">
 			<basic fetch="EAGER" optional="true"/>
@@ -158,7 +158,7 @@
 		
 		<!-- one-to-one attribute -->
 		<attribute name="attribute3">
-			<one-to-one target-entity="org.objectstyle.cayenne.jpa.entity.MockTargetEntity1" 
+			<one-to-one target-entity="org.apache.cayenne.jpa.entity.MockTargetEntity1" 
 				   fetch="LAZY" optional="true" mapped-by="mb1">
 				<cascade>MERGE</cascade>
 				<cascade>PERSIST</cascade>
@@ -167,7 +167,7 @@
 		
 		<!-- one-to-many attribute -->
 		<attribute name="attribute4">
-			<one-to-many target-entity="org.objectstyle.cayenne.jpa.entity.MockTargetEntity2" fetch="LAZY"
mapped-by="mb2">
+			<one-to-many target-entity="org.apache.cayenne.jpa.entity.MockTargetEntity2" fetch="LAZY"
mapped-by="mb2">
 				<cascade>MERGE</cascade>
 				<cascade>PERSIST</cascade>
 			</one-to-many>
@@ -175,7 +175,7 @@
 		
 		<!-- many-to-one attribute -->
 		<attribute name="attribute5">
-			<many-to-one target-entity="org.objectstyle.cayenne.jpa.entity.MockTargetEntity1" fetch="LAZY"
optional="true">
+			<many-to-one target-entity="org.apache.cayenne.jpa.entity.MockTargetEntity1" fetch="LAZY"
optional="true">
 				<cascade>MERGE</cascade>
 				<cascade>PERSIST</cascade>
 			</many-to-one>
@@ -183,7 +183,7 @@
 		
 		<!-- many-to-many attribute -->
 		<attribute name="attribute6">
-			<many-to-many target-entity="org.objectstyle.cayenne.jpa.entity.MockTargetEntity1"
fetch="LAZY" mapped-by="mb4">
+			<many-to-many target-entity="org.apache.cayenne.jpa.entity.MockTargetEntity1" fetch="LAZY"
mapped-by="mb4">
 				<cascade>MERGE</cascade>
 				<cascade>PERSIST</cascade>
 			</many-to-many>
@@ -261,7 +261,7 @@
 	
 	<!-- EMBEDDABLES -->
 	
-	<embeddable class="org.objectstyle.cayenne.jpa.entity.MockEmbed1" access="FIELD">
+	<embeddable class="org.apache.cayenne.jpa.entity.MockEmbed1" access="FIELD">
 		<embeddable-attribute name="ea1">
 			<basic fetch="EAGER" optional="true"/>
 			<lob/>
@@ -273,16 +273,16 @@
 		<embeddable-attribute name="ea2"/>
 	</embeddable>
 	
-	<embeddable class="org.objectstyle.cayenne.jpa.entity.MockEmbded2"/>
+	<embeddable class="org.apache.cayenne.jpa.entity.MockEmbded2"/>
 
 	<!-- MAPPED SUPERCLASSES -->
-	<mapped-superclass class="org.objectstyle.cayenne.jpa.entity.MockMappedSuperclass1" access="FIELD">
-		<id-class>org.objectstyle.cayenne.jpa.entity.MockIdClass</id-class>
+	<mapped-superclass class="org.apache.cayenne.jpa.entity.MockMappedSuperclass1" access="FIELD">
+		<id-class>org.apache.cayenne.jpa.entity.MockIdClass</id-class>
 	
 		<exclude-default-listeners>true</exclude-default-listeners>
 		<exclude-superclass-listeners>true</exclude-superclass-listeners>
 	
-		<entity-listener class="org.objectstyle.cayenne.jpa.entity.MockEntityListener1">
+		<entity-listener class="org.apache.cayenne.jpa.entity.MockEntityListener1">
 				<pre-persist method-name="prePersist"/>
 				<post-persist method-name="postPersist"/>
 				<pre-remove method-name="preRemove"/>
@@ -309,7 +309,7 @@
 	</mapped-superclass>
 	
 	<!-- EMBEDDED Id -->
-	<mapped-superclass class="org.objectstyle.cayenne.jpa.entity.MockMappedSuperclass2">
+	<mapped-superclass class="org.apache.cayenne.jpa.entity.MockMappedSuperclass2">
 		<embedded-id name="embeddedId">
 			<attribute-override name="attribute1">
 				<column name="ao_column1"/>
@@ -321,7 +321,7 @@
 	</mapped-superclass>
 	
 	<!-- Mapped Superclass w/Attributes -->
-	<mapped-superclass class="org.objectstyle.cayenne.jpa.entity.MockMappedSuperclass3">
+	<mapped-superclass class="org.apache.cayenne.jpa.entity.MockMappedSuperclass3">
 			<!-- basic attribute -->
 		<attribute name="attribute1">
 			<basic fetch="EAGER" optional="true"/>
@@ -334,7 +334,7 @@
 		
 		<!-- one-to-one attribute -->
 		<attribute name="attribute3">
-			<one-to-one target-entity="org.objectstyle.cayenne.jpa.entity.MockTargetEntity1" 
+			<one-to-one target-entity="org.apache.cayenne.jpa.entity.MockTargetEntity1" 
 				   fetch="LAZY" optional="true" mapped-by="mb1">
 				<cascade>MERGE</cascade>
 				<cascade>PERSIST</cascade>
@@ -343,7 +343,7 @@
 		
 		<!-- one-to-many attribute -->
 		<attribute name="attribute4">
-			<one-to-many target-entity="org.objectstyle.cayenne.jpa.entity.MockTargetEntity2" fetch="LAZY"
mapped-by="mb2">
+			<one-to-many target-entity="org.apache.cayenne.jpa.entity.MockTargetEntity2" fetch="LAZY"
mapped-by="mb2">
 				<cascade>MERGE</cascade>
 				<cascade>PERSIST</cascade>
 			</one-to-many>
@@ -351,7 +351,7 @@
 		
 		<!-- many-to-one attribute -->
 		<attribute name="attribute5">
-			<many-to-one target-entity="org.objectstyle.cayenne.jpa.entity.MockTargetEntity1" fetch="LAZY"
optional="true">
+			<many-to-one target-entity="org.apache.cayenne.jpa.entity.MockTargetEntity1" fetch="LAZY"
optional="true">
 				<cascade>MERGE</cascade>
 				<cascade>PERSIST</cascade>
 			</many-to-one>
@@ -359,7 +359,7 @@
 		
 		<!-- many-to-many attribute -->
 		<attribute name="attribute6">
-			<many-to-many target-entity="org.objectstyle.cayenne.jpa.entity.MockTargetEntity1"
fetch="LAZY" mapped-by="mb4">
+			<many-to-many target-entity="org.apache.cayenne.jpa.entity.MockTargetEntity1" fetch="LAZY"
mapped-by="mb4">
 				<cascade>MERGE</cascade>
 				<cascade>PERSIST</cascade>
 			</many-to-many>
@@ -444,7 +444,7 @@
 	<named-query name="query2" query="select y"/>
 		
 	<!-- NAMED NATIVE QUERIES -->
-	<named-native-query name="query3" query="select z" result-class="org.objectstyle.cayenne.jpa.entity.MockResultClass"
result-set-mapping="rs-mapping1">
+	<named-native-query name="query3" query="select z" result-class="org.apache.cayenne.jpa.entity.MockResultClass"
result-set-mapping="rs-mapping1">
 		<hint name="hint3" value="value3"/>
 		<hint name="hint4" value="value4"/>
 	</named-native-query>
@@ -453,11 +453,11 @@
 	
 	<!-- SQL RESULT SET MAPPINGS -->
 	<sql-result-set-mapping name="result-map1">
-		<entity-result entity-class="org.objectstyle.cayenne.jpa.entity.MockEntityX" discriminator-column="column1">
+		<entity-result entity-class="org.apache.cayenne.jpa.entity.MockEntityX" discriminator-column="column1">
 			<field-result name="field1" column="column1"/>
 			<field-result name="field2" column="column2"/>
 		</entity-result>
-		<entity-result entity-class="org.objectstyle.cayenne.jpa.entity.MockEntityY" discriminator-column="column2">
+		<entity-result entity-class="org.apache.cayenne.jpa.entity.MockEntityY" discriminator-column="column2">
 			<field-result name="field3" column="column3"/>
 			<field-result name="field4" column="column4"/>
 		</entity-result>
@@ -482,7 +482,7 @@
 	
 	<!-- DEFAULT ENTITY LISTENERS -->
 	<default-entity-listeners>
-		<entity-listener class="org.objectstyle.cayenne.jpa.entity.MockEntityListener1">
+		<entity-listener class="org.apache.cayenne.jpa.entity.MockEntityListener1">
 			<pre-persist method-name="prePersist"/>
 			<post-persist method-name="postPersist"/>
 			<pre-remove method-name="preRemove"/>
@@ -492,7 +492,7 @@
 			<post-load method-name="postLoad"/>
 		</entity-listener>
 			
-		<entity-listener class="org.objectstyle.cayenne.jpa.entity.MockEntityListener2">
+		<entity-listener class="org.apache.cayenne.jpa.entity.MockEntityListener2">
 			<post-persist method-name="postPersist"/>
 		</entity-listener>
 	</default-entity-listeners>

Modified: incubator/cayenne/trunk/cayenne-jpa/src/test/resources/xml-samples/orm-schema-headers.xml
URL: http://svn.apache.org/viewcvs/incubator/cayenne/trunk/cayenne-jpa/src/test/resources/xml-samples/orm-schema-headers.xml?rev=396933&r1=396932&r2=396933&view=diff
==============================================================================
--- incubator/cayenne/trunk/cayenne-jpa/src/test/resources/xml-samples/orm-schema-headers.xml
(original)
+++ incubator/cayenne/trunk/cayenne-jpa/src/test/resources/xml-samples/orm-schema-headers.xml
Tue Apr 25 10:30:12 2006
@@ -4,5 +4,5 @@
 	xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm 
        http://java.sun.com/xml/ns/persistence/orm/orm_1_0.xsd">
 
-	<entity class="org.objectstyle.cayenne.jpa.persistent.MockPersistent2"/>
+	<entity class="org.apache.cayenne.jpa.persistent.MockPersistent2"/>
 </entity-mappings>



Mime
View raw message