summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-08-14 01:31:14 (EDT)
committerEike Stepper2007-08-14 01:31:14 (EDT)
commite986deb21f8ecf211400f77549afc8c75efa6850 (patch)
treee1d1ce818705b8de4b22998ef8b7ac51096721af
parente41633eba09459294ec1455cf7faae2af379ecd1 (diff)
downloadcdo-e986deb21f8ecf211400f77549afc8c75efa6850.zip
cdo-e986deb21f8ecf211400f77549afc8c75efa6850.tar.gz
cdo-e986deb21f8ecf211400f77549afc8c75efa6850.tar.bz2
*** empty log message ***
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreWriter.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/PackageManager.java1
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Repository.java12
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/RepositoryFactory.java16
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Session.java9
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CDOReadIndication.java11
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CommitTransactionIndication.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadPackageIndication.java20
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadRevisionIndication.java19
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ResourceIDIndication.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ResourcePathIndication.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerUtil.java5
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreProvider.java19
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionImpl.java10
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ModelUtil.java4
-rw-r--r--plugins/org.eclipse.net4j.db.derby/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.net4j.db.derby/fragment.xml2
-rw-r--r--plugins/org.eclipse.net4j.db.derby/src/org/eclipse/net4j/db/internal/derby/DerbyAdapter.java (renamed from plugins/org.eclipse.net4j.db.derby/src/org/eclipse/net4j/db/internal/mysql/DerbyAdapter.java)2
-rw-r--r--plugins/org.eclipse.net4j.db.derby/src/org/eclipse/net4j/db/internal/derby/bundle/OM.java (renamed from plugins/org.eclipse.net4j.db.derby/src/org/eclipse/net4j/db/internal/mysql/bundle/OM.java)2
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/IndicationWithResponse.java2
20 files changed, 101 insertions, 50 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreWriter.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreWriter.java
index 03b535e..33fe3e1 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreWriter.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreWriter.java
@@ -64,12 +64,12 @@ public class DBStoreWriter extends DBStoreReader implements IStoreWriter
public void writePackage(CDOPackageImpl cdoPackage)
{
// TODO Implement method DBStoreWriter.writePackage()
- throw new UnsupportedOperationException("Not yet implemented");
+ // throw new UnsupportedOperationException("Not yet implemented");
}
public void writeRevision(CDORevisionImpl revision)
{
// TODO Implement method DBStoreWriter.writeRevision()
- throw new UnsupportedOperationException("Not yet implemented");
+ // throw new UnsupportedOperationException("Not yet implemented");
}
}
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/PackageManager.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/PackageManager.java
index 287bba0..4cf0138 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/PackageManager.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/PackageManager.java
@@ -41,6 +41,7 @@ public class PackageManager extends CDOPackageManagerImpl implements IPackageMan
{
for (CDOPackageImpl cdoPackage : cdoPackages)
{
+ cdoPackage.setPackageManager(this);
storeTransaction.execute(new AddPackageOperation(cdoPackage));
}
}
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Repository.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Repository.java
index b4c272c..e1fe6a6 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Repository.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Repository.java
@@ -60,9 +60,10 @@ public class Repository extends Container implements IRepository
private ConcurrentMap<CDOID, CDOClassRef> objectTypes = new ConcurrentHashMap();
- public Repository(String name)
+ public Repository(String name, IStore store)
{
this.name = name;
+ this.store = store;
uuid = UUID.randomUUID().toString();
}
@@ -71,19 +72,14 @@ public class Repository extends Container implements IRepository
return name;
}
- public String getUUID()
- {
- return uuid;
- }
-
public IStore getStore()
{
return store;
}
- public void setStore(IStore store)
+ public String getUUID()
{
- this.store = store;
+ return uuid;
}
public PackageManager getPackageManager()
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/RepositoryFactory.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/RepositoryFactory.java
index 7646dc4..b04d3d0 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/RepositoryFactory.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/RepositoryFactory.java
@@ -10,6 +10,9 @@
**************************************************************************/
package org.eclipse.emf.cdo.internal.server;
+import org.eclipse.emf.cdo.server.IStore;
+import org.eclipse.emf.cdo.server.IStoreProvider;
+
import org.eclipse.net4j.internal.util.factory.Factory;
import org.eclipse.net4j.util.container.IManagedContainer;
@@ -22,14 +25,23 @@ public class RepositoryFactory extends Factory<Repository>
public static final String TYPE = "default";
- public RepositoryFactory()
+ private IStoreProvider storeProvider;
+
+ public RepositoryFactory(IStoreProvider storeProvider)
{
super(PRODUCT_GROUP, TYPE);
+ this.storeProvider = storeProvider;
+ }
+
+ public IStoreProvider getStoreProvider()
+ {
+ return storeProvider;
}
public Repository create(String name)
{
- return new Repository(name);
+ IStore store = storeProvider.getStore(name);
+ return new Repository(name, store);
}
public static Repository get(IManagedContainer container, String name)
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Session.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Session.java
index 85c70d8..3c03402 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Session.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Session.java
@@ -175,8 +175,13 @@ public class Session extends Container<IView> implements ISession, CDOIDProvider
return id;
}
- IStoreReader storeReader = StoreUtil.getReader();
- CDOClassRef type = storeReader.readObjectType(id);
+ RevisionManager revisionManager = sessionManager.getRepository().getRevisionManager();
+ CDOClassRef type = revisionManager.getObjectType(id).createClassRef();
+ if (type == null)
+ {
+ IStoreReader storeReader = StoreUtil.getReader();
+ type = storeReader.readObjectType(id);
+ }
knownObjects.add(id);
return CDOIDImpl.create(id.getValue(), type);
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CDOReadIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CDOReadIndication.java
index 426878a..30ad98f 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CDOReadIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CDOReadIndication.java
@@ -14,9 +14,8 @@ import org.eclipse.emf.cdo.internal.server.StoreUtil;
import org.eclipse.emf.cdo.server.IStore;
import org.eclipse.emf.cdo.server.IStoreReader;
-import org.eclipse.net4j.util.io.ExtendedDataInputStream;
-
-import java.io.IOException;
+import org.eclipse.net4j.stream.BufferInputStream;
+import org.eclipse.net4j.stream.BufferOutputStream;
/**
* @author Eike Stepper
@@ -29,7 +28,7 @@ public abstract class CDOReadIndication extends CDOServerIndication
}
@Override
- protected final void indicating(ExtendedDataInputStream in) throws IOException
+ protected void execute(BufferInputStream in, BufferOutputStream out) throws Exception
{
IStore store = getStore();
IStoreReader storeReader = store.getReader();
@@ -37,7 +36,7 @@ public abstract class CDOReadIndication extends CDOServerIndication
try
{
StoreUtil.setReader(storeReader);
- accessStore(in);
+ super.execute(in, out);
}
finally
{
@@ -45,6 +44,4 @@ public abstract class CDOReadIndication extends CDOServerIndication
StoreUtil.setReader(null);
}
}
-
- protected abstract void accessStore(ExtendedDataInputStream in) throws IOException;
}
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CommitTransactionIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CommitTransactionIndication.java
index 496ab63..dbf4b7a 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CommitTransactionIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CommitTransactionIndication.java
@@ -75,16 +75,16 @@ public class CommitTransactionIndication extends CDOServerIndication
public CommitTransactionIndication()
{
super(CDOProtocolConstants.SIGNAL_COMMIT_TRANSACTION);
- sessionPackageManager = getPackageManager();
- transactionPackageManager = new TransactionPackageManager();
}
@Override
protected void indicating(ExtendedDataInputStream in) throws IOException
{
timeStamp = System.currentTimeMillis();
- int viewID = in.readInt();
+ sessionPackageManager = getPackageManager();
+ transactionPackageManager = new TransactionPackageManager();
+ int viewID = in.readInt();
view = getSession().getView(viewID);
if (view == null || view.getViewType() != IView.Type.TRANSACTION)
{
@@ -144,7 +144,7 @@ public class CommitTransactionIndication extends CDOServerIndication
CDOPackageImpl[] newPackages = new CDOPackageImpl[size];
for (int i = 0; i < size; i++)
{
- newPackages[i] = new CDOPackageImpl(sessionPackageManager, in);
+ newPackages[i] = new CDOPackageImpl(transactionPackageManager, in);
CDOIDRange oldRange = newPackages[i].getMetaIDRange();
if (oldRange != null && oldRange.isTemporary())
{
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadPackageIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadPackageIndication.java
index f72d6c1..b247f41 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadPackageIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadPackageIndication.java
@@ -11,9 +11,10 @@
package org.eclipse.emf.cdo.internal.server.protocol;
import org.eclipse.emf.cdo.internal.protocol.model.CDOPackageImpl;
-import org.eclipse.emf.cdo.internal.server.PackageManager;
+import org.eclipse.emf.cdo.internal.server.bundle.OM;
import org.eclipse.emf.cdo.protocol.CDOProtocolConstants;
+import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
import org.eclipse.net4j.util.ImplementationError;
import org.eclipse.net4j.util.io.ExtendedDataInputStream;
import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
@@ -26,6 +27,8 @@ import java.io.IOException;
@SuppressWarnings("unused")
public class LoadPackageIndication extends CDOReadIndication
{
+ private static final ContextTracer PROTOCOL = new ContextTracer(OM.DEBUG_PROTOCOL, LoadPackageIndication.class);
+
private CDOPackageImpl cdoPackage;
public LoadPackageIndication()
@@ -34,11 +37,15 @@ public class LoadPackageIndication extends CDOReadIndication
}
@Override
- protected void accessStore(ExtendedDataInputStream in) throws IOException
+ protected void indicating(ExtendedDataInputStream in) throws IOException
{
String packageURI = in.readString();
- PackageManager packageManager = getPackageManager();
- cdoPackage = packageManager.lookupPackage(packageURI);
+ if (PROTOCOL.isEnabled())
+ {
+ PROTOCOL.format("Read packageURI: {0}", packageURI);
+ }
+
+ cdoPackage = getPackageManager().lookupPackage(packageURI);
if (cdoPackage == null)
{
throw new ImplementationError("CDO package not found: " + packageURI);
@@ -48,6 +55,11 @@ public class LoadPackageIndication extends CDOReadIndication
@Override
protected void responding(ExtendedDataOutputStream out) throws IOException
{
+ if (PROTOCOL.isEnabled())
+ {
+ PROTOCOL.format("Writing package: {0}", cdoPackage);
+ }
+
cdoPackage.write(out);
}
}
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadRevisionIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadRevisionIndication.java
index 5af5def..913b95e 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadRevisionIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadRevisionIndication.java
@@ -12,7 +12,6 @@ package org.eclipse.emf.cdo.internal.server.protocol;
import org.eclipse.emf.cdo.internal.protocol.CDOIDImpl;
import org.eclipse.emf.cdo.internal.protocol.revision.CDORevisionImpl;
-import org.eclipse.emf.cdo.internal.server.RevisionManager;
import org.eclipse.emf.cdo.internal.server.bundle.OM;
import org.eclipse.emf.cdo.protocol.CDOID;
import org.eclipse.emf.cdo.protocol.CDOProtocolConstants;
@@ -30,9 +29,7 @@ public class LoadRevisionIndication extends CDOReadIndication
{
private static final ContextTracer PROTOCOL = new ContextTracer(OM.DEBUG_PROTOCOL, LoadRevisionIndication.class);
- private CDOID id;
-
- private Long timeStamp;
+ private CDORevisionImpl revision;
public LoadRevisionIndication()
{
@@ -40,9 +37,9 @@ public class LoadRevisionIndication extends CDOReadIndication
}
@Override
- protected void accessStore(ExtendedDataInputStream in) throws IOException
+ protected void indicating(ExtendedDataInputStream in) throws IOException
{
- id = CDOIDImpl.read(in);
+ CDOID id = CDOIDImpl.read(in);
if (PROTOCOL.isEnabled())
{
PROTOCOL.format("Read ID: {0}", id);
@@ -51,19 +48,23 @@ public class LoadRevisionIndication extends CDOReadIndication
boolean historical = in.readBoolean();
if (historical)
{
- timeStamp = in.readLong();
+ long timeStamp = in.readLong();
if (PROTOCOL.isEnabled())
{
PROTOCOL.format("Read timeStamp: {0}", timeStamp);
}
+
+ revision = getRevisionManager().getRevision(id, timeStamp);
+ }
+ else
+ {
+ revision = getRevisionManager().getRevision(id);
}
}
@Override
protected void responding(ExtendedDataOutputStream out) throws IOException
{
- RevisionManager rm = getRevisionManager();
- CDORevisionImpl revision = timeStamp != null ? rm.getRevision(id, timeStamp) : rm.getRevision(id);
revision.write(out, getSession());
}
}
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ResourceIDIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ResourceIDIndication.java
index cda0b65..f3d0d5a 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ResourceIDIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ResourceIDIndication.java
@@ -36,7 +36,7 @@ public class ResourceIDIndication extends CDOReadIndication
}
@Override
- protected void accessStore(ExtendedDataInputStream in) throws IOException
+ protected void indicating(ExtendedDataInputStream in) throws IOException
{
// TODO Optimize transfer of URIs/paths
final String path = in.readString();
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ResourcePathIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ResourcePathIndication.java
index 4dfcc37..ebf8a91 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ResourcePathIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ResourcePathIndication.java
@@ -36,7 +36,7 @@ public class ResourcePathIndication extends CDOReadIndication
}
@Override
- protected void accessStore(ExtendedDataInputStream in) throws IOException
+ protected void indicating(ExtendedDataInputStream in) throws IOException
{
final CDOID id = CDOIDImpl.read(in);
if (PROTOCOL.isEnabled())
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerUtil.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerUtil.java
index b8f0ca6..eedbde4 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerUtil.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/CDOServerUtil.java
@@ -24,9 +24,10 @@ public final class CDOServerUtil
{
}
- public static void prepareContainer(IManagedContainer container, IRepositoryProvider repositoryProvider)
+ public static void prepareContainer(IManagedContainer container, IStoreProvider storeProvider,
+ IRepositoryProvider repositoryProvider)
{
- container.registerFactory(new RepositoryFactory());
+ container.registerFactory(new RepositoryFactory(storeProvider));
container.registerFactory(new CDOServerProtocolFactory(repositoryProvider));
}
}
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreProvider.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreProvider.java
new file mode 100644
index 0000000..4fa9622
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreProvider.java
@@ -0,0 +1,19 @@
+/***************************************************************************
+ * Copyright (c) 2004 - 2007 Eike Stepper, Germany.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
+ **************************************************************************/
+package org.eclipse.emf.cdo.server;
+
+/**
+ * @author Eike Stepper
+ */
+public interface IStoreProvider
+{
+ public IStore getStore(String name);
+}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionImpl.java
index 59cedd7..5438bfe 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionImpl.java
@@ -445,15 +445,21 @@ public class CDOSessionImpl extends Container<CDOView> implements CDOSession
@Override
protected void doDeactivate() throws Exception
{
+ EventUtil.removeListener(channel, channelListener);
synchronized (views)
{
for (CDOViewImpl view : getViews())
{
- view.close();
+ try
+ {
+ view.close();
+ }
+ catch (RuntimeException ignore)
+ {
+ }
}
}
- EventUtil.removeListener(channel, channelListener);
channel.close();
super.doDeactivate();
}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ModelUtil.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ModelUtil.java
index 245de48..de475b8 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ModelUtil.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ModelUtil.java
@@ -16,12 +16,12 @@ import org.eclipse.emf.cdo.internal.protocol.model.CDOClassProxy;
import org.eclipse.emf.cdo.internal.protocol.model.CDOClassRefImpl;
import org.eclipse.emf.cdo.internal.protocol.model.CDOFeatureImpl;
import org.eclipse.emf.cdo.internal.protocol.model.CDOPackageImpl;
-import org.eclipse.emf.cdo.internal.protocol.model.CDOPackageManagerImpl;
import org.eclipse.emf.cdo.internal.protocol.model.CDOTypeImpl;
import org.eclipse.emf.cdo.internal.protocol.model.core.CDOCorePackageImpl;
import org.eclipse.emf.cdo.internal.protocol.model.resource.CDOResourceClassImpl;
import org.eclipse.emf.cdo.internal.protocol.model.resource.CDOResourcePackageImpl;
import org.eclipse.emf.cdo.protocol.CDOIDRange;
+import org.eclipse.emf.cdo.protocol.model.CDOPackageManager;
import org.eclipse.emf.cdo.util.EMFUtil;
import org.eclipse.net4j.util.ImplementationError;
@@ -170,7 +170,7 @@ public final class ModelUtil
private static CDOFeatureImpl createCDOReference(EStructuralFeature eFeature, CDOClassImpl containingClass)
{
- CDOPackageManagerImpl packageManager = containingClass.getPackageManager();
+ CDOPackageManager packageManager = containingClass.getPackageManager();
int featureID = eFeature.getFeatureID();
String name = eFeature.getName();
CDOClassRefImpl classRef = createClassRef(eFeature.getEType());
diff --git a/plugins/org.eclipse.net4j.db.derby/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.db.derby/META-INF/MANIFEST.MF
index 399aa99..815dd3b 100644
--- a/plugins/org.eclipse.net4j.db.derby/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.db.derby/META-INF/MANIFEST.MF
@@ -8,3 +8,4 @@ Fragment-Host: org.eclipse.net4j.db;bundle-version="0.8.0"
Require-Bundle: org.eclipse.core.runtime
Bundle-ClassPath: .,
lib/derby.jar
+Export-Package: org.apache.derby.jdbc;x-friends:="org.eclipse.emf.cdo.tests.tdd"
diff --git a/plugins/org.eclipse.net4j.db.derby/fragment.xml b/plugins/org.eclipse.net4j.db.derby/fragment.xml
index 8c472c2..2b10b43 100644
--- a/plugins/org.eclipse.net4j.db.derby/fragment.xml
+++ b/plugins/org.eclipse.net4j.db.derby/fragment.xml
@@ -4,7 +4,7 @@
<extension
point="org.eclipse.net4j.db.dbAdapters">
<dbAdapter
- class="org.eclipse.net4j.db.internal.mysql.DerbyAdapter"
+ class="org.eclipse.net4j.db.internal.derby.DerbyAdapter"
name="derby"
version="10.2.2.0">
</dbAdapter>
diff --git a/plugins/org.eclipse.net4j.db.derby/src/org/eclipse/net4j/db/internal/mysql/DerbyAdapter.java b/plugins/org.eclipse.net4j.db.derby/src/org/eclipse/net4j/db/internal/derby/DerbyAdapter.java
index 1f3cb46..f424566 100644
--- a/plugins/org.eclipse.net4j.db.derby/src/org/eclipse/net4j/db/internal/mysql/DerbyAdapter.java
+++ b/plugins/org.eclipse.net4j.db.derby/src/org/eclipse/net4j/db/internal/derby/DerbyAdapter.java
@@ -8,7 +8,7 @@
* Contributors:
* Eike Stepper - initial API and implementation
**************************************************************************/
-package org.eclipse.net4j.db.internal.mysql;
+package org.eclipse.net4j.db.internal.derby;
import org.eclipse.net4j.internal.db.DBAdapter;
diff --git a/plugins/org.eclipse.net4j.db.derby/src/org/eclipse/net4j/db/internal/mysql/bundle/OM.java b/plugins/org.eclipse.net4j.db.derby/src/org/eclipse/net4j/db/internal/derby/bundle/OM.java
index 5ca740f..711404a 100644
--- a/plugins/org.eclipse.net4j.db.derby/src/org/eclipse/net4j/db/internal/mysql/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.db.derby/src/org/eclipse/net4j/db/internal/derby/bundle/OM.java
@@ -8,7 +8,7 @@
* Contributors:
* Eike Stepper - initial API and implementation
**************************************************************************/
-package org.eclipse.net4j.db.internal.mysql.bundle;
+package org.eclipse.net4j.db.internal.derby.bundle;
import org.eclipse.net4j.util.om.OMBundle;
import org.eclipse.net4j.util.om.OMPlatform;
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/IndicationWithResponse.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/IndicationWithResponse.java
index 93f0999..a3e98a6 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/IndicationWithResponse.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/IndicationWithResponse.java
@@ -33,7 +33,7 @@ public abstract class IndicationWithResponse extends SignalReactor
}
@Override
- protected final void execute(BufferInputStream in, BufferOutputStream out) throws Exception
+ protected void execute(BufferInputStream in, BufferOutputStream out) throws Exception
{
if (TRACER.isEnabled())
{