cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject svn commit: r422603 [1/2] - in /incubator/cayenne/main/trunk/cayenne: cayenne-ant/ant/ cayenne-java/src/cayenne/java/org/apache/cayenne/map/ cayenne-java/src/cayenne/java/org/apache/cayenne/project/ cayenne-java/src/cayenne/java/org/apache/cayenne/tool...
Date Mon, 17 Jul 2006 02:35:15 GMT
Author: aadamchik
Date: Sun Jul 16 19:35:13 2006
New Revision: 422603

URL: http://svn.apache.org/viewvc?rev=422603&view=rev
Log:
fixing some of the class generation package name related issues; the code can now be compiled and unit tests started

Added:
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/project/ApplicationProjectUpgradeTst.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/upgrade/1.2/defaultNode.driver.xml
Modified:
    incubator/cayenne/main/trunk/cayenne/cayenne-ant/ant/doc.xml
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/map/MapLoader.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/map/SelectQueryBuilder.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/project/ApplicationProject.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/project/ApplicationUpgradeHandler.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/project/Project.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/tools/antlib.xml
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/resources/dotemplates/v1_2/client-subclass.vm
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/resources/dotemplates/v1_2/client-superclass.vm
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/resources/dotemplates/v1_2/singleclass.vm
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/resources/dotemplates/v1_2/subclass.vm
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/resources/dotemplates/v1_2/superclass.vm
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/modeler/java/org/apache/cayenne/modeler/action/OpenProjectAction.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/testdo/mt/auto/_ClientMtDeleteCascade.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/testdo/mt/auto/_ClientMtDeleteDeny.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/testdo/mt/auto/_ClientMtDeleteNullify.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/testdo/mt/auto/_ClientMtDeleteRule.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/testdo/mt/auto/_ClientMtTable1.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/testdo/mt/auto/_ClientMtTable1Subclass.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/testdo/mt/auto/_ClientMtTable2.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/testdo/mt/auto/_ClientMtTable3.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/lightweight-cayenne.xml
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/locking.map.xml
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/map-db1.map.xml
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/map-db2.map.xml
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/multi-tier.map.xml
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/one-way-map.map.xml
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/people.map.xml
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/relationships.map.xml
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/spring-test-resources.xml
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/testmap-dependent.map.xml
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/testmap.map.xml
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/testtemplate.vm
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/upgrade/1.2/cayenne.xml

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-ant/ant/doc.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-ant/ant/doc.xml?rev=422603&r1=422602&r2=422603&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-ant/ant/doc.xml (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-ant/ant/doc.xml Sun Jul 16 19:35:13 2006
@@ -6,7 +6,7 @@
 <project>
 	<property name="core.build.tools" value="${build}/tools/classes"/>
 	<property name="parser.dir.exp"
-		value="${cayenne.java}/src/cayenne/java/org/objectstyle/cayenne/exp/parser"/>
+		value="${cayenne.java}/src/cayenne/java/org/apache/cayenne/exp/parser"/>
 	<property name="parser.base.exp" value="ExpressionParser"/>
 	
 	<!-- ========================================== -->
@@ -18,7 +18,7 @@
 		<compile-1_5 destdir="${core.build.tools}" srcref="srcpath-tools"
 					classpathref="classpath-tools"/>
 		
-		<taskdef name="docgen" classname="org.objectstyle.cayenne.tools.ant.docgen.DocGenTask">
+		<taskdef name="docgen" classname="org.apache.cayenne.tools.ant.docgen.DocGenTask">
 			<classpath refid="classpath-built-tools"/>
 		</taskdef>
 		

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/map/MapLoader.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/map/MapLoader.java?rev=422603&r1=422602&r2=422603&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/map/MapLoader.java (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/map/MapLoader.java Sun Jul 16 19:35:13 2006
@@ -77,12 +77,13 @@
  * saving DataMap objects back to XML.
  * 
  * @author Misha Shengaout
- * @author Andrei Adamchik
+ * @author Andrus Adamchik
  * @author Andriy Shapochka
  */
 public class MapLoader extends DefaultHandler {
 
-    // private static final Logger logObj = Logger.getLogger(MapLoader.class);
+    final static String _1_2_PACKAGE_PREFIX = "org.objectstyle.cayenne.";
+    final static String _2_0_PACKAGE_PREFIX = "org.apache.cayenne.";
 
     public static final String DATA_MAP_TAG = "data-map";
     public static final String PROPERTY_TAG = "property";
@@ -690,13 +691,20 @@
 
         String builder = attributes.getValue("", "factory");
 
-        // TODO: this is a hack to migrate between 1.1M6 and 1.1M7...
-        // remove this at some point
         if (builder == null) {
             builder = SelectQueryBuilder.class.getName();
         }
-        else if (builder.equals("org.apache.cayenne.query.SelectQueryBuilder")) {
-            builder = SelectQueryBuilder.class.getName();
+        else {
+            // TODO: this is a hack to migrate between 1.1M6 and 1.1M7...
+            // remove this at some point
+            if (builder.equals("org.objectstyle.cayenne.query.SelectQueryBuilder")) {
+                builder = SelectQueryBuilder.class.getName();
+            }
+            // upgrade from v. <= 1.2
+            else if (builder.startsWith(_1_2_PACKAGE_PREFIX)) {
+                builder = _2_0_PACKAGE_PREFIX
+                        + builder.substring(_1_2_PACKAGE_PREFIX.length());
+            }
         }
 
         try {

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/map/SelectQueryBuilder.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/map/SelectQueryBuilder.java?rev=422603&r1=422602&r2=422603&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/map/SelectQueryBuilder.java (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/map/SelectQueryBuilder.java Sun Jul 16 19:35:13 2006
@@ -64,7 +64,7 @@
  * QueryBuilder for SelectQueries.
  * 
  * @since 1.1
- * @author Andrei Adamchik
+ * @author Andrus Adamchik
  */
 class SelectQueryBuilder extends QueryBuilder {
 

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/project/ApplicationProject.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/project/ApplicationProject.java?rev=422603&r1=422602&r2=422603&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/project/ApplicationProject.java (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/project/ApplicationProject.java Sun Jul 16 19:35:13 2006
@@ -193,7 +193,7 @@
     }
 
     public void checkForUpgrades() {
-        ApplicationUpgradeHandler.sharedHandler().checkForUpgrades(
+        this.upgradeStatus = ApplicationUpgradeHandler.sharedHandler().checkForUpgrades(
                 configuration,
                 upgradeMessages);
     }

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/project/ApplicationUpgradeHandler.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/project/ApplicationUpgradeHandler.java?rev=422603&r1=422602&r2=422603&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/project/ApplicationUpgradeHandler.java (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/project/ApplicationUpgradeHandler.java Sun Jul 16 19:35:13 2006
@@ -61,11 +61,15 @@
 
 /**
  * @since 1.1
- * @author Andrei Adamchik
+ * @author Andrus Adamchik
  */
+// TODO: andrus, 7/16/2006 - upgrade handler is rather primitive and relies on individual
+// loaders to be able to read older versions and convert them to the latest one in memory.
+// So this handler simply checks the version to trigger the update in the calling UI, and
+// saves what's been already loaded.
 abstract class ApplicationUpgradeHandler {
-    private static final ApplicationUpgradeHandler sharedInstance =
-        new UpgradeHandler_1_1();
+
+    private static final ApplicationUpgradeHandler sharedInstance = new UpgradeHandler_2_0();
 
     static ApplicationUpgradeHandler sharedHandler() {
         return sharedInstance;
@@ -73,7 +77,7 @@
 
     abstract String supportedVersion();
 
-    abstract boolean checkForUpgrades(Configuration project, Collection appendMessages);
+    abstract int checkForUpgrades(Configuration project, Collection appendMessages);
 
     abstract void performUpgrade(ApplicationProject project) throws ProjectException;
 
@@ -106,7 +110,15 @@
         return Double.parseDouble(buffer.toString());
     }
 
+    static class UpgradeHandler_2_0 extends UpgradeHandler_1_1 {
+
+        String supportedVersion() {
+            return "2.0";
+        }
+    }
+
     static class UpgradeHandler_1_1 extends ApplicationUpgradeHandler {
+
         String supportedVersion() {
             return "1.1";
         }
@@ -117,23 +129,25 @@
             project.save();
         }
 
-        boolean checkForUpgrades(Configuration project, Collection appendMessages) {
+        int checkForUpgrades(Configuration project, Collection appendMessages) {
             String loadedVersion = project.getProjectVersion();
             int versionState = compareVersion(loadedVersion);
             if (versionState < 0) {
                 String versionLabel = (loadedVersion != null) ? loadedVersion : "?";
-                appendMessages.add(
-                    "Newer Project Version Detected: \"" + versionLabel + "\"");
-                return true;
+                appendMessages.add("Newer Project Version Detected: \""
+                        + versionLabel
+                        + "\"");
+                return Project.UPGRADE_STATUS_NEW;
             }
             else if (versionState > 0) {
                 String versionLabel = (loadedVersion != null) ? loadedVersion : "?";
-                appendMessages.add(
-                    "Older Project Version Detected: \"" + versionLabel + "\"");
-                return true;
+                appendMessages.add("Older Project Version Detected: \""
+                        + versionLabel
+                        + "\"");
+                return Project.UPGRADE_STATUS_OLD;
             }
             else {
-                return false;
+                return Project.UPGRADE_STATUS_CURRENT;
             }
         }
     }

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/project/Project.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/project/Project.java?rev=422603&r1=422602&r2=422603&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/project/Project.java (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/project/Project.java Sun Jul 16 19:35:13 2006
@@ -82,9 +82,13 @@
     private static final Logger logObj = Logger.getLogger(Project.class);
 
     public static final String CURRENT_PROJECT_VERSION = "2.0";
+    static final int UPGRADE_STATUS_OLD = -1;
+    static final int UPGRADE_STATUS_CURRENT = 0;
+    static final int UPGRADE_STATUS_NEW = 1;
 
     protected File projectDir;
     protected List files = new ArrayList();
+    protected int upgradeStatus;
     protected List upgradeMessages;
     protected boolean modified;
 
@@ -170,9 +174,22 @@
 
     /**
      * Returns true if the project needs to be upgraded.
+     * 
+     * @deprecated since 2.0 use 'getUpgradeStatus'.
      */
     public boolean isUpgradeNeeded() {
-        return upgradeMessages.size() > 0;
+        return upgradeStatus < 0;
+    }
+
+    /**
+     * Returns project upgrade status. "0" means project version matches the framework
+     * version, "-1" means project is older than the framework, "+1" means the framework
+     * is older than the project.
+     * 
+     * @since 2.0
+     */
+    public int getUpgradeStatus() {
+        return upgradeStatus;
     }
 
     /**

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/tools/antlib.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/tools/antlib.xml?rev=422603&r1=422602&r2=422603&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/tools/antlib.xml (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/tools/antlib.xml Sun Jul 16 19:35:13 2006
@@ -1,6 +1,6 @@
 <antlib>
-  <taskdef name="cgen" classname="org.objectstyle.cayenne.tools.CayenneGenerator"/>
-  <taskdef name="cdbgen" classname="org.objectstyle.cayenne.tools.DbGeneratorTask"/>
-  <taskdef name="cdeploy" classname="org.objectstyle.cayenne.tools.DeploymentConfigurator"/>
-  <taskdef name="cdataport" classname="org.objectstyle.cayenne.tools.DataPortTask"/>
+  <taskdef name="cgen" classname="org.apache.cayenne.tools.CayenneGenerator"/>
+  <taskdef name="cdbgen" classname="org.apache.cayenne.tools.DbGeneratorTask"/>
+  <taskdef name="cdeploy" classname="org.apache.cayenne.tools.DeploymentConfigurator"/>
+  <taskdef name="cdataport" classname="org.apache.cayenne.tools.DataPortTask"/>
 </antlib>

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/resources/dotemplates/v1_2/client-subclass.vm
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/resources/dotemplates/v1_2/client-subclass.vm?rev=422603&r1=422602&r2=422603&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/resources/dotemplates/v1_2/client-subclass.vm (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/resources/dotemplates/v1_2/client-subclass.vm Sun Jul 16 19:35:13 2006
@@ -1,15 +1,15 @@
 ##  A default Cayenne template for a client-side subclass in a generated subclass/superclass pair.
 ## 
 ##  Terminology:
-##  Base class - super superclass of entity, ie, org.objectstyle.cayenne.CayenneDataObject or MyBaseClass
-##  Super class - superclass of entity, ie,  org.objectstyle.cayenne.art.auto._Artist
-##  Sub class - class of entity, ie, org.objectstyle.cayenne.art.Artist
+##  Base class - super superclass of entity, ie, org.apache.cayenne.CayenneDataObject or MyBaseClass
+##  Super class - superclass of entity, ie,  org.apache.cayenne.art.auto._Artist
+##  Sub class - class of entity, ie, org.apache.cayenne.art.Artist
 ##
 ##  Classes available in template
-##    objEntity - the ObjEntity class: See org.objectstyle.cayenne.map.ObjectEntity
-##    stringUtils - class for string "helper" functions: See org.objectstyle.cayenne.gen.StringUtils
-##    entityUtils - class for entity "helper" functions: See org.objectstyle.cayenne.gen.EntityUtils
-##    importUtils - class for import statement management: See org.objectstyle.cayenne.gen.ImportUtils
+##    objEntity - the ObjEntity class: See org.apache.cayenne.map.ObjectEntity
+##    stringUtils - class for string "helper" functions: See org.apache.cayenne.gen.StringUtils
+##    entityUtils - class for entity "helper" functions: See org.apache.cayenne.gen.EntityUtils
+##    importUtils - class for import statement management: See org.apache.cayenne.gen.ImportUtils
 ##
 ${importUtils.setPackage($entityUtils.subPackageName)}##
 ${importUtils.addReservedType("${$entityUtils.subPackageName}.${entityUtils.subClassName}")}##

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/resources/dotemplates/v1_2/client-superclass.vm
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/resources/dotemplates/v1_2/client-superclass.vm?rev=422603&r1=422602&r2=422603&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/resources/dotemplates/v1_2/client-superclass.vm (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/resources/dotemplates/v1_2/client-superclass.vm Sun Jul 16 19:35:13 2006
@@ -1,13 +1,13 @@
 ##Terminology:
-##	Base class - super superclass of entity, ie, org.objectstyle.cayenne.PersistentObject or MyBaseClass
-##  Super class - superclass of entity, ie,  org.objectstyle.cayenne.art.auto._Artist
-##	Sub class - class of entity, ie, org.objectstyle.cayenne.art.Artist
+##	Base class - super superclass of entity, ie, org.apache.cayenne.PersistentObject or MyBaseClass
+##  Super class - superclass of entity, ie,  org.apache.cayenne.art.auto._Artist
+##	Sub class - class of entity, ie, org.apache.cayenne.art.Artist
 ##
 ##  Classes available in template
-##    objEntity - the ObjEntity class: See org.objectstyle.cayenne.map.ObjectEntity
-##    stringUtils - class for string "helper" functions: See org.objectstyle.cayenne.gen.StringUtils
-##    entityUtils - class for entity "helper" functions: See org.objectstyle.cayenne.gen.EntityUtils
-##    importUtils - class for import statement management: See org.objectstyle.cayenne.gen.ImportUtils
+##    objEntity - the ObjEntity class: See org.apache.cayenne.map.ObjectEntity
+##    stringUtils - class for string "helper" functions: See org.apache.cayenne.gen.StringUtils
+##    entityUtils - class for entity "helper" functions: See org.apache.cayenne.gen.EntityUtils
+##    importUtils - class for import statement management: See org.apache.cayenne.gen.ImportUtils
 ##
 ##
 ${importUtils.setPackage($entityUtils.superPackageName)}##
@@ -23,7 +23,7 @@
 ${importUtils.addType('java.util.List')}##
 #end
 #if( ${entityUtils.hasToOneDeclaredRelationships()} )
-${importUtils.addType('org.objectstyle.cayenne.ValueHolder')}##
+${importUtils.addType('org.apache.cayenne.ValueHolder')}##
 #end
 ${importUtils.generate()}
 

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/resources/dotemplates/v1_2/singleclass.vm
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/resources/dotemplates/v1_2/singleclass.vm?rev=422603&r1=422602&r2=422603&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/resources/dotemplates/v1_2/singleclass.vm (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/resources/dotemplates/v1_2/singleclass.vm Sun Jul 16 19:35:13 2006
@@ -1,13 +1,13 @@
 ##Terminology:
-##	Base class - super superclass of entity, ie, org.objectstyle.cayenne.CayenneDataObject or MyBaseClass
-##  Super class - superclass of entity, ie,  org.objectstyle.cayenne.art.auto._Artist
-##	Sub class - class of entity, ie, org.objectstyle.cayenne.art.Artist
+##	Base class - super superclass of entity, ie, org.apache.cayenne.CayenneDataObject or MyBaseClass
+##  Super class - superclass of entity, ie,  org.apache.cayenne.art.auto._Artist
+##	Sub class - class of entity, ie, org.apache.cayenne.art.Artist
 ##
 ##  Classes available in template
-##    objEntity - the ObjEntity class: See org.objectstyle.cayenne.map.ObjectEntity
-##    stringUtils - class for string "helper" functions: See org.objectstyle.cayenne.gen.StringUtils
-##    entityUtils - class for entity "helper" functions: See org.objectstyle.cayenne.gen.EntityUtils
-##    importUtils - class for import statement management: See org.objectstyle.cayenne.gen.ImportUtils
+##    objEntity - the ObjEntity class: See org.apache.cayenne.map.ObjectEntity
+##    stringUtils - class for string "helper" functions: See org.apache.cayenne.gen.StringUtils
+##    entityUtils - class for entity "helper" functions: See org.apache.cayenne.gen.EntityUtils
+##    importUtils - class for import statement management: See org.apache.cayenne.gen.ImportUtils
 ##
 ##
 ${importUtils.setPackage($entityUtils.subPackageName)}##

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/resources/dotemplates/v1_2/subclass.vm
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/resources/dotemplates/v1_2/subclass.vm?rev=422603&r1=422602&r2=422603&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/resources/dotemplates/v1_2/subclass.vm (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/resources/dotemplates/v1_2/subclass.vm Sun Jul 16 19:35:13 2006
@@ -1,13 +1,13 @@
 ##Terminology:
-##	Base class - super superclass of entity, ie, org.objectstyle.cayenne.CayenneDataObject or MyBaseClass
-##  Super class - superclass of entity, ie,  org.objectstyle.cayenne.art.auto._Artist
-##	Sub class - class of entity, ie, org.objectstyle.cayenne.art.Artist
+##	Base class - super superclass of entity, ie, org.apache.cayenne.CayenneDataObject or MyBaseClass
+##  Super class - superclass of entity, ie,  org.apache.cayenne.art.auto._Artist
+##	Sub class - class of entity, ie, org.apache.cayenne.art.Artist
 ##
 ##  Classes available in template
-##    objEntity - the ObjEntity class: See org.objectstyle.cayenne.map.ObjectEntity
-##    stringUtils - class for string "helper" functions: See org.objectstyle.cayenne.gen.StringUtils
-##    entityUtils - class for entity "helper" functions: See org.objectstyle.cayenne.gen.EntityUtils
-##    importUtils - class for import statement management: See org.objectstyle.cayenne.gen.ImportUtils
+##    objEntity - the ObjEntity class: See org.apache.cayenne.map.ObjectEntity
+##    stringUtils - class for string "helper" functions: See org.apache.cayenne.gen.StringUtils
+##    entityUtils - class for entity "helper" functions: See org.apache.cayenne.gen.EntityUtils
+##    importUtils - class for import statement management: See org.apache.cayenne.gen.ImportUtils
 ##
 ##
 ${importUtils.setPackage($entityUtils.subPackageName)}##

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/resources/dotemplates/v1_2/superclass.vm
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/resources/dotemplates/v1_2/superclass.vm?rev=422603&r1=422602&r2=422603&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/resources/dotemplates/v1_2/superclass.vm (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/resources/dotemplates/v1_2/superclass.vm Sun Jul 16 19:35:13 2006
@@ -1,13 +1,13 @@
 ##Terminology:
-##	Base class - super superclass of entity, ie, org.objectstyle.cayenne.CayenneDataObject or MyBaseClass
-##  Super class - superclass of entity, ie,  org.objectstyle.cayenne.art.auto._Artist
-##	Sub class - class of entity, ie, org.objectstyle.cayenne.art.Artist
+##	Base class - super superclass of entity, ie, org.apache.cayenne.CayenneDataObject or MyBaseClass
+##  Super class - superclass of entity, ie,  org.apache.cayenne.art.auto._Artist
+##	Sub class - class of entity, ie, org.apache.cayenne.art.Artist
 ##
 ##  Classes available in template
-##    objEntity - the ObjEntity class: See org.objectstyle.cayenne.map.ObjectEntity
-##    stringUtils - class for string "helper" functions: See org.objectstyle.cayenne.gen.StringUtils
-##    entityUtils - class for entity "helper" functions: See org.objectstyle.cayenne.gen.EntityUtils
-##    importUtils - class for import statement management: See org.objectstyle.cayenne.gen.ImportUtils
+##    objEntity - the ObjEntity class: See org.apache.cayenne.map.ObjectEntity
+##    stringUtils - class for string "helper" functions: See org.apache.cayenne.gen.StringUtils
+##    entityUtils - class for entity "helper" functions: See org.apache.cayenne.gen.EntityUtils
+##    importUtils - class for import statement management: See org.apache.cayenne.gen.ImportUtils
 ##
 ##
 ${importUtils.setPackage($entityUtils.superPackageName)}##

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/modeler/java/org/apache/cayenne/modeler/action/OpenProjectAction.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/modeler/java/org/apache/cayenne/modeler/action/OpenProjectAction.java?rev=422603&r1=422602&r2=422603&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/modeler/java/org/apache/cayenne/modeler/action/OpenProjectAction.java (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/modeler/java/org/apache/cayenne/modeler/action/OpenProjectAction.java Sun Jul 16 19:35:13 2006
@@ -148,8 +148,23 @@
             getProjectController().setProject(project);
 
             // if upgrade was canceled
-            if (project.isUpgradeNeeded() && !processUpgrades(project)) {
+            int upgradeStatus = project.getUpgradeStatus();
+            if (upgradeStatus > 0) {
+                JOptionPane
+                        .showMessageDialog(
+                                Application.getFrame(),
+                                "Can't open project - it was created using a newer version of the Modeler",
+                                "Can't Open Project",
+                                JOptionPane.OK_OPTION);
                 closeProject(false);
+            }
+            else if (upgradeStatus > 0) {
+                if (processUpgrades(project)) {
+                    getApplication().getFrameController().projectOpenedAction(project);
+                }
+                else {
+                    closeProject(false);
+                }
             }
             else {
                 getApplication().getFrameController().projectOpenedAction(project);

Added: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/project/ApplicationProjectUpgradeTst.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/project/ApplicationProjectUpgradeTst.java?rev=422603&view=auto
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/project/ApplicationProjectUpgradeTst.java (added)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/project/ApplicationProjectUpgradeTst.java Sun Jul 16 19:35:13 2006
@@ -0,0 +1,72 @@
+/* ====================================================================
+ * 
+ * The ObjectStyle Group Software License, version 1.1
+ * ObjectStyle Group - http://objectstyle.org/
+ * 
+ * Copyright (c) 2002-2005, Andrei (Andrus) Adamchik and individual authors
+ * of the software. All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 
+ * 3. The end-user documentation included with the redistribution, if any,
+ *    must include the following acknowlegement:
+ *    "This product includes software developed by independent contributors
+ *    and hosted on ObjectStyle Group web site (http://objectstyle.org/)."
+ *    Alternately, this acknowlegement may appear in the software itself,
+ *    if and wherever such third-party acknowlegements normally appear.
+ * 
+ * 4. The names "ObjectStyle Group" and "Cayenne" must not be used to endorse
+ *    or promote products derived from this software without prior written
+ *    permission. For written permission, email
+ *    "andrus at objectstyle dot org".
+ * 
+ * 5. Products derived from this software may not be called "ObjectStyle"
+ *    or "Cayenne", nor may "ObjectStyle" or "Cayenne" appear in their
+ *    names without prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE OBJECTSTYLE GROUP OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ * 
+ * This software consists of voluntary contributions made by many
+ * individuals and hosted on ObjectStyle Group web site.  For more
+ * information on the ObjectStyle Group, please see
+ * <http://objectstyle.org/>.
+ */
+package org.apache.cayenne.project;
+
+import java.io.File;
+
+import org.apache.cayenne.unit.CayenneTestCase;
+import org.apache.cayenne.unit.CayenneTestResources;
+
+public class ApplicationProjectUpgradeTst extends CayenneTestCase {
+
+    public void testUpgrade1_2() throws Exception {
+
+        // copy files first as upgrade is done in-place
+
+        File cayenne_xml = new File(getTestDir(), "upgrade/1.2/cayenne.xml");
+        CayenneTestResources.copyResourceToFile("upgrade/1.2/cayenne.xml", cayenne_xml);
+    }
+}

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/testdo/mt/auto/_ClientMtDeleteCascade.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/testdo/mt/auto/_ClientMtDeleteCascade.java?rev=422603&r1=422602&r2=422603&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/testdo/mt/auto/_ClientMtDeleteCascade.java (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/testdo/mt/auto/_ClientMtDeleteCascade.java Sun Jul 16 19:35:13 2006
@@ -54,4 +54,4 @@
         this.cascade.setValue(cascade);
     }
     
-}
+}
\ No newline at end of file

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/testdo/mt/auto/_ClientMtDeleteDeny.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/testdo/mt/auto/_ClientMtDeleteDeny.java?rev=422603&r1=422602&r2=422603&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/testdo/mt/auto/_ClientMtDeleteDeny.java (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/testdo/mt/auto/_ClientMtDeleteDeny.java Sun Jul 16 19:35:13 2006
@@ -54,4 +54,4 @@
         this.deny.setValue(deny);
     }
     
-}
+}
\ No newline at end of file

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/testdo/mt/auto/_ClientMtDeleteNullify.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/testdo/mt/auto/_ClientMtDeleteNullify.java?rev=422603&r1=422602&r2=422603&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/testdo/mt/auto/_ClientMtDeleteNullify.java (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/testdo/mt/auto/_ClientMtDeleteNullify.java Sun Jul 16 19:35:13 2006
@@ -54,4 +54,4 @@
         this.nullify.setValue(nullify);
     }
     
-}
+}
\ No newline at end of file

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/testdo/mt/auto/_ClientMtDeleteRule.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/testdo/mt/auto/_ClientMtDeleteRule.java?rev=422603&r1=422602&r2=422603&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/testdo/mt/auto/_ClientMtDeleteRule.java (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/testdo/mt/auto/_ClientMtDeleteRule.java Sun Jul 16 19:35:13 2006
@@ -112,4 +112,4 @@
         this.fromNullify.remove(object);
     }
     
-}
+}
\ No newline at end of file

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/testdo/mt/auto/_ClientMtTable1.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/testdo/mt/auto/_ClientMtTable1.java?rev=422603&r1=422602&r2=422603&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/testdo/mt/auto/_ClientMtTable1.java (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/testdo/mt/auto/_ClientMtTable1.java Sun Jul 16 19:35:13 2006
@@ -86,4 +86,4 @@
         this.table2Array.remove(object);
     }
     
-}
+}
\ No newline at end of file

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/testdo/mt/auto/_ClientMtTable1Subclass.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/testdo/mt/auto/_ClientMtTable1Subclass.java?rev=422603&r1=422602&r2=422603&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/testdo/mt/auto/_ClientMtTable1Subclass.java (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/testdo/mt/auto/_ClientMtTable1Subclass.java Sun Jul 16 19:35:13 2006
@@ -11,4 +11,4 @@
 
 
 
-}
+}
\ No newline at end of file

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/testdo/mt/auto/_ClientMtTable2.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/testdo/mt/auto/_ClientMtTable2.java?rev=422603&r1=422602&r2=422603&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/testdo/mt/auto/_ClientMtTable2.java (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/testdo/mt/auto/_ClientMtTable2.java Sun Jul 16 19:35:13 2006
@@ -54,4 +54,4 @@
         this.table1.setValue(table1);
     }
     
