You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by sk...@apache.org on 2016/11/11 18:36:01 UTC
[1/3] cayenne git commit: - Datamap xml file is missing after
removing and adding new datamap
Repository: cayenne
Updated Branches:
refs/heads/master 1e25df75d -> 9df92ec27
- Datamap xml file is missing after removing and adding new datamap
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/bc2c0ec9
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/bc2c0ec9
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/bc2c0ec9
Branch: refs/heads/master
Commit: bc2c0ec9ec3ae3d87d6cde973e9973a4a273e264
Parents: 2b7a21b
Author: Nikita Timofeev <st...@gmail.com>
Authored: Tue Nov 8 18:00:31 2016 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Tue Nov 8 18:00:31 2016 +0300
----------------------------------------------------------------------
.../apache/cayenne/modeler/dialog/DbImportProjectSaver.java | 9 +++++++--
.../apache/cayenne/modeler/dialog/db/DbLoaderHelper.java | 3 ++-
2 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/bc2c0ec9/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/DbImportProjectSaver.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/DbImportProjectSaver.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/DbImportProjectSaver.java
index 76a4141..a422143 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/DbImportProjectSaver.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/DbImportProjectSaver.java
@@ -18,6 +18,7 @@
*/
package org.apache.cayenne.modeler.dialog;
+import org.apache.cayenne.configuration.ConfigurationNameMapper;
import org.apache.cayenne.configuration.DataChannelDescriptor;
import org.apache.cayenne.configuration.event.DataMapEvent;
import org.apache.cayenne.map.DataMap;
@@ -30,10 +31,14 @@ import org.apache.cayenne.resource.Resource;
public class DbImportProjectSaver implements ProjectSaver {
+ //@Inject // unfortunate we are not in DI context for now
+ protected ConfigurationNameMapper nameMapper;
+
private ProjectController projectController;
- public DbImportProjectSaver(ProjectController projectController) {
+ public DbImportProjectSaver(ProjectController projectController, ConfigurationNameMapper nameMapper) {
this.projectController = projectController;
+ this.nameMapper = nameMapper;
}
@Override
@@ -58,7 +63,7 @@ public class DbImportProjectSaver implements ProjectSaver {
// a new DataMap, so need to set configuration source for it
if (baseResource != null) {
- Resource dataMapResource = baseResource.getRelativeResource(dataMap.getName());
+ Resource dataMapResource = baseResource.getRelativeResource(nameMapper.configurationLocation(dataMap));
dataMap.setConfigurationSource(dataMapResource);
}
projectController.addDataMap(Application.getFrame(), dataMap);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/bc2c0ec9/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DbLoaderHelper.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DbLoaderHelper.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DbLoaderHelper.java
index b736eac..b975dc6 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DbLoaderHelper.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DbLoaderHelper.java
@@ -20,6 +20,7 @@
package org.apache.cayenne.modeler.dialog.db;
import org.apache.cayenne.CayenneRuntimeException;
+import org.apache.cayenne.configuration.ConfigurationNameMapper;
import org.apache.cayenne.configuration.ConfigurationNode;
import org.apache.cayenne.configuration.server.DataSourceFactory;
import org.apache.cayenne.configuration.server.DbAdapterFactory;
@@ -381,7 +382,7 @@ public class DbLoaderHelper {
return new ModelerDbImportAction(
LOGGER,
- new DbImportProjectSaver(projectController),
+ new DbImportProjectSaver(projectController, injector.getInstance(ConfigurationNameMapper.class)),
injector.getInstance(DataSourceFactory.class),
injector.getInstance(DbAdapterFactory.class),
injector.getInstance(MapLoader.class),
[2/3] cayenne git commit: - Datamap xml file is missing after
removing and adding new datamap
Posted by sk...@apache.org.
- Datamap xml file is missing after removing and adding new datamap
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/8e8348a2
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/8e8348a2
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/8e8348a2
Branch: refs/heads/master
Commit: 8e8348a27b85c913f81b3d4d559fcddecbd07084
Parents: bc2c0ec
Author: Nikita Timofeev <st...@gmail.com>
Authored: Wed Nov 9 10:45:22 2016 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Wed Nov 9 10:45:22 2016 +0300
----------------------------------------------------------------------
.../apache/cayenne/modeler/action/DefaultActionManager.java | 5 +++--
.../apache/cayenne/modeler/action/ImportDataMapAction.java | 8 ++++++--
2 files changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8e8348a2/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DefaultActionManager.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DefaultActionManager.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DefaultActionManager.java
index 80bd355..8a98cc3 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DefaultActionManager.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DefaultActionManager.java
@@ -18,6 +18,7 @@
****************************************************************/
package org.apache.cayenne.modeler.action;
+import org.apache.cayenne.configuration.ConfigurationNameMapper;
import org.apache.cayenne.configuration.ConfigurationNode;
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.modeler.Application;
@@ -55,14 +56,14 @@ public class DefaultActionManager implements ActionManager {
protected Map<String, Action> actionMap;
- public DefaultActionManager(@Inject Application application) {
+ public DefaultActionManager(@Inject Application application, @Inject ConfigurationNameMapper nameMapper) {
initActions();
this.actionMap = new HashMap<>(40);
registerAction(new ProjectAction(application));
registerAction(new NewProjectAction(application)).setAlwaysOn(true);
registerAction(new OpenProjectAction(application)).setAlwaysOn(true);
- registerAction(new ImportDataMapAction(application));
+ registerAction(new ImportDataMapAction(application, nameMapper));
registerAction(new SaveAction(application));
registerAction(new SaveAsAction(application));
registerAction(new RevertAction(application));
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8e8348a2/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ImportDataMapAction.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ImportDataMapAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ImportDataMapAction.java
index 732963d..68059f6 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ImportDataMapAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ImportDataMapAction.java
@@ -19,6 +19,7 @@
package org.apache.cayenne.modeler.action;
+import org.apache.cayenne.configuration.ConfigurationNameMapper;
import org.apache.cayenne.configuration.ConfigurationNode;
import org.apache.cayenne.configuration.DataChannelDescriptor;
import org.apache.cayenne.dbsync.naming.NameBuilder;
@@ -50,8 +51,11 @@ public class ImportDataMapAction extends CayenneAction {
private static Log logObj = LogFactory.getLog(ImportDataMapAction.class);
- public ImportDataMapAction(Application application) {
+ private ConfigurationNameMapper nameMapper;
+
+ public ImportDataMapAction(Application application, ConfigurationNameMapper nameMapper) {
super(getActionName(), application);
+ this.nameMapper = nameMapper;
}
public static String getActionName() {
@@ -88,7 +92,7 @@ public class ImportDataMapAction extends CayenneAction {
Resource baseResource = ((DataChannelDescriptor) root).getConfigurationSource();
if (baseResource != null) {
- Resource dataMapResource = baseResource.getRelativeResource(newMap.getName());
+ Resource dataMapResource = baseResource.getRelativeResource(nameMapper.configurationLocation(newMap));
newMap.setConfigurationSource(dataMapResource);
}
[3/3] cayenne git commit: Merge branch '120'
Posted by sk...@apache.org.
Merge branch '120'
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/9df92ec2
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/9df92ec2
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/9df92ec2
Branch: refs/heads/master
Commit: 9df92ec27efdf5fbb9317f6643dfe04259aa7bbf
Parents: 1e25df7 8e8348a
Author: Savva Kolbachev <s....@gmail.com>
Authored: Fri Nov 11 21:35:40 2016 +0300
Committer: Savva Kolbachev <s....@gmail.com>
Committed: Fri Nov 11 21:35:40 2016 +0300
----------------------------------------------------------------------
.../apache/cayenne/modeler/action/DefaultActionManager.java | 5 +++--
.../apache/cayenne/modeler/action/ImportDataMapAction.java | 8 ++++++--
.../apache/cayenne/modeler/dialog/DbImportProjectSaver.java | 9 +++++++--
.../apache/cayenne/modeler/dialog/db/DbLoaderHelper.java | 3 ++-
4 files changed, 18 insertions(+), 7 deletions(-)
----------------------------------------------------------------------