You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2013/07/23 21:13:28 UTC
svn commit: r1506221 [1/2] - in
/cayenne/main/trunk/framework/cayenne-project/src:
main/java/org/apache/cayenne/project/
main/java/org/apache/cayenne/project/upgrade/
main/java/org/apache/cayenne/project/upgrade/v6/
main/java/org/apache/cayenne/project...
Author: aadamchik
Date: Tue Jul 23 19:13:27 2013
New Revision: 1506221
URL: http://svn.apache.org/r1506221
Log:
CAY-1843 Stop saving listeners in DataMap, add upgrade handler
project_2.patch by Miłosz Pigłas
Added:
cayenne/main/trunk/framework/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/v7/
cayenne/main/trunk/framework/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/v7/ProjectUpgrader_V7.java
cayenne/main/trunk/framework/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/v7/UpgradeHandler_V7.java
cayenne/main/trunk/framework/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/v6/ProjectUpgrader_V6Test.java.rej
cayenne/main/trunk/framework/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/v6/XMLDataChannelDescriptorLoader_V3_0_0_1Test.java.rej
cayenne/main/trunk/framework/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/v7/
cayenne/main/trunk/framework/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/v7/ProjectUpgrader_V7Test.java
- copied, changed from r1506197, cayenne/main/trunk/framework/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/v6/ProjectUpgrader_V6Test.java
cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/2_0a/cayenne.xml.rej
cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/2_0a/d1Map.map.xml.rej
cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/2_0a/d1Node.driver.xml.rej
cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/3_0_0_1a/cayenne.xml.rej
cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/3_0_0_1a/d1Map1.map.xml.rej
cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/3_0_0_1a/d1Map2.map.xml.rej
cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/3_0_0_1a/d1NodeDriver.driver.xml.rej
cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/6a/cayenne-PROJECT1.xml.rej
cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/6a/testProjectMap1_1.map.xml.rej
cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/6a/testProjectMap1_2.map.xml.rej
cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v7/
cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v7/2_0a/
cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v7/2_0a/cayenne.xml
- copied, changed from r1506197, cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/2_0a/cayenne.xml
cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v7/2_0a/d1Map.map.xml
- copied, changed from r1506197, cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/2_0a/d1Map.map.xml
cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v7/2_0a/d1Node.driver.xml
- copied, changed from r1506197, cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/2_0a/d1Node.driver.xml
cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v7/3_0_0_1a/
cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v7/3_0_0_1a/cayenne.xml
- copied, changed from r1506197, cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/3_0_0_1a/cayenne.xml
cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v7/3_0_0_1a/d1Map1.map.xml
- copied, changed from r1506197, cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/3_0_0_1a/d1Map1.map.xml
cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v7/3_0_0_1a/d1Map2.map.xml
- copied, changed from r1506197, cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/3_0_0_1a/d1Map2.map.xml
cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v7/3_0_0_1a/d1NodeDriver.driver.xml
- copied, changed from r1506197, cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/3_0_0_1a/d1NodeDriver.driver.xml
cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v7/6a/
cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v7/6a/cayenne-PROJECT1.xml
- copied, changed from r1506197, cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/6a/cayenne-PROJECT1.xml
cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v7/6a/testProjectMap1_1.map.xml
cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v7/6a/testProjectMap1_2.map.xml
- copied, changed from r1506197, cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/6a/testProjectMap1_2.map.xml
cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v7/7a/
cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v7/7a/cayenne-PROJECT1.xml
- copied, changed from r1506197, cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/6a/cayenne-PROJECT1.xml
cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v7/7a/testProjectMap1_1.map.xml
cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v7/7a/testProjectMap1_2.map.xml
- copied, changed from r1506197, cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/6a/testProjectMap1_2.map.xml
Modified:
cayenne/main/trunk/framework/cayenne-project/src/main/java/org/apache/cayenne/project/CayenneProjectModule.java
cayenne/main/trunk/framework/cayenne-project/src/main/java/org/apache/cayenne/project/FileProjectSaver.java
cayenne/main/trunk/framework/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/BaseUpgradeHandler.java
cayenne/main/trunk/framework/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/v6/UpgradeHandler_V6.java
cayenne/main/trunk/framework/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/v6/ProjectUpgrader_V6Test.java
cayenne/main/trunk/framework/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/v6/XMLDataChannelDescriptorLoader_V3_0_0_1Test.java
cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/2_0a/cayenne.xml
cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/2_0a/d1Map.map.xml
cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/2_0a/d1Node.driver.xml
cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/3_0_0_1a/cayenne.xml
cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/3_0_0_1a/d1Map1.map.xml
cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/3_0_0_1a/d1Map2.map.xml
cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/3_0_0_1a/d1NodeDriver.driver.xml
cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/6a/cayenne-PROJECT1.xml
cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/6a/testProjectMap1_1.map.xml
cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/6a/testProjectMap1_2.map.xml
Modified: cayenne/main/trunk/framework/cayenne-project/src/main/java/org/apache/cayenne/project/CayenneProjectModule.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-project/src/main/java/org/apache/cayenne/project/CayenneProjectModule.java?rev=1506221&r1=1506220&r2=1506221&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-project/src/main/java/org/apache/cayenne/project/CayenneProjectModule.java (original)
+++ cayenne/main/trunk/framework/cayenne-project/src/main/java/org/apache/cayenne/project/CayenneProjectModule.java Tue Jul 23 19:13:27 2013
@@ -21,7 +21,7 @@ package org.apache.cayenne.project;
import org.apache.cayenne.di.Binder;
import org.apache.cayenne.di.Module;
import org.apache.cayenne.project.upgrade.ProjectUpgrader;
-import org.apache.cayenne.project.upgrade.v6.ProjectUpgrader_V6;
+import org.apache.cayenne.project.upgrade.v7.ProjectUpgrader_V7;
import org.apache.cayenne.project.validation.DefaultProjectValidator;
import org.apache.cayenne.project.validation.ProjectValidator;
@@ -36,7 +36,7 @@ public class CayenneProjectModule implem
public void configure(Binder binder) {
binder.bind(ProjectLoader.class).to(DataChannelProjectLoader.class);
binder.bind(ProjectSaver.class).to(FileProjectSaver.class);
- binder.bind(ProjectUpgrader.class).to(ProjectUpgrader_V6.class);
+ binder.bind(ProjectUpgrader.class).to(ProjectUpgrader_V7.class);
binder.bind(ProjectValidator.class).to(DefaultProjectValidator.class);
binder.bind(ConfigurationNodeParentGetter.class).to(
DefaultConfigurationNodeParentGetter.class);
Modified: cayenne/main/trunk/framework/cayenne-project/src/main/java/org/apache/cayenne/project/FileProjectSaver.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-project/src/main/java/org/apache/cayenne/project/FileProjectSaver.java?rev=1506221&r1=1506220&r2=1506221&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-project/src/main/java/org/apache/cayenne/project/FileProjectSaver.java (original)
+++ cayenne/main/trunk/framework/cayenne-project/src/main/java/org/apache/cayenne/project/FileProjectSaver.java Tue Jul 23 19:13:27 2013
@@ -62,7 +62,7 @@ public class FileProjectSaver implements
}
public String getSupportedVersion() {
- return "6";
+ return "7";
}
public void save(Project project) {
Modified: cayenne/main/trunk/framework/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/BaseUpgradeHandler.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/BaseUpgradeHandler.java?rev=1506221&r1=1506220&r2=1506221&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/BaseUpgradeHandler.java (original)
+++ cayenne/main/trunk/framework/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/BaseUpgradeHandler.java Tue Jul 23 19:13:27 2013
@@ -76,7 +76,7 @@ public abstract class BaseUpgradeHandler
throw new ConfigurationException(
"Upgrade can not be performed - intermediate version upgrade needed");
case UPGRADE_NEEDED:
- return doPerformUpgrade();
+ return doPerformUpgrade(metaData);
default:
return getProjectSource();
}
@@ -85,8 +85,9 @@ public abstract class BaseUpgradeHandler
/**
* Does the actual project upgrade, assuming the caller already verified that the
* upgrade is possible.
+ * @param metaData object describing the type of upgrade
*/
- protected abstract Resource doPerformUpgrade() throws ConfigurationException;
+ protected abstract Resource doPerformUpgrade(UpgradeMetaData metaData) throws ConfigurationException;
/**
* Creates a metadata object describing the type of upgrade needed.
Modified: cayenne/main/trunk/framework/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/v6/UpgradeHandler_V6.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/v6/UpgradeHandler_V6.java?rev=1506221&r1=1506220&r2=1506221&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/v6/UpgradeHandler_V6.java (original)
+++ cayenne/main/trunk/framework/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/v6/UpgradeHandler_V6.java Tue Jul 23 19:13:27 2013
@@ -94,7 +94,7 @@ class UpgradeHandler_V6 extends BaseUpgr
}
@Override
- protected Resource doPerformUpgrade() throws ConfigurationException {
+ protected Resource doPerformUpgrade(UpgradeMetaData metaData) throws ConfigurationException {
List<DataChannelDescriptor> domains = projectLoader.load(projectSource);
if (domains.isEmpty()) {
Added: cayenne/main/trunk/framework/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/v7/ProjectUpgrader_V7.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/v7/ProjectUpgrader_V7.java?rev=1506221&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/v7/ProjectUpgrader_V7.java (added)
+++ cayenne/main/trunk/framework/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/v7/ProjectUpgrader_V7.java Tue Jul 23 19:13:27 2013
@@ -0,0 +1,25 @@
+package org.apache.cayenne.project.upgrade.v7;
+
+import org.apache.cayenne.di.Inject;
+import org.apache.cayenne.di.Injector;
+import org.apache.cayenne.project.upgrade.ProjectUpgrader;
+import org.apache.cayenne.project.upgrade.UpgradeHandler;
+import org.apache.cayenne.resource.Resource;
+
+/**
+ * A ProjectUpgrader that handles project upgrades from version 3.0.0.1 and 6
+ * to version 7
+ */
+public class ProjectUpgrader_V7 implements ProjectUpgrader {
+
+ @Inject
+ protected Injector injector;
+
+ public UpgradeHandler getUpgradeHandler(Resource projectSource) {
+ UpgradeHandler_V7 handler = new UpgradeHandler_V7(projectSource);
+ System.out.println("PH OK");
+ injector.injectMembers(handler);
+ return handler;
+ }
+
+}
Added: cayenne/main/trunk/framework/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/v7/UpgradeHandler_V7.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/v7/UpgradeHandler_V7.java?rev=1506221&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/v7/UpgradeHandler_V7.java (added)
+++ cayenne/main/trunk/framework/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/v7/UpgradeHandler_V7.java Tue Jul 23 19:13:27 2013
@@ -0,0 +1,78 @@
+package org.apache.cayenne.project.upgrade.v7;
+
+import org.apache.cayenne.ConfigurationException;
+import org.apache.cayenne.configuration.ConfigurationTree;
+import org.apache.cayenne.configuration.DataChannelDescriptor;
+import org.apache.cayenne.configuration.XMLDataChannelDescriptorLoader;
+import org.apache.cayenne.di.Inject;
+import org.apache.cayenne.di.Injector;
+import org.apache.cayenne.project.Project;
+import org.apache.cayenne.project.ProjectSaver;
+import org.apache.cayenne.project.upgrade.BaseUpgradeHandler;
+import org.apache.cayenne.project.upgrade.UpgradeHandler;
+import org.apache.cayenne.project.upgrade.UpgradeMetaData;
+import org.apache.cayenne.project.upgrade.UpgradeType;
+import org.apache.cayenne.project.upgrade.v6.ProjectUpgrader_V6;
+import org.apache.cayenne.resource.Resource;
+
+class UpgradeHandler_V7 extends BaseUpgradeHandler {
+
+ static final String TO_VERSION = "7";
+ static final String MIN_SUPPORTED_VERSION = "3.0.0.1";
+
+ @Inject
+ protected Injector injector;
+
+ @Inject
+ private ProjectSaver projectSaver;
+
+ public UpgradeHandler_V7(Resource source) {
+ super(source);
+ }
+
+ @Override
+ protected Resource doPerformUpgrade(UpgradeMetaData metaData) throws ConfigurationException {
+ if (compareVersions(metaData.getProjectVersion(), MIN_SUPPORTED_VERSION) == 0) {
+ ProjectUpgrader_V6 upgraderV6 = new ProjectUpgrader_V6();
+ injector.injectMembers(upgraderV6);
+ UpgradeHandler handlerV6 = upgraderV6.getUpgradeHandler(projectSource);
+ projectSource = handlerV6.performUpgrade();
+ }
+ XMLDataChannelDescriptorLoader loader = new XMLDataChannelDescriptorLoader();
+ injector.injectMembers(loader);
+ ConfigurationTree<DataChannelDescriptor> tree = loader.load(projectSource);
+ Project project = new Project(tree);
+ // because listeners are no longer loaded they are not saved in upgraded project
+ projectSaver.save(project);
+ return project.getConfigurationResource();
+ }
+
+ @Override
+ protected UpgradeMetaData loadMetaData() {
+ String version = loadProjectVersion();
+
+ UpgradeMetaData metadata = new UpgradeMetaData();
+ metadata.setSupportedVersion(TO_VERSION);
+ metadata.setProjectVersion(version);
+
+ int c1 = compareVersions(version, MIN_SUPPORTED_VERSION);
+ int c2 = compareVersions(TO_VERSION, version);
+
+ if (c1 < 0) {
+ metadata.setIntermediateUpgradeVersion(MIN_SUPPORTED_VERSION);
+ metadata.setUpgradeType(UpgradeType.INTERMEDIATE_UPGRADE_NEEDED);
+ }
+ else if (c2 < 0) {
+ metadata.setUpgradeType(UpgradeType.DOWNGRADE_NEEDED);
+ }
+ else if (c2 == 0) {
+ metadata.setUpgradeType(UpgradeType.UPGRADE_NOT_NEEDED);
+ }
+ else {
+ metadata.setUpgradeType(UpgradeType.UPGRADE_NEEDED);
+ }
+
+ return metadata;
+ }
+
+}
Modified: cayenne/main/trunk/framework/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/v6/ProjectUpgrader_V6Test.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/v6/ProjectUpgrader_V6Test.java?rev=1506221&r1=1506220&r2=1506221&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/v6/ProjectUpgrader_V6Test.java (original)
+++ cayenne/main/trunk/framework/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/v6/ProjectUpgrader_V6Test.java Tue Jul 23 19:13:27 2013
@@ -1,354 +0,0 @@
-/*****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- ****************************************************************/
-package org.apache.cayenne.project.upgrade.v6;
-
-import java.io.File;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.xpath.XPath;
-import javax.xml.xpath.XPathConstants;
-import javax.xml.xpath.XPathFactory;
-
-import org.apache.cayenne.configuration.ConfigurationNameMapper;
-import org.apache.cayenne.configuration.DefaultConfigurationNameMapper;
-import org.apache.cayenne.configuration.server.DBCPDataSourceFactory;
-import org.apache.cayenne.configuration.server.JNDIDataSourceFactory;
-import org.apache.cayenne.configuration.server.XMLPoolingDataSourceFactory;
-import org.apache.cayenne.di.Binder;
-import org.apache.cayenne.di.DIBootstrap;
-import org.apache.cayenne.di.Injector;
-import org.apache.cayenne.di.Module;
-import org.apache.cayenne.project.FileProjectSaver;
-import org.apache.cayenne.project.ProjectSaver;
-import org.apache.cayenne.project.unit.Project2Case;
-import org.apache.cayenne.project.upgrade.UpgradeHandler;
-import org.apache.cayenne.project.upgrade.UpgradeMetaData;
-import org.apache.cayenne.project.upgrade.UpgradeType;
-import org.apache.cayenne.project.upgrade.v6.ProjectUpgrader_V6;
-import org.apache.cayenne.resource.Resource;
-import org.apache.cayenne.resource.URLResource;
-import org.apache.cayenne.test.resource.ResourceUtil;
-import org.apache.cayenne.util.Util;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public class ProjectUpgrader_V6Test extends Project2Case {
-
- public void testMetadata_3_0_0_1() {
-
- String baseUrl = getClass().getPackage().getName().replace('.', '/');
- URL url = getClass().getClassLoader().getResource(
- baseUrl + "/3_0_0_1a/cayenne.xml");
- assertNotNull(url);
-
- Module testModule = new Module() {
-
- public void configure(Binder binder) {
- binder.bind(ProjectSaver.class).to(FileProjectSaver.class);
- binder.bind(ConfigurationNameMapper.class).to(
- DefaultConfigurationNameMapper.class);
- }
- };
-
- ProjectUpgrader_V6 upgrader = new ProjectUpgrader_V6();
- Injector injector = DIBootstrap.createInjector(testModule);
- injector.injectMembers(upgrader);
-
- Resource source = new URLResource(url);
- UpgradeHandler handler = upgrader.getUpgradeHandler(source);
-
- assertNotNull(handler);
- assertSame(source, handler.getProjectSource());
-
- UpgradeMetaData md = handler.getUpgradeMetaData();
- assertNotNull(md);
-
- assertSame(UpgradeType.UPGRADE_NEEDED, md.getUpgradeType());
- assertNull(md.getIntermediateUpgradeVersion());
- assertEquals("3.0.0.1", md.getProjectVersion());
- assertEquals("6", md.getSupportedVersion());
- }
-
- public void testMetadata_Type2_0() {
- String baseUrl = getClass().getPackage().getName().replace('.', '/');
- URL url = getClass().getClassLoader().getResource(baseUrl + "/2_0a/cayenne.xml");
- assertNotNull(url);
-
- Module testModule = new Module() {
-
- public void configure(Binder binder) {
- binder.bind(ProjectSaver.class).to(FileProjectSaver.class);
- binder.bind(ConfigurationNameMapper.class).to(
- DefaultConfigurationNameMapper.class);
- }
- };
-
- ProjectUpgrader_V6 upgrader = new ProjectUpgrader_V6();
- Injector injector = DIBootstrap.createInjector(testModule);
- injector.injectMembers(upgrader);
-
- Resource source = new URLResource(url);
- UpgradeHandler handler = upgrader.getUpgradeHandler(source);
-
- assertNotNull(handler);
- assertSame(source, handler.getProjectSource());
-
- UpgradeMetaData md = handler.getUpgradeMetaData();
- assertNotNull(md);
- assertSame(UpgradeType.INTERMEDIATE_UPGRADE_NEEDED, md.getUpgradeType());
- assertEquals("3.0.0.1", md.getIntermediateUpgradeVersion());
- assertEquals("2.0", md.getProjectVersion());
- assertEquals("6", md.getSupportedVersion());
- }
-
- public void testMetadata_Type6() {
- String baseUrl = getClass().getPackage().getName().replace('.', '/');
- URL url = getClass().getClassLoader().getResource(
- baseUrl + "/6a/cayenne-PROJECT1.xml");
- assertNotNull(url);
-
- Module testModule = new Module() {
-
- public void configure(Binder binder) {
- binder.bind(ProjectSaver.class).to(FileProjectSaver.class);
- binder.bind(ConfigurationNameMapper.class).to(
- DefaultConfigurationNameMapper.class);
- }
- };
-
- ProjectUpgrader_V6 upgrader = new ProjectUpgrader_V6();
- Injector injector = DIBootstrap.createInjector(testModule);
- injector.injectMembers(upgrader);
-
- Resource source = new URLResource(url);
- UpgradeHandler handler = upgrader.getUpgradeHandler(source);
-
- assertNotNull(handler);
- assertSame(source, handler.getProjectSource());
-
- UpgradeMetaData md = handler.getUpgradeMetaData();
- assertNotNull(md);
- assertSame(UpgradeType.UPGRADE_NOT_NEEDED, md.getUpgradeType());
- assertNull(md.getIntermediateUpgradeVersion());
- assertEquals("6", md.getProjectVersion());
- assertEquals("6", md.getSupportedVersion());
- }
-
- public void testPerformUpgrade_3_0_0_1() throws Exception {
-
- File testFolder = setupTestDirectory("testPerformUpgrade_3_0_0_1");
- String sourceUrl = getClass().getPackage().getName().replace('.', '/')
- + "/3_0_0_1a/";
-
- List<String> sources = new ArrayList<String>();
-
- sources.add("cayenne.xml");
- sources.add("d1Map1.map.xml");
- sources.add("d1Map2.map.xml");
- sources.add("d1NodeDriver.driver.xml");
-
- // upgrades are done in-place, so copy it first
- List<File> targetsBefore = new ArrayList<File>();
- for (String source : sources) {
-
- URL url = getClass().getClassLoader().getResource(sourceUrl + source);
- File target = new File(testFolder, source);
- assertNotNull(source);
- ResourceUtil.copyResourceToFile(url, target);
- targetsBefore.add(target);
- }
-
- Module testModule = new Module() {
-
- public void configure(Binder binder) {
- binder.bind(ProjectSaver.class).to(FileProjectSaver.class);
- binder.bind(ConfigurationNameMapper.class).to(
- DefaultConfigurationNameMapper.class);
- }
- };
-
- ProjectUpgrader_V6 upgrader = new ProjectUpgrader_V6();
- Injector injector = DIBootstrap.createInjector(testModule);
- injector.injectMembers(upgrader);
-
- Resource source = new URLResource(targetsBefore.get(0).toURL());
- UpgradeHandler handler = upgrader.getUpgradeHandler(source);
-
- Resource upgraded = handler.performUpgrade();
- assertNotNull(upgraded);
- assertNotSame(source, upgrader);
-
- // check that all the new files are created...
- String[] targetsAfterNames = new String[] {
- "cayenne-d1.xml", "cayenne-d2.xml", "d1Map1.map.xml", "d1Map2.map.xml"
- };
-
- File[] targetsAfter = new File[targetsAfterNames.length];
- for (int i = 0; i < targetsAfter.length; i++) {
- targetsAfter[i] = new File(testFolder, targetsAfterNames[i]);
- assertTrue(
- "File was not created: " + targetsAfter[i].getAbsolutePath(),
- targetsAfter[i].exists());
- }
-
- // DataMap files should remain the same; all others need to be deleted
- for (File file : targetsBefore) {
- if (file.getName().endsWith(".map.xml")) {
- assertTrue("DataMap file disappeared: " + file.getAbsolutePath(), file
- .exists());
- }
- else {
- assertFalse(
- "File expected to be deleted: " + file.getAbsolutePath(),
- file.exists());
- }
- }
-
- // assert XML structure of the generated files
- assertPerformUpgrade_3_0_0_1_cayenne_d1(targetsAfter[0]);
- assertPerformUpgrade_3_0_0_1_cayenne_d2(targetsAfter[1]);
- assertPerformUpgrade_3_0_0_1_d1Map1(targetsAfter[2]);
- assertPerformUpgrade_3_0_0_1_d1Map2(targetsAfter[3]);
- }
-
- private void assertPerformUpgrade_3_0_0_1_cayenne_d1(File file) throws Exception {
- Document document = toDOMTree(file);
-
- XPath xpath = XPathFactory.newInstance().newXPath();
- assertEquals("", xpath.evaluate("/domain/@name", document));
- assertEquals("6", xpath.evaluate("/domain/@project-version", document));
-
- NodeList maps = (NodeList) xpath.evaluate(
- "/domain/map",
- document,
- XPathConstants.NODESET);
- assertNotNull(maps);
- assertEquals(2, maps.getLength());
-
- Node map1 = maps.item(0);
- Node map2 = maps.item(1);
-
- assertEquals("d1Map1", xpath.evaluate("@name", map1));
- assertEquals("d1Map2", xpath.evaluate("@name", map2));
-
- NodeList nodes = (NodeList) xpath.evaluate(
- "/domain/node",
- document,
- XPathConstants.NODESET);
- assertNotNull(nodes);
- assertEquals(1, nodes.getLength());
-
- Node node1 = nodes.item(0);
-
- assertEquals("d1NodeDriver", xpath.evaluate("@name", node1));
- assertEquals(XMLPoolingDataSourceFactory.class.getName(), xpath.evaluate(
- "@factory",
- node1));
-
- NodeList mapRefs = (NodeList) xpath.evaluate(
- "map-ref",
- node1,
- XPathConstants.NODESET);
- assertNotNull(mapRefs);
- assertEquals(2, mapRefs.getLength());
-
- assertEquals("d1Map1", xpath.evaluate("@name", mapRefs.item(0)));
- assertEquals("d1Map2", xpath.evaluate("@name", mapRefs.item(1)));
-
- NodeList dataSources = (NodeList) xpath.evaluate(
- "data-source",
- node1,
- XPathConstants.NODESET);
- assertNotNull(dataSources);
- assertEquals(1, dataSources.getLength());
-
- Node ds = dataSources.item(0);
- assertEquals("org.hsqldb.jdbcDriver", xpath.evaluate("driver/@value", ds));
- assertEquals("jdbc:hsqldb:mem:xdb", xpath.evaluate("url/@value", ds));
- }
-
- private void assertPerformUpgrade_3_0_0_1_cayenne_d2(File file) throws Exception {
- Document document = toDOMTree(file);
-
- XPath xpath = XPathFactory.newInstance().newXPath();
- assertEquals("", xpath.evaluate("/domain/@name", document));
- assertEquals("6", xpath.evaluate("/domain/@project-version", document));
-
- NodeList maps = (NodeList) xpath.evaluate(
- "/domain/map",
- document,
- XPathConstants.NODESET);
- assertNotNull(maps);
- assertEquals(0, maps.getLength());
-
- NodeList nodes = (NodeList) xpath.evaluate(
- "/domain/node",
- document,
- XPathConstants.NODESET);
- assertNotNull(nodes);
- assertEquals(2, nodes.getLength());
-
- Node node1 = nodes.item(0);
- Node node2 = nodes.item(1);
-
- assertEquals("d2NodeDBCP", xpath.evaluate("@name", node1));
- assertEquals("dbcpx", xpath.evaluate("@parameters", node1));
- assertEquals(DBCPDataSourceFactory.class.getName(), xpath.evaluate(
- "@factory",
- node1));
-
- NodeList dataSources1 = (NodeList) xpath.evaluate(
- "data-source",
- node1,
- XPathConstants.NODESET);
- assertNotNull(dataSources1);
- assertEquals(0, dataSources1.getLength());
-
- assertEquals("d2NodeJNDI", xpath.evaluate("@name", node2));
- assertEquals("jndi/x", xpath.evaluate("@parameters", node2));
- assertEquals(JNDIDataSourceFactory.class.getName(), xpath.evaluate(
- "@factory",
- node2));
-
- NodeList dataSources2 = (NodeList) xpath.evaluate(
- "data-source",
- node2,
- XPathConstants.NODESET);
- assertNotNull(dataSources2);
- assertEquals(0, dataSources2.getLength());
- }
-
- private void assertPerformUpgrade_3_0_0_1_d1Map1(File file) throws Exception {
- Document document = toDOMTree(file);
-
- XPath xpath = XPathFactory.newInstance().newXPath();
- assertEquals("6", xpath.evaluate("/data-map/@project-version", document));
- }
-
- private void assertPerformUpgrade_3_0_0_1_d1Map2(File file) throws Exception {
- Document document = toDOMTree(file);
-
- XPath xpath = XPathFactory.newInstance().newXPath();
- assertEquals("6", xpath.evaluate("/data-map/@project-version", document));
- }
-
-}
Added: cayenne/main/trunk/framework/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/v6/ProjectUpgrader_V6Test.java.rej
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/v6/ProjectUpgrader_V6Test.java.rej?rev=1506221&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/v6/ProjectUpgrader_V6Test.java.rej (added)
+++ cayenne/main/trunk/framework/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/v6/ProjectUpgrader_V6Test.java.rej Tue Jul 23 19:13:27 2013
@@ -0,0 +1,357 @@
+***************
+*** 1,354 ****
+- /*****************************************************************
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements. See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership. The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License. You may obtain a copy of the License at
+- *
+- * http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing,
+- * software distributed under the License is distributed on an
+- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+- * KIND, either express or implied. See the License for the
+- * specific language governing permissions and limitations
+- * under the License.
+- ****************************************************************/
+- package org.apache.cayenne.project.upgrade.v6;
+-
+- import java.io.File;
+- import java.net.URL;
+- import java.util.ArrayList;
+- import java.util.List;
+-
+- import javax.xml.xpath.XPath;
+- import javax.xml.xpath.XPathConstants;
+- import javax.xml.xpath.XPathFactory;
+-
+- import org.apache.cayenne.configuration.ConfigurationNameMapper;
+- import org.apache.cayenne.configuration.DefaultConfigurationNameMapper;
+- import org.apache.cayenne.configuration.server.DBCPDataSourceFactory;
+- import org.apache.cayenne.configuration.server.JNDIDataSourceFactory;
+- import org.apache.cayenne.configuration.server.XMLPoolingDataSourceFactory;
+- import org.apache.cayenne.di.Binder;
+- import org.apache.cayenne.di.DIBootstrap;
+- import org.apache.cayenne.di.Injector;
+- import org.apache.cayenne.di.Module;
+- import org.apache.cayenne.project.FileProjectSaver;
+- import org.apache.cayenne.project.ProjectSaver;
+- import org.apache.cayenne.project.unit.Project2Case;
+- import org.apache.cayenne.project.upgrade.UpgradeHandler;
+- import org.apache.cayenne.project.upgrade.UpgradeMetaData;
+- import org.apache.cayenne.project.upgrade.UpgradeType;
+- import org.apache.cayenne.project.upgrade.v6.ProjectUpgrader_V6;
+- import org.apache.cayenne.resource.Resource;
+- import org.apache.cayenne.resource.URLResource;
+- import org.apache.cayenne.test.resource.ResourceUtil;
+- import org.apache.cayenne.util.Util;
+- import org.w3c.dom.Document;
+- import org.w3c.dom.Node;
+- import org.w3c.dom.NodeList;
+-
+- public class ProjectUpgrader_V6Test extends Project2Case {
+-
+- public void testMetadata_3_0_0_1() {
+-
+- String baseUrl = getClass().getPackage().getName().replace('.', '/');
+- URL url = getClass().getClassLoader().getResource(
+- baseUrl + "/3_0_0_1a/cayenne.xml");
+- assertNotNull(url);
+-
+- Module testModule = new Module() {
+-
+- public void configure(Binder binder) {
+- binder.bind(ProjectSaver.class).to(FileProjectSaver.class);
+- binder.bind(ConfigurationNameMapper.class).to(
+- DefaultConfigurationNameMapper.class);
+- }
+- };
+-
+- ProjectUpgrader_V6 upgrader = new ProjectUpgrader_V6();
+- Injector injector = DIBootstrap.createInjector(testModule);
+- injector.injectMembers(upgrader);
+-
+- Resource source = new URLResource(url);
+- UpgradeHandler handler = upgrader.getUpgradeHandler(source);
+-
+- assertNotNull(handler);
+- assertSame(source, handler.getProjectSource());
+-
+- UpgradeMetaData md = handler.getUpgradeMetaData();
+- assertNotNull(md);
+-
+- assertSame(UpgradeType.UPGRADE_NEEDED, md.getUpgradeType());
+- assertNull(md.getIntermediateUpgradeVersion());
+- assertEquals("3.0.0.1", md.getProjectVersion());
+- assertEquals("6", md.getSupportedVersion());
+- }
+-
+- public void testMetadata_Type2_0() {
+- String baseUrl = getClass().getPackage().getName().replace('.', '/');
+- URL url = getClass().getClassLoader().getResource(baseUrl + "/2_0a/cayenne.xml");
+- assertNotNull(url);
+-
+- Module testModule = new Module() {
+-
+- public void configure(Binder binder) {
+- binder.bind(ProjectSaver.class).to(FileProjectSaver.class);
+- binder.bind(ConfigurationNameMapper.class).to(
+- DefaultConfigurationNameMapper.class);
+- }
+- };
+-
+- ProjectUpgrader_V6 upgrader = new ProjectUpgrader_V6();
+- Injector injector = DIBootstrap.createInjector(testModule);
+- injector.injectMembers(upgrader);
+-
+- Resource source = new URLResource(url);
+- UpgradeHandler handler = upgrader.getUpgradeHandler(source);
+-
+- assertNotNull(handler);
+- assertSame(source, handler.getProjectSource());
+-
+- UpgradeMetaData md = handler.getUpgradeMetaData();
+- assertNotNull(md);
+- assertSame(UpgradeType.INTERMEDIATE_UPGRADE_NEEDED, md.getUpgradeType());
+- assertEquals("3.0.0.1", md.getIntermediateUpgradeVersion());
+- assertEquals("2.0", md.getProjectVersion());
+- assertEquals("6", md.getSupportedVersion());
+- }
+-
+- public void testMetadata_Type6() {
+- String baseUrl = getClass().getPackage().getName().replace('.', '/');
+- URL url = getClass().getClassLoader().getResource(
+- baseUrl + "/6a/cayenne-PROJECT1.xml");
+- assertNotNull(url);
+-
+- Module testModule = new Module() {
+-
+- public void configure(Binder binder) {
+- binder.bind(ProjectSaver.class).to(FileProjectSaver.class);
+- binder.bind(ConfigurationNameMapper.class).to(
+- DefaultConfigurationNameMapper.class);
+- }
+- };
+-
+- ProjectUpgrader_V6 upgrader = new ProjectUpgrader_V6();
+- Injector injector = DIBootstrap.createInjector(testModule);
+- injector.injectMembers(upgrader);
+-
+- Resource source = new URLResource(url);
+- UpgradeHandler handler = upgrader.getUpgradeHandler(source);
+-
+- assertNotNull(handler);
+- assertSame(source, handler.getProjectSource());
+-
+- UpgradeMetaData md = handler.getUpgradeMetaData();
+- assertNotNull(md);
+- assertSame(UpgradeType.UPGRADE_NOT_NEEDED, md.getUpgradeType());
+- assertNull(md.getIntermediateUpgradeVersion());
+- assertEquals("6", md.getProjectVersion());
+- assertEquals("6", md.getSupportedVersion());
+- }
+-
+- public void testPerformUpgrade_3_0_0_1() throws Exception {
+-
+- File testFolder = setupTestDirectory("testPerformUpgrade_3_0_0_1");
+- String sourceUrl = getClass().getPackage().getName().replace('.', '/')
+- + "/3_0_0_1a/";
+-
+- List<String> sources = new ArrayList<String>();
+-
+- sources.add("cayenne.xml");
+- sources.add("d1Map1.map.xml");
+- sources.add("d1Map2.map.xml");
+- sources.add("d1NodeDriver.driver.xml");
+-
+- // upgrades are done in-place, so copy it first
+- List<File> targetsBefore = new ArrayList<File>();
+- for (String source : sources) {
+-
+- URL url = getClass().getClassLoader().getResource(sourceUrl + source);
+- File target = new File(testFolder, source);
+- assertNotNull(source);
+- ResourceUtil.copyResourceToFile(url, target);
+- targetsBefore.add(target);
+- }
+-
+- Module testModule = new Module() {
+-
+- public void configure(Binder binder) {
+- binder.bind(ProjectSaver.class).to(FileProjectSaver.class);
+- binder.bind(ConfigurationNameMapper.class).to(
+- DefaultConfigurationNameMapper.class);
+- }
+- };
+-
+- ProjectUpgrader_V6 upgrader = new ProjectUpgrader_V6();
+- Injector injector = DIBootstrap.createInjector(testModule);
+- injector.injectMembers(upgrader);
+-
+- Resource source = new URLResource(targetsBefore.get(0).toURL());
+- UpgradeHandler handler = upgrader.getUpgradeHandler(source);
+-
+- Resource upgraded = handler.performUpgrade();
+- assertNotNull(upgraded);
+- assertNotSame(source, upgrader);
+-
+- // check that all the new files are created...
+- String[] targetsAfterNames = new String[] {
+- "cayenne-d1.xml", "cayenne-d2.xml", "d1Map1.map.xml", "d1Map2.map.xml"
+- };
+-
+- File[] targetsAfter = new File[targetsAfterNames.length];
+- for (int i = 0; i < targetsAfter.length; i++) {
+- targetsAfter[i] = new File(testFolder, targetsAfterNames[i]);
+- assertTrue(
+- "File was not created: " + targetsAfter[i].getAbsolutePath(),
+- targetsAfter[i].exists());
+- }
+-
+- // DataMap files should remain the same; all others need to be deleted
+- for (File file : targetsBefore) {
+- if (file.getName().endsWith(".map.xml")) {
+- assertTrue("DataMap file disappeared: " + file.getAbsolutePath(), file
+- .exists());
+- }
+- else {
+- assertFalse(
+- "File expected to be deleted: " + file.getAbsolutePath(),
+- file.exists());
+- }
+- }
+-
+- // assert XML structure of the generated files
+- assertPerformUpgrade_3_0_0_1_cayenne_d1(targetsAfter[0]);
+- assertPerformUpgrade_3_0_0_1_cayenne_d2(targetsAfter[1]);
+- assertPerformUpgrade_3_0_0_1_d1Map1(targetsAfter[2]);
+- assertPerformUpgrade_3_0_0_1_d1Map2(targetsAfter[3]);
+- }
+-
+- private void assertPerformUpgrade_3_0_0_1_cayenne_d1(File file) throws Exception {
+- Document document = toDOMTree(file);
+-
+- XPath xpath = XPathFactory.newInstance().newXPath();
+- assertEquals("", xpath.evaluate("/domain/@name", document));
+- assertEquals("6", xpath.evaluate("/domain/@project-version", document));
+-
+- NodeList maps = (NodeList) xpath.evaluate(
+- "/domain/map",
+- document,
+- XPathConstants.NODESET);
+- assertNotNull(maps);
+- assertEquals(2, maps.getLength());
+-
+- Node map1 = maps.item(0);
+- Node map2 = maps.item(1);
+-
+- assertEquals("d1Map1", xpath.evaluate("@name", map1));
+- assertEquals("d1Map2", xpath.evaluate("@name", map2));
+-
+- NodeList nodes = (NodeList) xpath.evaluate(
+- "/domain/node",
+- document,
+- XPathConstants.NODESET);
+- assertNotNull(nodes);
+- assertEquals(1, nodes.getLength());
+-
+- Node node1 = nodes.item(0);
+-
+- assertEquals("d1NodeDriver", xpath.evaluate("@name", node1));
+- assertEquals(XMLPoolingDataSourceFactory.class.getName(), xpath.evaluate(
+- "@factory",
+- node1));
+-
+- NodeList mapRefs = (NodeList) xpath.evaluate(
+- "map-ref",
+- node1,
+- XPathConstants.NODESET);
+- assertNotNull(mapRefs);
+- assertEquals(2, mapRefs.getLength());
+-
+- assertEquals("d1Map1", xpath.evaluate("@name", mapRefs.item(0)));
+- assertEquals("d1Map2", xpath.evaluate("@name", mapRefs.item(1)));
+-
+- NodeList dataSources = (NodeList) xpath.evaluate(
+- "data-source",
+- node1,
+- XPathConstants.NODESET);
+- assertNotNull(dataSources);
+- assertEquals(1, dataSources.getLength());
+-
+- Node ds = dataSources.item(0);
+- assertEquals("org.hsqldb.jdbcDriver", xpath.evaluate("driver/@value", ds));
+- assertEquals("jdbc:hsqldb:mem:xdb", xpath.evaluate("url/@value", ds));
+- }
+-
+- private void assertPerformUpgrade_3_0_0_1_cayenne_d2(File file) throws Exception {
+- Document document = toDOMTree(file);
+-
+- XPath xpath = XPathFactory.newInstance().newXPath();
+- assertEquals("", xpath.evaluate("/domain/@name", document));
+- assertEquals("6", xpath.evaluate("/domain/@project-version", document));
+-
+- NodeList maps = (NodeList) xpath.evaluate(
+- "/domain/map",
+- document,
+- XPathConstants.NODESET);
+- assertNotNull(maps);
+- assertEquals(0, maps.getLength());
+-
+- NodeList nodes = (NodeList) xpath.evaluate(
+- "/domain/node",
+- document,
+- XPathConstants.NODESET);
+- assertNotNull(nodes);
+- assertEquals(2, nodes.getLength());
+-
+- Node node1 = nodes.item(0);
+- Node node2 = nodes.item(1);
+-
+- assertEquals("d2NodeDBCP", xpath.evaluate("@name", node1));
+- assertEquals("dbcpx", xpath.evaluate("@parameters", node1));
+- assertEquals(DBCPDataSourceFactory.class.getName(), xpath.evaluate(
+- "@factory",
+- node1));
+-
+- NodeList dataSources1 = (NodeList) xpath.evaluate(
+- "data-source",
+- node1,
+- XPathConstants.NODESET);
+- assertNotNull(dataSources1);
+- assertEquals(0, dataSources1.getLength());
+-
+- assertEquals("d2NodeJNDI", xpath.evaluate("@name", node2));
+- assertEquals("jndi/x", xpath.evaluate("@parameters", node2));
+- assertEquals(JNDIDataSourceFactory.class.getName(), xpath.evaluate(
+- "@factory",
+- node2));
+-
+- NodeList dataSources2 = (NodeList) xpath.evaluate(
+- "data-source",
+- node2,
+- XPathConstants.NODESET);
+- assertNotNull(dataSources2);
+- assertEquals(0, dataSources2.getLength());
+- }
+-
+- private void assertPerformUpgrade_3_0_0_1_d1Map1(File file) throws Exception {
+- Document document = toDOMTree(file);
+-
+- XPath xpath = XPathFactory.newInstance().newXPath();
+- assertEquals("6", xpath.evaluate("/data-map/@project-version", document));
+- }
+-
+- private void assertPerformUpgrade_3_0_0_1_d1Map2(File file) throws Exception {
+- Document document = toDOMTree(file);
+-
+- XPath xpath = XPathFactory.newInstance().newXPath();
+- assertEquals("6", xpath.evaluate("/data-map/@project-version", document));
+- }
+-
+- }
+--- 0 ----
Modified: cayenne/main/trunk/framework/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/v6/XMLDataChannelDescriptorLoader_V3_0_0_1Test.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/v6/XMLDataChannelDescriptorLoader_V3_0_0_1Test.java?rev=1506221&r1=1506220&r2=1506221&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/v6/XMLDataChannelDescriptorLoader_V3_0_0_1Test.java (original)
+++ cayenne/main/trunk/framework/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/v6/XMLDataChannelDescriptorLoader_V3_0_0_1Test.java Tue Jul 23 19:13:27 2013
@@ -1,33 +0,0 @@
-/*****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- ****************************************************************/
-package org.apache.cayenne.project.upgrade.v6;
-
-import org.apache.cayenne.project.upgrade.v6.XMLDataChannelDescriptorLoader_V3_0_0_1;
-
-import junit.framework.TestCase;
-
-public class XMLDataChannelDescriptorLoader_V3_0_0_1Test extends TestCase {
-
- public void testScrubDomainName() {
- XMLDataChannelDescriptorLoader_V3_0_0_1 loader = new XMLDataChannelDescriptorLoader_V3_0_0_1();
-
- assertEquals("abc123_N", loader.scrubDomainName("abc123_N"));
- assertEquals("____$abc123_N", loader.scrubDomainName("1@! $abc123_N"));
- }
-}
Added: cayenne/main/trunk/framework/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/v6/XMLDataChannelDescriptorLoader_V3_0_0_1Test.java.rej
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/v6/XMLDataChannelDescriptorLoader_V3_0_0_1Test.java.rej?rev=1506221&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/v6/XMLDataChannelDescriptorLoader_V3_0_0_1Test.java.rej (added)
+++ cayenne/main/trunk/framework/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/v6/XMLDataChannelDescriptorLoader_V3_0_0_1Test.java.rej Tue Jul 23 19:13:27 2013
@@ -0,0 +1,36 @@
+***************
+*** 1,33 ****
+- /*****************************************************************
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements. See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership. The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License. You may obtain a copy of the License at
+- *
+- * http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing,
+- * software distributed under the License is distributed on an
+- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+- * KIND, either express or implied. See the License for the
+- * specific language governing permissions and limitations
+- * under the License.
+- ****************************************************************/
+- package org.apache.cayenne.project.upgrade.v6;
+-
+- import org.apache.cayenne.project.upgrade.v6.XMLDataChannelDescriptorLoader_V3_0_0_1;
+-
+- import junit.framework.TestCase;
+-
+- public class XMLDataChannelDescriptorLoader_V3_0_0_1Test extends TestCase {
+-
+- public void testScrubDomainName() {
+- XMLDataChannelDescriptorLoader_V3_0_0_1 loader = new XMLDataChannelDescriptorLoader_V3_0_0_1();
+-
+- assertEquals("abc123_N", loader.scrubDomainName("abc123_N"));
+- assertEquals("____$abc123_N", loader.scrubDomainName("1@! $abc123_N"));
+- }
+- }
+--- 0 ----
Copied: cayenne/main/trunk/framework/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/v7/ProjectUpgrader_V7Test.java (from r1506197, cayenne/main/trunk/framework/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/v6/ProjectUpgrader_V6Test.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/v7/ProjectUpgrader_V7Test.java?p2=cayenne/main/trunk/framework/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/v7/ProjectUpgrader_V7Test.java&p1=cayenne/main/trunk/framework/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/v6/ProjectUpgrader_V6Test.java&r1=1506197&r2=1506221&rev=1506221&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/v6/ProjectUpgrader_V6Test.java (original)
+++ cayenne/main/trunk/framework/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/v7/ProjectUpgrader_V7Test.java Tue Jul 23 19:13:27 2013
@@ -1,22 +1,4 @@
-/*****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- ****************************************************************/
-package org.apache.cayenne.project.upgrade.v6;
+package org.apache.cayenne.project.upgrade.v7;
import java.io.File;
import java.net.URL;
@@ -28,7 +10,9 @@ import javax.xml.xpath.XPathConstants;
import javax.xml.xpath.XPathFactory;
import org.apache.cayenne.configuration.ConfigurationNameMapper;
+import org.apache.cayenne.configuration.DataMapLoader;
import org.apache.cayenne.configuration.DefaultConfigurationNameMapper;
+import org.apache.cayenne.configuration.XMLDataMapLoader;
import org.apache.cayenne.configuration.server.DBCPDataSourceFactory;
import org.apache.cayenne.configuration.server.JNDIDataSourceFactory;
import org.apache.cayenne.configuration.server.XMLPoolingDataSourceFactory;
@@ -37,6 +21,7 @@ import org.apache.cayenne.di.DIBootstrap
import org.apache.cayenne.di.Injector;
import org.apache.cayenne.di.Module;
import org.apache.cayenne.project.FileProjectSaver;
+import org.apache.cayenne.project.Project;
import org.apache.cayenne.project.ProjectSaver;
import org.apache.cayenne.project.unit.Project2Case;
import org.apache.cayenne.project.upgrade.UpgradeHandler;
@@ -46,13 +31,12 @@ import org.apache.cayenne.project.upgrad
import org.apache.cayenne.resource.Resource;
import org.apache.cayenne.resource.URLResource;
import org.apache.cayenne.test.resource.ResourceUtil;
-import org.apache.cayenne.util.Util;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-public class ProjectUpgrader_V6Test extends Project2Case {
-
+public class ProjectUpgrader_V7Test extends Project2Case{
+
public void testMetadata_3_0_0_1() {
String baseUrl = getClass().getPackage().getName().replace('.', '/');
@@ -69,7 +53,7 @@ public class ProjectUpgrader_V6Test exte
}
};
- ProjectUpgrader_V6 upgrader = new ProjectUpgrader_V6();
+ ProjectUpgrader_V7 upgrader = new ProjectUpgrader_V7();
Injector injector = DIBootstrap.createInjector(testModule);
injector.injectMembers(upgrader);
@@ -83,9 +67,10 @@ public class ProjectUpgrader_V6Test exte
assertNotNull(md);
assertSame(UpgradeType.UPGRADE_NEEDED, md.getUpgradeType());
+ //assertEquals("6", md.getIntermediateUpgradeVersion());
assertNull(md.getIntermediateUpgradeVersion());
assertEquals("3.0.0.1", md.getProjectVersion());
- assertEquals("6", md.getSupportedVersion());
+ assertEquals("7", md.getSupportedVersion());
}
public void testMetadata_Type2_0() {
@@ -102,7 +87,7 @@ public class ProjectUpgrader_V6Test exte
}
};
- ProjectUpgrader_V6 upgrader = new ProjectUpgrader_V6();
+ ProjectUpgrader_V7 upgrader = new ProjectUpgrader_V7();
Injector injector = DIBootstrap.createInjector(testModule);
injector.injectMembers(upgrader);
@@ -117,7 +102,7 @@ public class ProjectUpgrader_V6Test exte
assertSame(UpgradeType.INTERMEDIATE_UPGRADE_NEEDED, md.getUpgradeType());
assertEquals("3.0.0.1", md.getIntermediateUpgradeVersion());
assertEquals("2.0", md.getProjectVersion());
- assertEquals("6", md.getSupportedVersion());
+ assertEquals("7", md.getSupportedVersion());
}
public void testMetadata_Type6() {
@@ -135,7 +120,7 @@ public class ProjectUpgrader_V6Test exte
}
};
- ProjectUpgrader_V6 upgrader = new ProjectUpgrader_V6();
+ ProjectUpgrader_V7 upgrader = new ProjectUpgrader_V7();
Injector injector = DIBootstrap.createInjector(testModule);
injector.injectMembers(upgrader);
@@ -147,14 +132,48 @@ public class ProjectUpgrader_V6Test exte
UpgradeMetaData md = handler.getUpgradeMetaData();
assertNotNull(md);
- assertSame(UpgradeType.UPGRADE_NOT_NEEDED, md.getUpgradeType());
+ assertSame(UpgradeType.UPGRADE_NEEDED, md.getUpgradeType());
assertNull(md.getIntermediateUpgradeVersion());
assertEquals("6", md.getProjectVersion());
- assertEquals("6", md.getSupportedVersion());
+ assertEquals("7", md.getSupportedVersion());
}
+
+ public void testMetadata_Type7() {
+ String baseUrl = getClass().getPackage().getName().replace('.', '/');
+ URL url = getClass().getClassLoader().getResource(
+ baseUrl + "/7a/cayenne-PROJECT1.xml");
+ assertNotNull(url);
+
+ Module testModule = new Module() {
+
+ public void configure(Binder binder) {
+ binder.bind(ProjectSaver.class).to(FileProjectSaver.class);
+ binder.bind(ConfigurationNameMapper.class).to(
+ DefaultConfigurationNameMapper.class);
+ }
+ };
+
+ ProjectUpgrader_V7 upgrader = new ProjectUpgrader_V7();
+ Injector injector = DIBootstrap.createInjector(testModule);
+ injector.injectMembers(upgrader);
+
+ Resource source = new URLResource(url);
+ UpgradeHandler handler = upgrader.getUpgradeHandler(source);
- public void testPerformUpgrade_3_0_0_1() throws Exception {
+ assertNotNull(handler);
+ assertSame(source, handler.getProjectSource());
+
+ UpgradeMetaData md = handler.getUpgradeMetaData();
+ assertNotNull(md);
+ assertSame(UpgradeType.UPGRADE_NOT_NEEDED, md.getUpgradeType());
+ assertNull(md.getIntermediateUpgradeVersion());
+ assertEquals("7", md.getProjectVersion());
+ assertEquals("7", md.getSupportedVersion());
+ }
+
+ public void testPerformUpgradeFrom3() throws Exception {
+ System.out.println("TEST3");
File testFolder = setupTestDirectory("testPerformUpgrade_3_0_0_1");
String sourceUrl = getClass().getPackage().getName().replace('.', '/')
+ "/3_0_0_1a/";
@@ -183,10 +202,11 @@ public class ProjectUpgrader_V6Test exte
binder.bind(ProjectSaver.class).to(FileProjectSaver.class);
binder.bind(ConfigurationNameMapper.class).to(
DefaultConfigurationNameMapper.class);
+ binder.bind(DataMapLoader.class).to(XMLDataMapLoader.class);
}
};
- ProjectUpgrader_V6 upgrader = new ProjectUpgrader_V6();
+ ProjectUpgrader_V7 upgrader = new ProjectUpgrader_V7();
Injector injector = DIBootstrap.createInjector(testModule);
injector.injectMembers(upgrader);
@@ -229,13 +249,13 @@ public class ProjectUpgrader_V6Test exte
assertPerformUpgrade_3_0_0_1_d1Map1(targetsAfter[2]);
assertPerformUpgrade_3_0_0_1_d1Map2(targetsAfter[3]);
}
-
+
private void assertPerformUpgrade_3_0_0_1_cayenne_d1(File file) throws Exception {
Document document = toDOMTree(file);
XPath xpath = XPathFactory.newInstance().newXPath();
assertEquals("", xpath.evaluate("/domain/@name", document));
- assertEquals("6", xpath.evaluate("/domain/@project-version", document));
+ assertEquals("7", xpath.evaluate("/domain/@project-version", document));
NodeList maps = (NodeList) xpath.evaluate(
"/domain/map",
@@ -291,7 +311,7 @@ public class ProjectUpgrader_V6Test exte
XPath xpath = XPathFactory.newInstance().newXPath();
assertEquals("", xpath.evaluate("/domain/@name", document));
- assertEquals("6", xpath.evaluate("/domain/@project-version", document));
+ assertEquals("7", xpath.evaluate("/domain/@project-version", document));
NodeList maps = (NodeList) xpath.evaluate(
"/domain/map",
@@ -341,14 +361,86 @@ public class ProjectUpgrader_V6Test exte
Document document = toDOMTree(file);
XPath xpath = XPathFactory.newInstance().newXPath();
- assertEquals("6", xpath.evaluate("/data-map/@project-version", document));
+ assertEquals("7", xpath.evaluate("/data-map/@project-version", document));
}
private void assertPerformUpgrade_3_0_0_1_d1Map2(File file) throws Exception {
Document document = toDOMTree(file);
XPath xpath = XPathFactory.newInstance().newXPath();
- assertEquals("6", xpath.evaluate("/data-map/@project-version", document));
+ assertEquals("7", xpath.evaluate("/data-map/@project-version", document));
+ }
+
+ public void testPerformUpgradeFrom6() throws Exception {
+ File testForlder = setupTestDirectory("testUpgrade6a");
+ String sourceUrl = getClass().getPackage().getName().replace('.', '/')
+ + "/6a/";
+ System.out.println(sourceUrl);
+ Module testModule = new Module() {
+
+ public void configure(Binder binder) {
+ binder.bind(ProjectSaver.class).to(FileProjectSaver.class);
+ binder.bind(ConfigurationNameMapper.class).to(
+ DefaultConfigurationNameMapper.class);
+ binder.bind(DataMapLoader.class).to(XMLDataMapLoader.class);
+ }
+ };
+
+ String[] resources = {"cayenne-PROJECT1.xml","testProjectMap1_1.map.xml", "testProjectMap1_2.map.xml"};
+ List<File> files = new ArrayList<File>();
+
+ for (String name : resources) {
+ URL xmlUrl = getClass().getClassLoader().getResource(sourceUrl+name);
+ File target = new File(testForlder, name);
+ ResourceUtil.copyResourceToFile(xmlUrl, target);
+ files.add(target);
+ }
+
+
+ Injector injector = DIBootstrap.createInjector(testModule);
+ ProjectUpgrader_V7 upgrader = new ProjectUpgrader_V7();
+ injector.injectMembers(upgrader);
+
+ Resource source = new URLResource(files.get(0).toURL());
+ assertNotNull(source);
+ UpgradeHandler handler = upgrader.getUpgradeHandler(source);
+ assertNotNull(handler);
+
+ Resource upgraded = handler.performUpgrade();
+ assertNotNull(upgraded);
+ assertNotSame(source, upgraded);
+
+ assertPerformUpgrade6Cayenne(files.get(0));
+ assertPerformUpgrade6Map1(files.get(1));
+ assertPerformUpgradeMap2(files.get(2));
+ }
+
+ private void assertPerformUpgrade6Map1(File file) throws Exception {
+ Document document = toDOMTree(file);
+
+ XPath xpath = XPathFactory.newInstance().newXPath();
+ assertEquals("7", xpath.evaluate("/data-map/@project-version", document));
+
+ NodeList maps = (NodeList) xpath.evaluate(
+ "/data-map/obj-entity/entity-listener",
+ document,
+ XPathConstants.NODESET);
+ assertNotNull(maps);
+ assertEquals(0, maps.getLength());
+ }
+
+ private void assertPerformUpgrade6Cayenne(File file) throws Exception {
+ Document document = toDOMTree(file);
+
+ XPath xpath = XPathFactory.newInstance().newXPath();
+ assertEquals("7", xpath.evaluate("/domain/@project-version", document));
}
+
+ private void assertPerformUpgradeMap2(File file) throws Exception {
+ Document document = toDOMTree(file);
+ XPath xpath = XPathFactory.newInstance().newXPath();
+ assertEquals("7", xpath.evaluate("/data-map/@project-version", document));
+ }
+
}
Modified: cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/2_0a/cayenne.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/2_0a/cayenne.xml?rev=1506221&r1=1506220&r2=1506221&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/2_0a/cayenne.xml (original)
+++ cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/2_0a/cayenne.xml Tue Jul 23 19:13:27 2013
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<domains project-version="2.0">
-<domain name="d1">
- <map name="d1Map" location="d1Map.map.xml"/>
-
- <node name="d1Node"
- datasource="d1Node.driver.xml"
- factory="org.apache.cayenne.conf.DriverDataSourceFactory">
- <map-ref name="d1Map"/>
- </node>
-</domain>
-</domains>
Added: cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/2_0a/cayenne.xml.rej
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/2_0a/cayenne.xml.rej?rev=1506221&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/2_0a/cayenne.xml.rej (added)
+++ cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/2_0a/cayenne.xml.rej Tue Jul 23 19:13:27 2013
@@ -0,0 +1,15 @@
+***************
+*** 1,12 ****
+- <?xml version="1.0" encoding="utf-8"?>
+- <domains project-version="2.0">
+- <domain name="d1">
+- <map name="d1Map" location="d1Map.map.xml"/>
+-
+- <node name="d1Node"
+- datasource="d1Node.driver.xml"
+- factory="org.apache.cayenne.conf.DriverDataSourceFactory">
+- <map-ref name="d1Map"/>
+- </node>
+- </domain>
+- </domains>
+--- 0 ----
Modified: cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/2_0a/d1Map.map.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/2_0a/d1Map.map.xml?rev=1506221&r1=1506220&r2=1506221&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/2_0a/d1Map.map.xml (original)
+++ cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/2_0a/d1Map.map.xml Tue Jul 23 19:13:27 2013
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<data-map project-version="2.0">
-</data-map>
Added: cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/2_0a/d1Map.map.xml.rej
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/2_0a/d1Map.map.xml.rej?rev=1506221&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/2_0a/d1Map.map.xml.rej (added)
+++ cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/2_0a/d1Map.map.xml.rej Tue Jul 23 19:13:27 2013
@@ -0,0 +1,6 @@
+***************
+*** 1,3 ****
+- <?xml version="1.0" encoding="utf-8"?>
+- <data-map project-version="2.0">
+- </data-map>
+--- 0 ----
Modified: cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/2_0a/d1Node.driver.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/2_0a/d1Node.driver.xml?rev=1506221&r1=1506220&r2=1506221&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/2_0a/d1Node.driver.xml (original)
+++ cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/2_0a/d1Node.driver.xml Tue Jul 23 19:13:27 2013
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<driver project-version="2.0">
- <connectionPool min="1" max="1" />
-</driver>
Added: cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/2_0a/d1Node.driver.xml.rej
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/2_0a/d1Node.driver.xml.rej?rev=1506221&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/2_0a/d1Node.driver.xml.rej (added)
+++ cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/2_0a/d1Node.driver.xml.rej Tue Jul 23 19:13:27 2013
@@ -0,0 +1,7 @@
+***************
+*** 1,4 ****
+- <?xml version="1.0" encoding="utf-8"?>
+- <driver project-version="2.0">
+- <connectionPool min="1" max="1" />
+- </driver>
+--- 0 ----
Modified: cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/3_0_0_1a/cayenne.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/3_0_0_1a/cayenne.xml?rev=1506221&r1=1506220&r2=1506221&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/3_0_0_1a/cayenne.xml (original)
+++ cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/3_0_0_1a/cayenne.xml Tue Jul 23 19:13:27 2013
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<domains project-version="3.0.0.1">
-<domain name="d1">
- <map name="d1Map1" location="d1Map1.map.xml"/>
- <map name="d1Map2" location="d1Map2.map.xml"/>
-
- <node name="d1NodeDriver"
- datasource="d1NodeDriver.driver.xml"
- factory="org.apache.cayenne.conf.DriverDataSourceFactory">
- <map-ref name="d1Map1"/>
- <map-ref name="d1Map2"/>
- </node>
-</domain>
-<domain name="d2">
- <node name="d2NodeDBCP"
- datasource="dbcpx"
- factory="org.apache.cayenne.conf.DBCPDataSourceFactory">
- </node>
- <node name="d2NodeJNDI"
- datasource="jndi/x"
- factory="org.apache.cayenne.conf.JNDIDataSourceFactory">
- </node>
-</domain>
-</domains>
Added: cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/3_0_0_1a/cayenne.xml.rej
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/3_0_0_1a/cayenne.xml.rej?rev=1506221&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/3_0_0_1a/cayenne.xml.rej (added)
+++ cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/3_0_0_1a/cayenne.xml.rej Tue Jul 23 19:13:27 2013
@@ -0,0 +1,27 @@
+***************
+*** 1,24 ****
+- <?xml version="1.0" encoding="utf-8"?>
+- <domains project-version="3.0.0.1">
+- <domain name="d1">
+- <map name="d1Map1" location="d1Map1.map.xml"/>
+- <map name="d1Map2" location="d1Map2.map.xml"/>
+-
+- <node name="d1NodeDriver"
+- datasource="d1NodeDriver.driver.xml"
+- factory="org.apache.cayenne.conf.DriverDataSourceFactory">
+- <map-ref name="d1Map1"/>
+- <map-ref name="d1Map2"/>
+- </node>
+- </domain>
+- <domain name="d2">
+- <node name="d2NodeDBCP"
+- datasource="dbcpx"
+- factory="org.apache.cayenne.conf.DBCPDataSourceFactory">
+- </node>
+- <node name="d2NodeJNDI"
+- datasource="jndi/x"
+- factory="org.apache.cayenne.conf.JNDIDataSourceFactory">
+- </node>
+- </domain>
+- </domains>
+--- 0 ----
Modified: cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/3_0_0_1a/d1Map1.map.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/3_0_0_1a/d1Map1.map.xml?rev=1506221&r1=1506220&r2=1506221&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/3_0_0_1a/d1Map1.map.xml (original)
+++ cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/3_0_0_1a/d1Map1.map.xml Tue Jul 23 19:13:27 2013
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/3.0/modelMap"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://cayenne.apache.org/schema/3.0/modelMap http://cayenne.apache.org/schema/3.0/modelMap.xsd"
- project-version="3.0.0.1">
-</data-map>
Added: cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/3_0_0_1a/d1Map1.map.xml.rej
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/3_0_0_1a/d1Map1.map.xml.rej?rev=1506221&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/3_0_0_1a/d1Map1.map.xml.rej (added)
+++ cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/3_0_0_1a/d1Map1.map.xml.rej Tue Jul 23 19:13:27 2013
@@ -0,0 +1,9 @@
+***************
+*** 1,6 ****
+- <?xml version="1.0" encoding="utf-8"?>
+- <data-map xmlns="http://cayenne.apache.org/schema/3.0/modelMap"
+- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+- xsi:schemaLocation="http://cayenne.apache.org/schema/3.0/modelMap http://cayenne.apache.org/schema/3.0/modelMap.xsd"
+- project-version="3.0.0.1">
+- </data-map>
+--- 0 ----
Modified: cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/3_0_0_1a/d1Map2.map.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/3_0_0_1a/d1Map2.map.xml?rev=1506221&r1=1506220&r2=1506221&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/3_0_0_1a/d1Map2.map.xml (original)
+++ cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/3_0_0_1a/d1Map2.map.xml Tue Jul 23 19:13:27 2013
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/3.0/modelMap"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://cayenne.apache.org/schema/3.0/modelMap http://cayenne.apache.org/schema/3.0/modelMap.xsd"
- project-version="3.0.0.1">
- <db-entity name="table1">
- <db-attribute name="pk" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
- </db-entity>
-</data-map>
Added: cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/3_0_0_1a/d1Map2.map.xml.rej
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/3_0_0_1a/d1Map2.map.xml.rej?rev=1506221&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/3_0_0_1a/d1Map2.map.xml.rej (added)
+++ cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/3_0_0_1a/d1Map2.map.xml.rej Tue Jul 23 19:13:27 2013
@@ -0,0 +1,12 @@
+***************
+*** 1,9 ****
+- <?xml version="1.0" encoding="utf-8"?>
+- <data-map xmlns="http://cayenne.apache.org/schema/3.0/modelMap"
+- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+- xsi:schemaLocation="http://cayenne.apache.org/schema/3.0/modelMap http://cayenne.apache.org/schema/3.0/modelMap.xsd"
+- project-version="3.0.0.1">
+- <db-entity name="table1">
+- <db-attribute name="pk" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
+- </db-entity>
+- </data-map>
+--- 0 ----
Modified: cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/3_0_0_1a/d1NodeDriver.driver.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/3_0_0_1a/d1NodeDriver.driver.xml?rev=1506221&r1=1506220&r2=1506221&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/3_0_0_1a/d1NodeDriver.driver.xml (original)
+++ cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/3_0_0_1a/d1NodeDriver.driver.xml Tue Jul 23 19:13:27 2013
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<driver project-version="3.0.0.1" class="org.hsqldb.jdbcDriver">
- <url value="jdbc:hsqldb:mem:xdb"/>
- <connectionPool min="1" max="5"/>
- <login userName="user" password="password"/>
-</driver>
Added: cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/3_0_0_1a/d1NodeDriver.driver.xml.rej
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/3_0_0_1a/d1NodeDriver.driver.xml.rej?rev=1506221&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/3_0_0_1a/d1NodeDriver.driver.xml.rej (added)
+++ cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/3_0_0_1a/d1NodeDriver.driver.xml.rej Tue Jul 23 19:13:27 2013
@@ -0,0 +1,9 @@
+***************
+*** 1,6 ****
+- <?xml version="1.0" encoding="utf-8"?>
+- <driver project-version="3.0.0.1" class="org.hsqldb.jdbcDriver">
+- <url value="jdbc:hsqldb:mem:xdb"/>
+- <connectionPool min="1" max="5"/>
+- <login userName="user" password="password"/>
+- </driver>
+--- 0 ----
Modified: cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/6a/cayenne-PROJECT1.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/6a/cayenne-PROJECT1.xml?rev=1506221&r1=1506220&r2=1506221&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/6a/cayenne-PROJECT1.xml (original)
+++ cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/6a/cayenne-PROJECT1.xml Tue Jul 23 19:13:27 2013
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<domain project-version="6">
-
- <map name="testProjectMap1_1" />
- <map name="testProjectMap1_2" />
-
- <node name="testProjectNode1"
- adapter="org.example.test.Adapter" factory="org.example.test.DataSourceFactory">
- <data-source>
- <connectionPool min="1" max="1" />
- <login />
- </data-source>
- <map-ref name="testProjectMap1_1" />
- </node>
-</domain>
Added: cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/6a/cayenne-PROJECT1.xml.rej
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/6a/cayenne-PROJECT1.xml.rej?rev=1506221&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/6a/cayenne-PROJECT1.xml.rej (added)
+++ cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/6a/cayenne-PROJECT1.xml.rej Tue Jul 23 19:13:27 2013
@@ -0,0 +1,18 @@
+***************
+*** 1,15 ****
+- <?xml version="1.0" encoding="utf-8"?>
+- <domain project-version="6">
+-
+- <map name="testProjectMap1_1" />
+- <map name="testProjectMap1_2" />
+-
+- <node name="testProjectNode1"
+- adapter="org.example.test.Adapter" factory="org.example.test.DataSourceFactory">
+- <data-source>
+- <connectionPool min="1" max="1" />
+- <login />
+- </data-source>
+- <map-ref name="testProjectMap1_1" />
+- </node>
+- </domain>
+--- 0 ----
Modified: cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/6a/testProjectMap1_1.map.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/6a/testProjectMap1_1.map.xml?rev=1506221&r1=1506220&r2=1506221&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/6a/testProjectMap1_1.map.xml (original)
+++ cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/6a/testProjectMap1_1.map.xml Tue Jul 23 19:13:27 2013
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/3.0/modelMap"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://cayenne.apache.org/schema/3.0/modelMap http://cayenne.apache.org/schema/3.0/modelMap.xsd"
- project-version="6">
-
-</data-map>
Added: cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/6a/testProjectMap1_1.map.xml.rej
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/6a/testProjectMap1_1.map.xml.rej?rev=1506221&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/6a/testProjectMap1_1.map.xml.rej (added)
+++ cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/6a/testProjectMap1_1.map.xml.rej Tue Jul 23 19:13:27 2013
@@ -0,0 +1,10 @@
+***************
+*** 1,7 ****
+- <?xml version="1.0" encoding="utf-8"?>
+- <data-map xmlns="http://cayenne.apache.org/schema/3.0/modelMap"
+- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+- xsi:schemaLocation="http://cayenne.apache.org/schema/3.0/modelMap http://cayenne.apache.org/schema/3.0/modelMap.xsd"
+- project-version="6">
+-
+- </data-map>
+--- 0 ----
Modified: cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/6a/testProjectMap1_2.map.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/6a/testProjectMap1_2.map.xml?rev=1506221&r1=1506220&r2=1506221&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/6a/testProjectMap1_2.map.xml (original)
+++ cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/6a/testProjectMap1_2.map.xml Tue Jul 23 19:13:27 2013
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<data-map xmlns="http://cayenne.apache.org/schema/3.0/modelMap"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://cayenne.apache.org/schema/3.0/modelMap http://cayenne.apache.org/schema/3.0/modelMap.xsd"
- project-version="6">
-
-</data-map>
Added: cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/6a/testProjectMap1_2.map.xml.rej
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/6a/testProjectMap1_2.map.xml.rej?rev=1506221&view=auto
==============================================================================
--- cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/6a/testProjectMap1_2.map.xml.rej (added)
+++ cayenne/main/trunk/framework/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/v6/6a/testProjectMap1_2.map.xml.rej Tue Jul 23 19:13:27 2013
@@ -0,0 +1,10 @@
+***************
+*** 1,7 ****
+- <?xml version="1.0" encoding="utf-8"?>
+- <data-map xmlns="http://cayenne.apache.org/schema/3.0/modelMap"
+- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+- xsi:schemaLocation="http://cayenne.apache.org/schema/3.0/modelMap http://cayenne.apache.org/schema/3.0/modelMap.xsd"
+- project-version="6">
+-
+- </data-map>
+--- 0 ----