-}
+}
\ No newline at end of file

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/testdo/mt/auto/_ClientMtTable3.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/testdo/mt/auto/_ClientMtTable3.java?rev=422603&r1=422602&r2=422603&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/testdo/mt/auto/_ClientMtTable3.java (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/testdo/mt/auto/_ClientMtTable3.java Sun Jul 16 19:35:13 2006
@@ -83,4 +83,4 @@
     }
     
     
-}
+}
\ No newline at end of file

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/lightweight-cayenne.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/lightweight-cayenne.xml?rev=422603&r1=422602&r2=422603&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/lightweight-cayenne.xml (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/lightweight-cayenne.xml Sun Jul 16 19:35:13 2006
@@ -4,8 +4,8 @@
 	<map name="testmap" location="testmap.map.xml"/>
 	<node name="n1"
 		 datasource="n1.driver.xml"
-		 adapter="org.objectstyle.cayenne.dba.mysql.MySQLAdapter"
-		 factory="org.objectstyle.cayenne.conf.DriverDataSourceFactory">
+		 adapter="org.apache.cayenne.dba.mysql.MySQLAdapter"
+		 factory="org.apache.cayenne.conf.DriverDataSourceFactory">
 			<map-ref name="testmap"/>
 	 </node>
 </domain>
@@ -13,14 +13,14 @@
 	<map name="mm" location="mm.map.xml"/>
         <node name="n1"
 		 datasource="n1.driver.xml"
-		 adapter="org.objectstyle.cayenne.dba.mysql.MySQLAdapter"
-		 factory="org.objectstyle.cayenne.conf.DriverDataSourceFactory">
+		 adapter="org.apache.cayenne.dba.mysql.MySQLAdapter"
+		 factory="org.apache.cayenne.conf.DriverDataSourceFactory">
 			<map-ref name="mm"/>
 	 </node>
 	<node name="n2"
 		 datasource="n1.driver.xml"
-		 adapter="org.objectstyle.cayenne.dba.mysql.MySQLAdapter"
-		 factory="org.objectstyle.cayenne.conf.DriverDataSourceFactory">
+		 adapter="org.apache.cayenne.dba.mysql.MySQLAdapter"
+		 factory="org.apache.cayenne.conf.DriverDataSourceFactory">
 			<map-ref name="testmap"/>
 	 </node>
 </domain>

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/locking.map.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/locking.map.xml?rev=422603&r1=422602&r2=422603&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/locking.map.xml (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/locking.map.xml Sun Jul 16 19:35:13 2006
@@ -25,21 +25,21 @@
 		<db-attribute name="TIME_LOCK" type="TIMESTAMP"/>
 		<db-attribute name="TIME_LOCKING_TEST_ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
 	</db-entity>
-	<obj-entity name="DateLockingTest" className="org.objectstyle.cayenne.testdo.locking.DateLockingTest" lock-type="optimistic" dbEntityName="DATE_LOCKING_TEST">
+	<obj-entity name="DateLockingTest" className="org.apache.cayenne.testdo.locking.DateLockingTest" lock-type="optimistic" dbEntityName="DATE_LOCKING_TEST">
 		<obj-attribute name="dateLock" type="java.util.Date" lock="true" db-attribute-path="DATE_LOCK"/>
 		<obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/>
 	</obj-entity>
-	<obj-entity name="LockingHelper" className="org.objectstyle.cayenne.testdo.locking.LockingHelper" dbEntityName="LOCKING_HELPER">
+	<obj-entity name="LockingHelper" className="org.apache.cayenne.testdo.locking.LockingHelper" dbEntityName="LOCKING_HELPER">
 		<obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/>
 	</obj-entity>
-	<obj-entity name="RelLockingTest" className="org.objectstyle.cayenne.testdo.locking.RelLockingTest" lock-type="optimistic" dbEntityName="REL_LOCKING_TEST">
+	<obj-entity name="RelLockingTest" className="org.apache.cayenne.testdo.locking.RelLockingTest" lock-type="optimistic" dbEntityName="REL_LOCKING_TEST">
 		<obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/>
 	</obj-entity>
-	<obj-entity name="SimpleLockingTest" className="org.objectstyle.cayenne.testdo.locking.SimpleLockingTest" lock-type="optimistic" dbEntityName="SIMPLE_LOCKING_TEST">
+	<obj-entity name="SimpleLockingTest" className="org.apache.cayenne.testdo.locking.SimpleLockingTest" lock-type="optimistic" dbEntityName="SIMPLE_LOCKING_TEST">
 		<obj-attribute name="description" type="java.lang.String" db-attribute-path="DESCRIPTION"/>
 		<obj-attribute name="name" type="java.lang.String" lock="true" db-attribute-path="NAME"/>
 	</obj-entity>
-	<obj-entity name="TimeLockingTest" className="org.objectstyle.cayenne.testdo.locking.TimeLockingTest" lock-type="optimistic" dbEntityName="TIME_LOCKING_TEST">
+	<obj-entity name="TimeLockingTest" className="org.apache.cayenne.testdo.locking.TimeLockingTest" lock-type="optimistic" dbEntityName="TIME_LOCKING_TEST">
 		<obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/>
 		<obj-attribute name="timeLock" type="java.util.Date" lock="true" db-attribute-path="TIME_LOCK"/>
 	</obj-entity>

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/map-db1.map.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/map-db1.map.xml?rev=422603&r1=422602&r2=422603&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/map-db1.map.xml (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/map-db1.map.xml Sun Jul 16 19:35:13 2006
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <data-map project-version="1.1">
-	<property name="defaultPackage" value="org.objectstyle.cayenne.testdo.db1"/>
+	<property name="defaultPackage" value="org.apache.cayenne.testdo.db1"/>
 	<db-entity name="CROSSDB_M1E1">
 		<db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
 		<db-attribute name="NAME" type="VARCHAR" length="200"/>
 	</db-entity>
-	<obj-entity name="CrossdbM1E1" className="org.objectstyle.cayenne.testdo.db1.CrossdbM1E1" dbEntityName="CROSSDB_M1E1">
+	<obj-entity name="CrossdbM1E1" className="org.apache.cayenne.testdo.db1.CrossdbM1E1" dbEntityName="CROSSDB_M1E1">
 		<obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/>
 	</obj-entity>
 	<db-relationship name="listOfM2E2" source="CROSSDB_M1E1" target="CROSSDB_M2E2" toMany="true">

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/map-db2.map.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/map-db2.map.xml?rev=422603&r1=422602&r2=422603&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/map-db2.map.xml (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/map-db2.map.xml Sun Jul 16 19:35:13 2006
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <data-map project-version="1.1">
-	<property name="defaultPackage" value="org.objectstyle.cayenne.testdo.db2"/>
+	<property name="defaultPackage" value="org.apache.cayenne.testdo.db2"/>
 	<db-entity name="CROSSDB_M2E1">
 		<db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
 		<db-attribute name="NAME" type="VARCHAR" length="100"/>
@@ -11,10 +11,10 @@
 		<db-attribute name="M2E1_ID" type="INTEGER"/>
 		<db-attribute name="NAME" type="VARCHAR" length="200"/>
 	</db-entity>
-	<obj-entity name="CrossdbM2E1" className="org.objectstyle.cayenne.testdo.db2.CrossdbM2E1" dbEntityName="CROSSDB_M2E1">
+	<obj-entity name="CrossdbM2E1" className="org.apache.cayenne.testdo.db2.CrossdbM2E1" dbEntityName="CROSSDB_M2E1">
 		<obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/>
 	</obj-entity>
-	<obj-entity name="CrossdbM2E2" className="org.objectstyle.cayenne.testdo.db2.CrossdbM2E2" dbEntityName="CROSSDB_M2E2">
+	<obj-entity name="CrossdbM2E2" className="org.apache.cayenne.testdo.db2.CrossdbM2E2" dbEntityName="CROSSDB_M2E2">
 		<obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/>
 	</obj-entity>
 	<db-relationship name="listOfM2E2" source="CROSSDB_M2E1" target="CROSSDB_M2E2" toMany="true">

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/multi-tier.map.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/multi-tier.map.xml?rev=422603&r1=422602&r2=422603&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/multi-tier.map.xml (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/multi-tier.map.xml Sun Jul 16 19:35:13 2006
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <data-map project-version="1.1">
-	<property name="defaultPackage" value="org.objectstyle.cayenne.testdo.mt"/>
+	<property name="defaultPackage" value="org.apache.cayenne.testdo.mt"/>
 	<property name="clientSupported" value="true"/>
-	<property name="defaultClientPackage" value="org.objectstyle.cayenne.testdo.mt"/>
+	<property name="defaultClientPackage" value="org.apache.cayenne.testdo.mt"/>
 	<db-entity name="MT_DELETE_CASCADE">
 		<db-attribute name="DELETE_CASCADE_ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
 		<db-attribute name="DELETE_RULE_ID" type="INTEGER"/>
@@ -38,29 +38,29 @@
 		<db-attribute name="INT_COLUMN" type="INTEGER"/>
 		<db-attribute name="TABLE3_ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
 	</db-entity>
-	<obj-entity name="MtDeleteCascade" className="org.objectstyle.cayenne.testdo.mt.MtDeleteCascade" clientClassName="org.objectstyle.cayenne.testdo.mt.ClientMtDeleteCascade" dbEntityName="MT_DELETE_CASCADE">
+	<obj-entity name="MtDeleteCascade" className="org.apache.cayenne.testdo.mt.MtDeleteCascade" clientClassName="org.apache.cayenne.testdo.mt.ClientMtDeleteCascade" dbEntityName="MT_DELETE_CASCADE">
 		<obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/>
 	</obj-entity>
-	<obj-entity name="MtDeleteDeny" className="org.objectstyle.cayenne.testdo.mt.MtDeleteDeny" clientClassName="org.objectstyle.cayenne.testdo.mt.ClientMtDeleteDeny" dbEntityName="MT_DELETE_DENY">
+	<obj-entity name="MtDeleteDeny" className="org.apache.cayenne.testdo.mt.MtDeleteDeny" clientClassName="org.apache.cayenne.testdo.mt.ClientMtDeleteDeny" dbEntityName="MT_DELETE_DENY">
 		<obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/>
 	</obj-entity>
-	<obj-entity name="MtDeleteNullify" className="org.objectstyle.cayenne.testdo.mt.MtDeleteNullify" clientClassName="org.objectstyle.cayenne.testdo.mt.ClientMtDeleteNullify" dbEntityName="MT_DELETE_NULLIFY">
+	<obj-entity name="MtDeleteNullify" className="org.apache.cayenne.testdo.mt.MtDeleteNullify" clientClassName="org.apache.cayenne.testdo.mt.ClientMtDeleteNullify" dbEntityName="MT_DELETE_NULLIFY">
 		<obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/>
 	</obj-entity>
-	<obj-entity name="MtDeleteRule" className="org.objectstyle.cayenne.testdo.mt.MtDeleteRule" clientClassName="org.objectstyle.cayenne.testdo.mt.ClientMtDeleteRule" dbEntityName="MT_DELETE_RULE">
+	<obj-entity name="MtDeleteRule" className="org.apache.cayenne.testdo.mt.MtDeleteRule" clientClassName="org.apache.cayenne.testdo.mt.ClientMtDeleteRule" dbEntityName="MT_DELETE_RULE">
 		<obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/>
 	</obj-entity>
-	<obj-entity name="MtTable1" className="org.objectstyle.cayenne.testdo.mt.MtTable1" clientClassName="org.objectstyle.cayenne.testdo.mt.ClientMtTable1" dbEntityName="MT_TABLE1">
+	<obj-entity name="MtTable1" className="org.apache.cayenne.testdo.mt.MtTable1" clientClassName="org.apache.cayenne.testdo.mt.ClientMtTable1" dbEntityName="MT_TABLE1">
 		<obj-attribute name="globalAttribute1" type="java.lang.String" db-attribute-path="GLOBAL_ATTRIBUTE1"/>
 		<obj-attribute name="serverAttribute1" type="java.lang.String" db-attribute-path="SERVER_ATTRIBUTE1"/>
 	</obj-entity>
-	<obj-entity name="MtTable1Subclass" superEntityName="MtTable1" className="org.objectstyle.cayenne.testdo.mt.MtTable1Subclass" clientClassName="org.objectstyle.cayenne.testdo.mt.ClientMtTable1Subclass">
+	<obj-entity name="MtTable1Subclass" superEntityName="MtTable1" className="org.apache.cayenne.testdo.mt.MtTable1Subclass" clientClassName="org.apache.cayenne.testdo.mt.ClientMtTable1Subclass">
 		<qualifier><![CDATA[globalAttribute1 = "sub1"]]></qualifier>
 	</obj-entity>
-	<obj-entity name="MtTable2" className="org.objectstyle.cayenne.testdo.mt.MtTable2" clientClassName="org.objectstyle.cayenne.testdo.mt.ClientMtTable2" dbEntityName="MT_TABLE2">
+	<obj-entity name="MtTable2" className="org.apache.cayenne.testdo.mt.MtTable2" clientClassName="org.apache.cayenne.testdo.mt.ClientMtTable2" dbEntityName="MT_TABLE2">
 		<obj-attribute name="globalAttribute" type="java.lang.String" db-attribute-path="GLOBAL_ATTRIBUTE"/>
 	</obj-entity>
-	<obj-entity name="MtTable3" className="org.objectstyle.cayenne.testdo.mt.MtTable3" clientClassName="org.objectstyle.cayenne.testdo.mt.ClientMtTable3" dbEntityName="MT_TABLE3">
+	<obj-entity name="MtTable3" className="org.apache.cayenne.testdo.mt.MtTable3" clientClassName="org.apache.cayenne.testdo.mt.ClientMtTable3" dbEntityName="MT_TABLE3">
 		<obj-attribute name="binaryColumn" type="byte[]" db-attribute-path="BINARY_COLUMN"/>
 		<obj-attribute name="charColumn" type="java.lang.String" db-attribute-path="CHAR_COLUMN"/>
 		<obj-attribute name="intColumn" type="java.lang.Integer" db-attribute-path="INT_COLUMN"/>
@@ -97,12 +97,12 @@
 	<obj-relationship name="fromNullify" source="MtDeleteRule" target="MtDeleteNullify" db-relationship-path="fromNullify"/>
 	<obj-relationship name="table2Array" source="MtTable1" target="MtTable2" db-relationship-path="table2Array"/>
 	<obj-relationship name="table1" source="MtTable2" target="MtTable1" db-relationship-path="table1"/>
-	<query name="AllMtTable1" factory="org.objectstyle.cayenne.map.SelectQueryBuilder" root="obj-entity" root-name="MtTable1">
+	<query name="AllMtTable1" factory="org.apache.cayenne.map.SelectQueryBuilder" root="obj-entity" root-name="MtTable1">
 	</query>
-	<query name="MtQueryWithLocalCache" factory="org.objectstyle.cayenne.map.SelectQueryBuilder" root="obj-entity" root-name="MtTable1">
+	<query name="MtQueryWithLocalCache" factory="org.apache.cayenne.map.SelectQueryBuilder" root="obj-entity" root-name="MtTable1">
 		<property name="cayenne.GenericSelectQuery.cachePolicy" value="localcache"/>
 	</query>
-	<query name="ParameterizedMtQueryWithLocalCache" factory="org.objectstyle.cayenne.map.SelectQueryBuilder" root="obj-entity" root-name="MtTable1">
+	<query name="ParameterizedMtQueryWithLocalCache" factory="org.apache.cayenne.map.SelectQueryBuilder" root="obj-entity" root-name="MtTable1">
 		<property name="cayenne.GenericSelectQuery.cachePolicy" value="localcache"/>
 		<qualifier><![CDATA[globalAttribute1 = $g]]></qualifier>
 	</query>

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/one-way-map.map.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/one-way-map.map.xml?rev=422603&r1=422602&r2=422603&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/one-way-map.map.xml (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/one-way-map.map.xml Sun Jul 16 19:35:13 2006
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <data-map project-version="1.1">
-	<property name="defaultPackage" value="org.objectstyle.art.oneway"/>
+	<property name="defaultPackage" value="org.apache.art.oneway"/>
 	<db-entity name="ARTIST">
 		<db-attribute name="ARTIST_ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
 		<db-attribute name="ARTIST_NAME" type="CHAR" isMandatory="true" length="254"/>
@@ -17,14 +17,14 @@
 		<db-attribute name="PAINTING_ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
 		<db-attribute name="PAINTING_TITLE" type="VARCHAR" isMandatory="true" length="255"/>
 	</db-entity>
-	<obj-entity name="Artist" className="org.objectstyle.art.oneway.Artist" dbEntityName="ARTIST">
+	<obj-entity name="Artist" className="org.apache.art.oneway.Artist" dbEntityName="ARTIST">
 		<obj-attribute name="artistName" type="java.lang.String" db-attribute-path="ARTIST_NAME"/>
 		<obj-attribute name="dateOfBirth" type="java.util.Date" db-attribute-path="DATE_OF_BIRTH"/>
 	</obj-entity>
-	<obj-entity name="Gallery" className="org.objectstyle.art.oneway.Gallery" dbEntityName="GALLERY">
+	<obj-entity name="Gallery" className="org.apache.art.oneway.Gallery" dbEntityName="GALLERY">
 		<obj-attribute name="galleryName" type="java.lang.String" db-attribute-path="GALLERY_NAME"/>
 	</obj-entity>
-	<obj-entity name="Painting" className="org.objectstyle.art.oneway.Painting" dbEntityName="PAINTING" superClassName="org.objectstyle.art.ArtDataObject">
+	<obj-entity name="Painting" className="org.apache.art.oneway.Painting" dbEntityName="PAINTING" superClassName="org.apache.art.ArtDataObject">
 		<obj-attribute name="estimatedPrice" type="java.math.BigDecimal" db-attribute-path="ESTIMATED_PRICE"/>
 		<obj-attribute name="paintingTitle" type="java.lang.String" db-attribute-path="PAINTING_TITLE"/>
 	</obj-entity>

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/people.map.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/people.map.xml?rev=422603&r1=422602&r2=422603&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/people.map.xml (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/people.map.xml Sun Jul 16 19:35:13 2006
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <data-map project-version="1.1">
-	<property name="defaultPackage" value="org.objectstyle.cayenne.testdo.inherit"/>
+	<property name="defaultPackage" value="org.apache.cayenne.testdo.inherit"/>
 	<db-entity name="ADDRESS">
 		<db-attribute name="ADDRESS_ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
 		<db-attribute name="CITY" type="VARCHAR" length="100"/>
@@ -24,28 +24,28 @@
 		<db-attribute name="PERSON_TYPE" type="CHAR" isMandatory="true" length="2"/>
 		<db-attribute name="SALARY" type="FLOAT"/>
 	</db-entity>
-	<obj-entity name="AbstractPerson" className="org.objectstyle.cayenne.testdo.inherit.AbstractPerson" dbEntityName="PERSON">
+	<obj-entity name="AbstractPerson" className="org.apache.cayenne.testdo.inherit.AbstractPerson" dbEntityName="PERSON">
 		<obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/>
 		<obj-attribute name="personType" type="java.lang.String" db-attribute-path="PERSON_TYPE"/>
 	</obj-entity>
-	<obj-entity name="Address" className="org.objectstyle.cayenne.testdo.inherit.Address" dbEntityName="ADDRESS">
+	<obj-entity name="Address" className="org.apache.cayenne.testdo.inherit.Address" dbEntityName="ADDRESS">
 		<obj-attribute name="city" type="java.lang.String" db-attribute-path="CITY"/>
 	</obj-entity>
-	<obj-entity name="ClientCompany" className="org.objectstyle.cayenne.testdo.inherit.ClientCompany" dbEntityName="CLIENT_COMPANY">
+	<obj-entity name="ClientCompany" className="org.apache.cayenne.testdo.inherit.ClientCompany" dbEntityName="CLIENT_COMPANY">
 		<obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/>
 	</obj-entity>
-	<obj-entity name="CustomerRepresentative" superEntityName="AbstractPerson" className="org.objectstyle.cayenne.testdo.inherit.CustomerRepresentative">
+	<obj-entity name="CustomerRepresentative" superEntityName="AbstractPerson" className="org.apache.cayenne.testdo.inherit.CustomerRepresentative">
 		<qualifier><![CDATA[personType = "C"]]></qualifier>
 		<obj-attribute name="clientContactType" type="java.lang.String" db-attribute-path="CLIENT_CONTACT_TYPE"/>
 	</obj-entity>
-	<obj-entity name="Department" className="org.objectstyle.cayenne.testdo.inherit.Department" dbEntityName="DEPARTMENT">
+	<obj-entity name="Department" className="org.apache.cayenne.testdo.inherit.Department" dbEntityName="DEPARTMENT">
 		<obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/>
 	</obj-entity>
-	<obj-entity name="Employee" superEntityName="AbstractPerson" className="org.objectstyle.cayenne.testdo.inherit.Employee">
+	<obj-entity name="Employee" superEntityName="AbstractPerson" className="org.apache.cayenne.testdo.inherit.Employee">
 		<qualifier><![CDATA[personType = "EE"]]></qualifier>
 		<obj-attribute name="salary" type="java.lang.Float" db-attribute-path="SALARY"/>
 	</obj-entity>
-	<obj-entity name="Manager" superEntityName="Employee" className="org.objectstyle.cayenne.testdo.inherit.Manager">
+	<obj-entity name="Manager" superEntityName="Employee" className="org.apache.cayenne.testdo.inherit.Manager">
 		<qualifier><![CDATA[personType = "EM"]]></qualifier>
 	</obj-entity>
 	<db-relationship name="toPerson" source="ADDRESS" target="PERSON" toMany="false">

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/relationships.map.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/relationships.map.xml?rev=422603&r1=422602&r2=422603&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/relationships.map.xml (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/relationships.map.xml Sun Jul 16 19:35:13 2006
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <data-map project-version="1.1">
-	<property name="defaultPackage" value="org.objectstyle.cayenne.testdo.relationship"/>
+	<property name="defaultPackage" value="org.apache.cayenne.testdo.relationship"/>
 	<db-entity name="CLOB_DETAIL">
 		<db-attribute name="CLOB_DETAIL_ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
 		<db-attribute name="CLOB_MASTER_ID" type="INTEGER"/>
@@ -91,57 +91,57 @@
 	<db-entity name="TO_ONEFK2">
 		<db-attribute name="TO_ONEFK2_PK" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
 	</db-entity>
-	<obj-entity name="ClobDetail" className="org.objectstyle.cayenne.testdo.relationship.ClobDetail" dbEntityName="CLOB_DETAIL">
+	<obj-entity name="ClobDetail" className="org.apache.cayenne.testdo.relationship.ClobDetail" dbEntityName="CLOB_DETAIL">
 		<obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/>
 	</obj-entity>
-	<obj-entity name="ClobMaster" className="org.objectstyle.cayenne.testdo.relationship.ClobMaster" dbEntityName="CLOB_MASTER">
+	<obj-entity name="ClobMaster" className="org.apache.cayenne.testdo.relationship.ClobMaster" dbEntityName="CLOB_MASTER">
 		<obj-attribute name="clobColumn" type="java.lang.String" db-attribute-path="CLOB_COLUMN"/>
 		<obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/>
 	</obj-entity>
-	<obj-entity name="DeleteRuleFlatA" className="org.objectstyle.cayenne.testdo.relationship.DeleteRuleFlatA" dbEntityName="DELETE_RULE_FLATA">
+	<obj-entity name="DeleteRuleFlatA" className="org.apache.cayenne.testdo.relationship.DeleteRuleFlatA" dbEntityName="DELETE_RULE_FLATA">
 	</obj-entity>
-	<obj-entity name="DeleteRuleFlatB" className="org.objectstyle.cayenne.testdo.relationship.DeleteRuleFlatB" dbEntityName="DELETE_RULE_FLATB">
+	<obj-entity name="DeleteRuleFlatB" className="org.apache.cayenne.testdo.relationship.DeleteRuleFlatB" dbEntityName="DELETE_RULE_FLATB">
 	</obj-entity>
-	<obj-entity name="DeleteRuleTest1" className="org.objectstyle.cayenne.testdo.relationship.DeleteRuleTest1" dbEntityName="DELETE_RULE_TEST1">
+	<obj-entity name="DeleteRuleTest1" className="org.apache.cayenne.testdo.relationship.DeleteRuleTest1" dbEntityName="DELETE_RULE_TEST1">
 	</obj-entity>
-	<obj-entity name="DeleteRuleTest2" className="org.objectstyle.cayenne.testdo.relationship.DeleteRuleTest2" dbEntityName="DELETE_RULE_TEST2">
+	<obj-entity name="DeleteRuleTest2" className="org.apache.cayenne.testdo.relationship.DeleteRuleTest2" dbEntityName="DELETE_RULE_TEST2">
 	</obj-entity>
-	<obj-entity name="DeleteRuleTest3" className="org.objectstyle.cayenne.testdo.relationship.DeleteRuleTest3" dbEntityName="DELETE_RULE_TEST3">
+	<obj-entity name="DeleteRuleTest3" className="org.apache.cayenne.testdo.relationship.DeleteRuleTest3" dbEntityName="DELETE_RULE_TEST3">
 	</obj-entity>
-	<obj-entity name="FkOfDifferentType" className="org.objectstyle.cayenne.testdo.relationship.FkOfDifferentType" dbEntityName="FK_OF_DIFFERENT_TYPE">
+	<obj-entity name="FkOfDifferentType" className="org.apache.cayenne.testdo.relationship.FkOfDifferentType" dbEntityName="FK_OF_DIFFERENT_TYPE">
 	</obj-entity>
-	<obj-entity name="FlattenedTest1" className="org.objectstyle.cayenne.testdo.relationship.FlattenedTest1" dbEntityName="FLATTENED_TEST_1">
+	<obj-entity name="FlattenedTest1" className="org.apache.cayenne.testdo.relationship.FlattenedTest1" dbEntityName="FLATTENED_TEST_1">
 		<obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/>
 	</obj-entity>
-	<obj-entity name="FlattenedTest2" className="org.objectstyle.cayenne.testdo.relationship.FlattenedTest2" dbEntityName="FLATTENED_TEST_2">
+	<obj-entity name="FlattenedTest2" className="org.apache.cayenne.testdo.relationship.FlattenedTest2" dbEntityName="FLATTENED_TEST_2">
 		<obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/>
 	</obj-entity>
-	<obj-entity name="FlattenedTest3" className="org.objectstyle.cayenne.testdo.relationship.FlattenedTest3" dbEntityName="FLATTENED_TEST_3">
+	<obj-entity name="FlattenedTest3" className="org.apache.cayenne.testdo.relationship.FlattenedTest3" dbEntityName="FLATTENED_TEST_3">
 		<obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/>
 	</obj-entity>
-	<obj-entity name="MeaningfulFK" className="org.objectstyle.cayenne.testdo.relationship.MeaningfulFK" dbEntityName="MEANINGFUL_FK">
+	<obj-entity name="MeaningfulFK" className="org.apache.cayenne.testdo.relationship.MeaningfulFK" dbEntityName="MEANINGFUL_FK">
 		<obj-attribute name="relationshipHelperID" type="java.lang.Integer" db-attribute-path="RELATIONSHIP_HELPER_ID"/>
 	</obj-entity>
-	<obj-entity name="ReflexiveAndToOne" className="org.objectstyle.cayenne.testdo.relationship.ReflexiveAndToOne" dbEntityName="REFLEXIVE_AND_TO_ONE">
+	<obj-entity name="ReflexiveAndToOne" className="org.apache.cayenne.testdo.relationship.ReflexiveAndToOne" dbEntityName="REFLEXIVE_AND_TO_ONE">
 		<obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/>
 	</obj-entity>
-	<obj-entity name="RelationshipHelper" className="org.objectstyle.cayenne.testdo.relationship.RelationshipHelper" dbEntityName="RELATIONSHIP_HELPER">
+	<obj-entity name="RelationshipHelper" className="org.apache.cayenne.testdo.relationship.RelationshipHelper" dbEntityName="RELATIONSHIP_HELPER">
 		<obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/>
 	</obj-entity>
-	<obj-entity name="ToManyFkDep" className="org.objectstyle.cayenne.testdo.relationship.ToManyFkDep" dbEntityName="TO_MANY_FKDEP">
+	<obj-entity name="ToManyFkDep" className="org.apache.cayenne.testdo.relationship.ToManyFkDep" dbEntityName="TO_MANY_FKDEP">
 		<obj-attribute name="depId" type="java.lang.Integer" db-attribute-path="DEP_ID"/>
 		<obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/>
 	</obj-entity>
-	<obj-entity name="ToManyFkRoot" className="org.objectstyle.cayenne.testdo.relationship.ToManyFkRoot" dbEntityName="TO_MANY_FKROOT">
+	<obj-entity name="ToManyFkRoot" className="org.apache.cayenne.testdo.relationship.ToManyFkRoot" dbEntityName="TO_MANY_FKROOT">
 		<obj-attribute name="depId" type="java.lang.Integer" db-attribute-path="FK_ID"/>
 		<obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/>
 	</obj-entity>
-	<obj-entity name="ToManyRoot2" className="org.objectstyle.cayenne.testdo.relationship.ToManyRoot2" dbEntityName="TO_MANY_ROOT2">
+	<obj-entity name="ToManyRoot2" className="org.apache.cayenne.testdo.relationship.ToManyRoot2" dbEntityName="TO_MANY_ROOT2">
 		<obj-attribute name="name" type="java.lang.String" db-attribute-path="NAME"/>
 	</obj-entity>
-	<obj-entity name="ToOneFK1" className="org.objectstyle.cayenne.testdo.relationship.ToOneFK1" dbEntityName="TO_ONEFK1">
+	<obj-entity name="ToOneFK1" className="org.apache.cayenne.testdo.relationship.ToOneFK1" dbEntityName="TO_ONEFK1">
 	</obj-entity>
-	<obj-entity name="ToOneFK2" className="org.objectstyle.cayenne.testdo.relationship.ToOneFK2" dbEntityName="TO_ONEFK2">
+	<obj-entity name="ToOneFK2" className="org.apache.cayenne.testdo.relationship.ToOneFK2" dbEntityName="TO_ONEFK2">
 	</obj-entity>
 	<db-relationship name="master" source="CLOB_DETAIL" target="CLOB_MASTER" toMany="false">
 		<db-attribute-pair source="CLOB_MASTER_ID" target="CLOB_MASTER_ID"/>

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/spring-test-resources.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/spring-test-resources.xml?rev=422603&r1=422602&r2=422603&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/spring-test-resources.xml (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/spring-test-resources.xml Sun Jul 16 19:35:13 2006
@@ -5,148 +5,148 @@
 	<!-- ======================================= -->
 	<!-- DbAdapters -->
 	<!-- ======================================= -->
-	<bean id="OracleAdapter" class="org.objectstyle.cayenne.dba.oracle.OracleAdapter"/>
-	<bean id="Oracle8Adapter" class="org.objectstyle.cayenne.dba.oracle.Oracle8Adapter"/>
-	<bean id="SybaseAdapter" class="org.objectstyle.cayenne.dba.sybase.SybaseAdapter"/>
-	<bean id="FirebirdAdapter" class="org.objectstyle.cayenne.dba.firebird.FirebirdAdapter"/>
-	<bean id="MySQLAdapter" class="org.objectstyle.cayenne.dba.mysql.MySQLAdapter"/>
-	<bean id="PostgresAdapter" class="org.objectstyle.cayenne.dba.postgres.PostgresAdapter"/>
-	<bean id="OpenBaseAdapter" class="org.objectstyle.cayenne.dba.openbase.OpenBaseAdapter"/>
-	<bean id="SQLServerAdapter" class="org.objectstyle.cayenne.dba.sqlserver.SQLServerAdapter"/>
-	<bean id="DB2Adapter" class="org.objectstyle.cayenne.dba.db2.DB2Adapter"/>
-	<bean id="HSQLDBAdapter" class="org.objectstyle.cayenne.dba.hsqldb.HSQLDBAdapter"/>
-	<bean id="DerbyAdapter" class="org.objectstyle.cayenne.dba.derby.DerbyAdapter"/>
-	<bean id="FrontBaseAdapter" class="org.objectstyle.cayenne.dba.frontbase.FrontBaseAdapter"/>
-	<bean id="IngresAdapter" class="org.objectstyle.cayenne.dba.ingres.IngresAdapter"/>
+	<bean id="OracleAdapter" class="org.apache.cayenne.dba.oracle.OracleAdapter"/>
+	<bean id="Oracle8Adapter" class="org.apache.cayenne.dba.oracle.Oracle8Adapter"/>
+	<bean id="SybaseAdapter" class="org.apache.cayenne.dba.sybase.SybaseAdapter"/>
+	<bean id="FirebirdAdapter" class="org.apache.cayenne.dba.firebird.FirebirdAdapter"/>
+	<bean id="MySQLAdapter" class="org.apache.cayenne.dba.mysql.MySQLAdapter"/>
+	<bean id="PostgresAdapter" class="org.apache.cayenne.dba.postgres.PostgresAdapter"/>
+	<bean id="OpenBaseAdapter" class="org.apache.cayenne.dba.openbase.OpenBaseAdapter"/>
+	<bean id="SQLServerAdapter" class="org.apache.cayenne.dba.sqlserver.SQLServerAdapter"/>
+	<bean id="DB2Adapter" class="org.apache.cayenne.dba.db2.DB2Adapter"/>
+	<bean id="HSQLDBAdapter" class="org.apache.cayenne.dba.hsqldb.HSQLDBAdapter"/>
+	<bean id="DerbyAdapter" class="org.apache.cayenne.dba.derby.DerbyAdapter"/>
+	<bean id="FrontBaseAdapter" class="org.apache.cayenne.dba.frontbase.FrontBaseAdapter"/>
+	<bean id="IngresAdapter" class="org.apache.cayenne.dba.ingres.IngresAdapter"/>
 
 	<!-- ======================================= -->
 	<!-- Access Stack Adapters -->
 	<!-- ======================================= -->
-	<bean id="OracleStackAdapter" class="org.objectstyle.cayenne.unit.OracleStackAdapter">
+	<bean id="OracleStackAdapter" class="org.apache.cayenne.unit.OracleStackAdapter">
 		<constructor-arg><ref bean="OracleAdapter"/></constructor-arg>
 	</bean>
-	<bean id="Oracle8StackAdapter" class="org.objectstyle.cayenne.unit.OracleStackAdapter">
+	<bean id="Oracle8StackAdapter" class="org.apache.cayenne.unit.OracleStackAdapter">
 		<constructor-arg><ref bean="Oracle8Adapter"/></constructor-arg>
 	</bean>
-	<bean id="SybaseStackAdapter" class="org.objectstyle.cayenne.unit.SybaseStackAdapter">
+	<bean id="SybaseStackAdapter" class="org.apache.cayenne.unit.SybaseStackAdapter">
 		<constructor-arg><ref bean="SybaseAdapter"/></constructor-arg>
 	</bean>
-	<bean id="FirebirdStackAdapter" class="org.objectstyle.cayenne.unit.FirebirdStackAdapter">
+	<bean id="FirebirdStackAdapter" class="org.apache.cayenne.unit.FirebirdStackAdapter">
 		<constructor-arg><ref bean="FirebirdAdapter"/></constructor-arg>
 	</bean>
-	<bean id="MySQLStackAdapter" class="org.objectstyle.cayenne.unit.MySQLStackAdapter">
+	<bean id="MySQLStackAdapter" class="org.apache.cayenne.unit.MySQLStackAdapter">
 		<constructor-arg><ref bean="MySQLAdapter"/></constructor-arg>
 	</bean>
-	<bean id="PostgresStackAdapter" class="org.objectstyle.cayenne.unit.PostgresStackAdapter">
+	<bean id="PostgresStackAdapter" class="org.apache.cayenne.unit.PostgresStackAdapter">
 		<constructor-arg><ref bean="PostgresAdapter"/></constructor-arg>
 	</bean>
-	<bean id="OpenBaseStackAdapter" class="org.objectstyle.cayenne.unit.OpenBaseStackAdapter">
+	<bean id="OpenBaseStackAdapter" class="org.apache.cayenne.unit.OpenBaseStackAdapter">
 		<constructor-arg><ref bean="OpenBaseAdapter"/></constructor-arg>
 	</bean>
-	<bean id="SQLServerStackAdapter" class="org.objectstyle.cayenne.unit.SQLServerStackAdapter">
+	<bean id="SQLServerStackAdapter" class="org.apache.cayenne.unit.SQLServerStackAdapter">
 		<constructor-arg><ref bean="SQLServerAdapter"/></constructor-arg>
 	</bean>
-	<bean id="DB2StackAdapter" class="org.objectstyle.cayenne.unit.DB2StackAdapter">
+	<bean id="DB2StackAdapter" class="org.apache.cayenne.unit.DB2StackAdapter">
 		<constructor-arg><ref bean="DB2Adapter"/></constructor-arg>
 	</bean>
-	<bean id="HSQLDBStackAdapter" class="org.objectstyle.cayenne.unit.HSQLDBStackAdapter">
+	<bean id="HSQLDBStackAdapter" class="org.apache.cayenne.unit.HSQLDBStackAdapter">
 		<constructor-arg><ref bean="HSQLDBAdapter"/></constructor-arg>
 	</bean>
-	<bean id="DerbyStackAdapter" class="org.objectstyle.cayenne.unit.DerbyStackAdapter">
+	<bean id="DerbyStackAdapter" class="org.apache.cayenne.unit.DerbyStackAdapter">
 		<constructor-arg><ref bean="DerbyAdapter"/></constructor-arg>
 	</bean>
-	<bean id="FrontBaseStackAdapter" class="org.objectstyle.cayenne.unit.FrontBaseStackAdapter">
+	<bean id="FrontBaseStackAdapter" class="org.apache.cayenne.unit.FrontBaseStackAdapter">
 		<constructor-arg><ref bean="FrontBaseAdapter"/></constructor-arg>
 	</bean>
-	<bean id="IngresStackAdapter" class="org.objectstyle.cayenne.unit.IngresStackAdapter">
+	<bean id="IngresStackAdapter" class="org.apache.cayenne.unit.IngresStackAdapter">
 		<constructor-arg><ref bean="IngresAdapter"/></constructor-arg>
 	</bean>
 	
 	<!-- ======================================= -->
 	<!-- DataMaps -->
 	<!-- ======================================= -->
-	<bean id="TestMap" class="org.objectstyle.cayenne.unit.DataMapFactory">
+	<bean id="TestMap" class="org.apache.cayenne.unit.DataMapFactory">
 		<constructor-arg><value>testmap.map.xml</value></constructor-arg>
 	</bean>
-	<bean id="PeopleMap" class="org.objectstyle.cayenne.unit.DataMapFactory">
+	<bean id="PeopleMap" class="org.apache.cayenne.unit.DataMapFactory">
 		<constructor-arg><value>people.map.xml</value></constructor-arg>
 	</bean>
-	<bean id="LockingMap" class="org.objectstyle.cayenne.unit.DataMapFactory">
+	<bean id="LockingMap" class="org.apache.cayenne.unit.DataMapFactory">
 		<constructor-arg><value>locking.map.xml</value></constructor-arg>
 	</bean>
-	<bean id="RelationshipMap" class="org.objectstyle.cayenne.unit.DataMapFactory">
+	<bean id="RelationshipMap" class="org.apache.cayenne.unit.DataMapFactory">
 		<constructor-arg><value>relationships.map.xml</value></constructor-arg>
 	</bean>
-	<bean id="OneWayMap" class="org.objectstyle.cayenne.unit.DataMapFactory">
+	<bean id="OneWayMap" class="org.apache.cayenne.unit.DataMapFactory">
 		<constructor-arg><value>one-way-map.map.xml</value></constructor-arg>
 	</bean>
-	<bean id="DB1Map" class="org.objectstyle.cayenne.unit.DataMapFactory">
+	<bean id="DB1Map" class="org.apache.cayenne.unit.DataMapFactory">
 		<constructor-arg><value>map-db1.map.xml</value></constructor-arg>
 	</bean>
-	<bean id="DB2Map" class="org.objectstyle.cayenne.unit.DataMapFactory">
+	<bean id="DB2Map" class="org.apache.cayenne.unit.DataMapFactory">
 		<constructor-arg><value>map-db2.map.xml</value></constructor-arg>
 	</bean>
-	<bean id="MultiTierMap" class="org.objectstyle.cayenne.unit.DataMapFactory">
+	<bean id="MultiTierMap" class="org.apache.cayenne.unit.DataMapFactory">
 		<constructor-arg><value>multi-tier.map.xml</value></constructor-arg>
 	</bean>
-	<bean id="GenericMap" class="org.objectstyle.cayenne.unit.DataMapFactory">
+	<bean id="GenericMap" class="org.apache.cayenne.unit.DataMapFactory">
 		<constructor-arg><value>generic.map.xml</value></constructor-arg>
 	</bean>
 	
 	<!-- ======================================= -->
 	<!-- DataSetFactory -->
 	<!-- ======================================= -->
-	<bean id="DataSetFactory" class="org.objectstyle.cayenne.unit.XMLDataSetFactory">
+	<bean id="DataSetFactory" class="org.apache.cayenne.unit.XMLDataSetFactory">
 		<property name="location"><value>dml</value></property>
 	</bean>
 	
 	<!-- ======================================= -->
 	<!-- Access Stacks -->
 	<!-- ======================================= -->
-	<bean id="TestStack" class="org.objectstyle.cayenne.unit.SimpleAccessStack">
+	<bean id="TestStack" class="org.apache.cayenne.unit.SimpleAccessStack">
 		<constructor-arg><ref bean="TestResources"/></constructor-arg>
 		<constructor-arg><ref bean="DataSetFactory"/></constructor-arg>
 		<constructor-arg><list><ref bean="TestMap"/></list></constructor-arg>
 	</bean>
-	<bean id="PeopleStack" class="org.objectstyle.cayenne.unit.SimpleAccessStack">
+	<bean id="PeopleStack" class="org.apache.cayenne.unit.SimpleAccessStack">
 		<constructor-arg><ref bean="TestResources"/></constructor-arg>
 		<constructor-arg><ref bean="DataSetFactory"/></constructor-arg>
 		<constructor-arg><list><ref bean="PeopleMap"/></list></constructor-arg>
 	</bean>
-	<bean id="LockingStack" class="org.objectstyle.cayenne.unit.SimpleAccessStack">
+	<bean id="LockingStack" class="org.apache.cayenne.unit.SimpleAccessStack">
 		<constructor-arg><ref bean="TestResources"/></constructor-arg>
 		<constructor-arg><ref bean="DataSetFactory"/></constructor-arg>
 		<constructor-arg><list><ref bean="LockingMap"/></list></constructor-arg>
 	</bean>
-	<bean id="RelationshipStack" class="org.objectstyle.cayenne.unit.SimpleAccessStack">
+	<bean id="RelationshipStack" class="org.apache.cayenne.unit.SimpleAccessStack">
 		<constructor-arg><ref bean="TestResources"/></constructor-arg>
 		<constructor-arg><ref bean="DataSetFactory"/></constructor-arg>
 		<constructor-arg><list><ref bean="RelationshipMap"/></list></constructor-arg>
 	</bean>
-	<bean id="OneWayStack" class="org.objectstyle.cayenne.unit.SimpleAccessStack">
+	<bean id="OneWayStack" class="org.apache.cayenne.unit.SimpleAccessStack">
 		<constructor-arg><ref bean="TestResources"/></constructor-arg>
 		<constructor-arg><ref bean="DataSetFactory"/></constructor-arg>
 		<constructor-arg><list><ref bean="OneWayMap"/></list></constructor-arg>
 	</bean>
-	<bean id="MultiNodeStack" class="org.objectstyle.cayenne.unit.SimpleAccessStack">
+	<bean id="MultiNodeStack" class="org.apache.cayenne.unit.SimpleAccessStack">
 		<constructor-arg><ref bean="TestResources"/></constructor-arg>
 		<constructor-arg><ref bean="DataSetFactory"/></constructor-arg>
 		<constructor-arg>
 			<list><ref bean="DB1Map"/><ref bean="DB2Map"/></list>
 		</constructor-arg>
 	</bean>
-	<bean id="MultiTierStack" class="org.objectstyle.cayenne.unit.SimpleAccessStack">
+	<bean id="MultiTierStack" class="org.apache.cayenne.unit.SimpleAccessStack">
 		<constructor-arg><ref bean="TestResources"/></constructor-arg>
 		<constructor-arg><ref bean="DataSetFactory"/></constructor-arg>
 		<constructor-arg><list><ref bean="MultiTierMap"/></list></constructor-arg>
 	</bean>
-	<bean id="GenericStack" class="org.objectstyle.cayenne.unit.SimpleAccessStack">
+	<bean id="GenericStack" class="org.apache.cayenne.unit.SimpleAccessStack">
 		<constructor-arg><ref bean="TestResources"/></constructor-arg>
 		<constructor-arg><ref bean="DataSetFactory"/></constructor-arg>
 		<constructor-arg><list><ref bean="GenericMap"/></list></constructor-arg>
 	</bean>
 	<!-- Used to create DB schema to avoid conflicts when schema for individual stacks is generated. -->
-	<bean id="SchemaSetupStack" class="org.objectstyle.cayenne.unit.SimpleAccessStack">
+	<bean id="SchemaSetupStack" class="org.apache.cayenne.unit.SimpleAccessStack">
 		<constructor-arg><ref bean="TestResources"/></constructor-arg>
 		<constructor-arg><ref bean="DataSetFactory"/></constructor-arg>
 		<constructor-arg>
@@ -167,22 +167,22 @@
 	<!-- ======================================= -->
 	<!-- Test Resources Container -->
 	<!-- ======================================= -->
-	<bean id="TestResources" class="org.objectstyle.cayenne.unit.CayenneTestResources">
+	<bean id="TestResources" class="org.apache.cayenne.unit.CayenneTestResources">
 		<constructor-arg>
 			<map>
-				<entry key="org.objectstyle.cayenne.dba.oracle.OracleAdapter"><ref bean="OracleStackAdapter"/></entry>
-				<entry key="org.objectstyle.cayenne.dba.oracle.Oracle8Adapter"><ref bean="Oracle8StackAdapter"/></entry>
-				<entry key="org.objectstyle.cayenne.dba.sybase.SybaseAdapter"><ref bean="SybaseStackAdapter"/></entry>
-				<entry key="org.objectstyle.cayenne.dba.firebird.FirebirdAdapter"><ref bean="FirebirdStackAdapter"/></entry>
-				<entry key="org.objectstyle.cayenne.dba.mysql.MySQLAdapter"><ref bean="MySQLStackAdapter"/></entry>
-				<entry key="org.objectstyle.cayenne.dba.postgres.PostgresAdapter"><ref bean="PostgresStackAdapter"/></entry>
-				<entry key="org.objectstyle.cayenne.dba.openbase.OpenBaseAdapter"><ref bean="OpenBaseStackAdapter"/></entry>
-				<entry key="org.objectstyle.cayenne.dba.sqlserver.SQLServerAdapter"><ref bean="SQLServerStackAdapter"/></entry>
-				<entry key="org.objectstyle.cayenne.dba.db2.DB2Adapter"><ref bean="DB2StackAdapter"/></entry>
-				<entry key="org.objectstyle.cayenne.dba.hsqldb.HSQLDBAdapter"><ref bean="HSQLDBStackAdapter"/></entry>
-				<entry key="org.objectstyle.cayenne.dba.derby.DerbyAdapter"><ref bean="DerbyStackAdapter"/></entry>
-				<entry key="org.objectstyle.cayenne.dba.frontbase.FrontBaseAdapter"><ref bean="FrontBaseStackAdapter"/></entry>
-				<entry key="org.objectstyle.cayenne.dba.ingres.IngresAdapter"><ref bean="IngresStackAdapter"/></entry>
+				<entry key="org.apache.cayenne.dba.oracle.OracleAdapter"><ref bean="OracleStackAdapter"/></entry>
+				<entry key="org.apache.cayenne.dba.oracle.Oracle8Adapter"><ref bean="Oracle8StackAdapter"/></entry>
+				<entry key="org.apache.cayenne.dba.sybase.SybaseAdapter"><ref bean="SybaseStackAdapter"/></entry>
+				<entry key="org.apache.cayenne.dba.firebird.FirebirdAdapter"><ref bean="FirebirdStackAdapter"/></entry>
+				<entry key="org.apache.cayenne.dba.mysql.MySQLAdapter"><ref bean="MySQLStackAdapter"/></entry>
+				<entry key="org.apache.cayenne.dba.postgres.PostgresAdapter"><ref bean="PostgresStackAdapter"/></entry>
+				<entry key="org.apache.cayenne.dba.openbase.OpenBaseAdapter"><ref bean="OpenBaseStackAdapter"/></entry>
+				<entry key="org.apache.cayenne.dba.sqlserver.SQLServerAdapter"><ref bean="SQLServerStackAdapter"/></entry>
+				<entry key="org.apache.cayenne.dba.db2.DB2Adapter"><ref bean="DB2StackAdapter"/></entry>
+				<entry key="org.apache.cayenne.dba.hsqldb.HSQLDBAdapter"><ref bean="HSQLDBStackAdapter"/></entry>
+				<entry key="org.apache.cayenne.dba.derby.DerbyAdapter"><ref bean="DerbyStackAdapter"/></entry>
+				<entry key="org.apache.cayenne.dba.frontbase.FrontBaseAdapter"><ref bean="FrontBaseStackAdapter"/></entry>
+				<entry key="org.apache.cayenne.dba.ingres.IngresAdapter"><ref bean="IngresStackAdapter"/></entry>
 			</map>
 		</constructor-arg>
 	</bean>
@@ -190,7 +190,7 @@
 	<!-- ======================================= -->
 	<!-- SQLTemplate Customizer (external reference) -->
 	<!-- ======================================= -->
-	<bean id="SQLTemplateCustomizer" class="org.objectstyle.cayenne.unit.SpringResourceFactory">
+	<bean id="SQLTemplateCustomizer" class="org.apache.cayenne.unit.SpringResourceFactory">
 		<constructor-arg><value>dml/unit.util.SQLTemplateCustomizer.xml</value>
 		</constructor-arg>
 	</bean>

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/testmap-dependent.map.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/testmap-dependent.map.xml?rev=422603&r1=422602&r2=422603&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/testmap-dependent.map.xml (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/resources/testmap-dependent.map.xml Sun Jul 16 19:35:13 2006
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <data-map project-version="1.1">
-	<property name="defaultPackage" value="org.objectstyle.art2"/>
+	<property name="defaultPackage" value="org.apache.art2"/>
 	<db-entity name="MYARTGROUP">
 		<db-attribute name="MY_GROUP_ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
 		<db-attribute name="CUSTOM" type="VARCHAR" isMandatory="true" length="100"/>
 		<db-attribute name="MY_PARENT_GROUP_ID" type="INTEGER"/>
 	</db-entity>
-	<obj-entity name="MyArtGroup" className="org.objectstyle.art2.MyArtGroup" dbEntityName="MYARTGROUP">
+	<obj-entity name="MyArtGroup" className="org.apache.art2.MyArtGroup" dbEntityName="MYARTGROUP">
 		<obj-attribute name="custom" type="java.lang.String" db-attribute-path="CUSTOM"/>
 	</obj-entity>
 	<db-relationship name="toParentArtGroup" source="MYARTGROUP" target="ARTGROUP" toMany="false">



Mime
View raw message