summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2006-04-02 01:15:01 (EST)
committerEike Stepper2006-04-02 01:15:01 (EST)
commitf05d60455328fa2a0d21fcd9d6138294bd03a877 (patch)
treee177396e9ec9dd9afe653246269aece5142c82fa
parentf9510c478315515d4d7b507e4c4f6e42ad9187f3 (diff)
downloadcdo-f05d60455328fa2a0d21fcd9d6138294bd03a877.zip
cdo-f05d60455328fa2a0d21fcd9d6138294bd03a877.tar.gz
cdo-f05d60455328fa2a0d21fcd9d6138294bd03a877.tar.bz2
Renamed emf.dbgen -> emf.cdo.dbgen.
Renamed emf.jdbc -> emf.cdo.jdbc.
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.server/launches/CDO Server.launch2
-rw-r--r--plugins/org.eclipse.emf.cdo.server/META-INF/MANIFEST.MF4
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CdoServerProtocol.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/impl/MapperImpl.java14
4 files changed, 10 insertions, 12 deletions
diff --git a/plugins/org.eclipse.emf.cdo.examples.server/launches/CDO Server.launch b/plugins/org.eclipse.emf.cdo.examples.server/launches/CDO Server.launch
index 89af3f7..5842112 100644
--- a/plugins/org.eclipse.emf.cdo.examples.server/launches/CDO Server.launch
+++ b/plugins/org.eclipse.emf.cdo.examples.server/launches/CDO Server.launch
@@ -309,7 +309,7 @@
<stringAttribute key="checked" value="org.eclipse.core.runtime"/>
<booleanAttribute key="includeFragments" value="true"/>
<stringAttribute key="location" value="/ws.rt/cdo.server"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.net4j.spring,org.eclipse.net4j.socket,org.eclipse.net4j.core,org.eclipse.net4j.spring.db,org.eclipse.emf.cdo.core,org.eclipse.emf.dbgen,org.eclipse.net4j.util,org.eclipse.emf.cdo.example.server,org.eclipse.emf.cdo.server,org.eclipse.emf.jdbc,org.eclipse.emf.dbgen.oracle,org.eclipse.emf.jdbc.mysql,org.eclipse.emf.dbgen.mysql,org.eclipse.emf.dbgen.hsqldb,org.eclipse.emf.dbgen.ansi92"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.net4j.spring,org.eclipse.net4j.socket,org.eclipse.net4j.core,org.eclipse.net4j.spring.db,org.eclipse.emf.cdo.core,org.eclipse.emf.cdo.dbgen,org.eclipse.net4j.util,org.eclipse.emf.cdo.example.server,org.eclipse.emf.cdo.server,org.eclipse.emf.cdo.jdbc,org.eclipse.emf.cdo.dbgen.oracle,org.eclipse.emf.cdo.jdbc.mysql,org.eclipse.emf.cdo.dbgen.mysql,org.eclipse.emf.cdo.dbgen.hsqldb,org.eclipse.emf.cdo.dbgen.ansi92"/>
<stringAttribute key="location4" value="C:\workspaces\runtime-workspace"/>
<stringAttribute key="application" value="org.eclipse.emf.cdo.example.server.application"/>
<stringAttribute key="configLocation" value=""/>
diff --git a/plugins/org.eclipse.emf.cdo.server/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.server/META-INF/MANIFEST.MF
index 7f39047..9d61bf3 100644
--- a/plugins/org.eclipse.emf.cdo.server/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.server/META-INF/MANIFEST.MF
@@ -8,8 +8,8 @@ Bundle-Activator: org.eclipse.emf.cdo.server.CdoServerPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Require-Bundle: org.eclipse.emf.cdo.core;visibility:=reexport,
- org.eclipse.emf.dbgen;visibility:=reexport,
- org.eclipse.emf.jdbc;visibility:=reexport
+ org.eclipse.emf.cdo.dbgen;visibility:=reexport,
+ org.eclipse.emf.cdo.jdbc;visibility:=reexport
Eclipse-LazyStart: true
Export-Package: org.eclipse.emf.cdo.server,
org.eclipse.emf.cdo.server.impl,
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CdoServerProtocol.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CdoServerProtocol.java
index 76633a7..75ccdf4 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CdoServerProtocol.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CdoServerProtocol.java
@@ -11,8 +11,6 @@
package org.eclipse.emf.cdo.server;
-import org.eclipse.net4j.spring.Service;
-
import org.eclipse.emf.cdo.core.CdoProtocol;
import org.springframework.transaction.support.TransactionTemplate;
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/impl/MapperImpl.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/impl/MapperImpl.java
index 64bf45a..f56b925 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/impl/MapperImpl.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/impl/MapperImpl.java
@@ -19,6 +19,13 @@ import org.eclipse.net4j.util.StringHelper;
import org.eclipse.emf.cdo.core.CdoResProtocol;
import org.eclipse.emf.cdo.core.OidEncoder;
+import org.eclipse.emf.cdo.dbgen.ColumnType;
+import org.eclipse.emf.cdo.dbgen.Database;
+import org.eclipse.emf.cdo.dbgen.DbgenFactory;
+import org.eclipse.emf.cdo.dbgen.IndexType;
+import org.eclipse.emf.cdo.dbgen.SqlDialect;
+import org.eclipse.emf.cdo.dbgen.Table;
+import org.eclipse.emf.cdo.dbgen.internal.DbgenActivator;
import org.eclipse.emf.cdo.server.AttributeInfo;
import org.eclipse.emf.cdo.server.ClassInfo;
import org.eclipse.emf.cdo.server.ColumnConverter;
@@ -29,13 +36,6 @@ import org.eclipse.emf.cdo.server.PackageManager;
import org.eclipse.emf.cdo.server.ResourceInfo;
import org.eclipse.emf.cdo.server.ResourceManager;
import org.eclipse.emf.cdo.server.ResourceNotFoundException;
-import org.eclipse.emf.dbgen.ColumnType;
-import org.eclipse.emf.dbgen.Database;
-import org.eclipse.emf.dbgen.DbgenFactory;
-import org.eclipse.emf.dbgen.IndexType;
-import org.eclipse.emf.dbgen.SqlDialect;
-import org.eclipse.emf.dbgen.Table;
-import org.eclipse.emf.dbgen.internal.DbgenActivator;
import org.springframework.dao.IncorrectResultSizeDataAccessException;
import org.springframework.jdbc.core.JdbcTemplate;