diff options
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo')
8 files changed, 20 insertions, 33 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/bundle/OM.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/bundle/OM.java index 72fd3adca5..6508322874 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/bundle/OM.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/bundle/OM.java @@ -21,7 +21,7 @@ import org.eclipse.net4j.util.om.trace.OMTracer; /** * @author Eike Stepper */ -public final class OM +public abstract class OM { public static final String BUNDLE_ID = "org.eclipse.emf.cdo.server"; //$NON-NLS-1$ @@ -29,6 +29,8 @@ public final class OM public static final OMTracer DEBUG = BUNDLE.tracer("debug"); //$NON-NLS-1$ + public static final OMTracer DEBUG_PROTOCOL = DEBUG.tracer("protocol"); //$NON-NLS-1$ + public static final OMTracer DEBUG_REPOSITORY = DEBUG.tracer("repository"); //$NON-NLS-1$ public static final OMTracer DEBUG_SESSION = DEBUG.tracer("session"); //$NON-NLS-1$ @@ -39,28 +41,20 @@ public final class OM public static final OMLogger LOG = BUNDLE.logger(); - private OM() - { - } - - public static void start() throws Exception + static void start() throws Exception { RepositoryManager.INSTANCE.activate(); } - public static void stop() throws Exception + static void stop() throws Exception { - Exception exception = RepositoryManager.INSTANCE.deactivate(); - if (exception != null) - { - LOG.warn(exception); - } + RepositoryManager.INSTANCE.deactivate(); } /** * @author Eike Stepper */ - public static final class Activator extends OSGiActivator + static final class Activator extends OSGiActivator { public Activator() { 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 38d4d25703..115bf1c56c 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 @@ -11,7 +11,7 @@ package org.eclipse.emf.cdo.internal.server.protocol; import org.eclipse.emf.cdo.internal.protocol.CDOIDImpl; -import org.eclipse.emf.cdo.internal.protocol.bundle.CDOProtocol; +import org.eclipse.emf.cdo.internal.protocol.bundle.OM; import org.eclipse.emf.cdo.internal.protocol.model.CDOPackageManagerImpl; import org.eclipse.emf.cdo.internal.protocol.revision.CDORevisionImpl; import org.eclipse.emf.cdo.internal.server.RevisionManager; @@ -33,11 +33,9 @@ import java.util.Map.Entry; @SuppressWarnings("unused") public class CommitTransactionIndication extends CDOServerIndication { - private static final ContextTracer PROTOCOL = new ContextTracer(CDOProtocol.DEBUG_PROTOCOL, - CommitTransactionIndication.class); + private static final ContextTracer PROTOCOL = new ContextTracer(OM.DEBUG_PROTOCOL, CommitTransactionIndication.class); - private static final ContextTracer TRACER = new ContextTracer(CDOProtocol.DEBUG_REVISION, - CommitTransactionIndication.class); + private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_REVISION, CommitTransactionIndication.class); private CDORevisionImpl[] newResources; diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/InvalidationRequest.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/InvalidationRequest.java index 3ad1dbc13f..baade02a0e 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/InvalidationRequest.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/InvalidationRequest.java @@ -11,7 +11,7 @@ package org.eclipse.emf.cdo.internal.server.protocol; import org.eclipse.emf.cdo.internal.protocol.CDOIDImpl; -import org.eclipse.emf.cdo.internal.protocol.bundle.CDOProtocol; +import org.eclipse.emf.cdo.internal.protocol.bundle.OM; import org.eclipse.emf.cdo.internal.protocol.revision.CDORevisionImpl; import org.eclipse.emf.cdo.protocol.CDOProtocolConstants; @@ -27,7 +27,7 @@ import java.io.IOException; */ public class InvalidationRequest extends Request { - private static final ContextTracer PROTOCOL = new ContextTracer(CDOProtocol.DEBUG_PROTOCOL, InvalidationRequest.class); + private static final ContextTracer PROTOCOL = new ContextTracer(OM.DEBUG_PROTOCOL, InvalidationRequest.class); private long timeStamp; diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadObjectIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadObjectIndication.java index aaf8cb7d01..2f8b594b23 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadObjectIndication.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadObjectIndication.java @@ -11,7 +11,7 @@ package org.eclipse.emf.cdo.internal.server.protocol; import org.eclipse.emf.cdo.internal.protocol.CDOIDImpl; -import org.eclipse.emf.cdo.internal.protocol.bundle.CDOProtocol; +import org.eclipse.emf.cdo.internal.protocol.bundle.OM; import org.eclipse.emf.cdo.internal.protocol.revision.CDORevisionImpl; import org.eclipse.emf.cdo.internal.server.RevisionManager; import org.eclipse.emf.cdo.protocol.CDOID; @@ -28,8 +28,7 @@ import java.io.IOException; */ public class LoadObjectIndication extends CDOServerIndication { - private static final ContextTracer PROTOCOL = new ContextTracer(CDOProtocol.DEBUG_PROTOCOL, - LoadObjectIndication.class); + private static final ContextTracer PROTOCOL = new ContextTracer(OM.DEBUG_PROTOCOL, LoadObjectIndication.class); private CDOID id; diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/OpenSessionIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/OpenSessionIndication.java index f03c4b6b51..f4195fb088 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/OpenSessionIndication.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/OpenSessionIndication.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.emf.cdo.internal.server.protocol; -import org.eclipse.emf.cdo.internal.protocol.bundle.CDOProtocol; +import org.eclipse.emf.cdo.internal.protocol.bundle.OM; import org.eclipse.emf.cdo.internal.server.Repository; import org.eclipse.emf.cdo.internal.server.RepositoryManager; import org.eclipse.emf.cdo.internal.server.Session; @@ -33,8 +33,7 @@ import java.io.IOException; */ public class OpenSessionIndication extends IndicationWithResponse { - private static final ContextTracer PROTOCOL = new ContextTracer(CDOProtocol.DEBUG_PROTOCOL, - OpenSessionIndication.class); + private static final ContextTracer PROTOCOL = new ContextTracer(OM.DEBUG_PROTOCOL, OpenSessionIndication.class); private String repositoryName; 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 f7ef6efed0..85911d220b 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 @@ -11,7 +11,6 @@ package org.eclipse.emf.cdo.internal.server.protocol; import org.eclipse.emf.cdo.internal.protocol.CDOIDImpl; -import org.eclipse.emf.cdo.internal.protocol.bundle.CDOProtocol; import org.eclipse.emf.cdo.internal.server.bundle.OM; import org.eclipse.emf.cdo.protocol.CDOID; import org.eclipse.emf.cdo.protocol.CDOProtocolConstants; @@ -27,8 +26,7 @@ import java.io.IOException; */ public class ResourceIDIndication extends CDOServerIndication { - private static final ContextTracer PROTOCOL = new ContextTracer(CDOProtocol.DEBUG_PROTOCOL, - ResourceIDIndication.class); + private static final ContextTracer PROTOCOL = new ContextTracer(OM.DEBUG_PROTOCOL, ResourceIDIndication.class); private CDOID id; 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 034c470904..e9bf726984 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 @@ -11,7 +11,7 @@ package org.eclipse.emf.cdo.internal.server.protocol; import org.eclipse.emf.cdo.internal.protocol.CDOIDImpl; -import org.eclipse.emf.cdo.internal.protocol.bundle.CDOProtocol; +import org.eclipse.emf.cdo.internal.protocol.bundle.OM; import org.eclipse.emf.cdo.protocol.CDOID; import org.eclipse.emf.cdo.protocol.CDOProtocolConstants; @@ -26,8 +26,7 @@ import java.io.IOException; */ public class ResourcePathIndication extends CDOServerIndication { - private static final ContextTracer PROTOCOL = new ContextTracer(CDOProtocol.DEBUG_PROTOCOL, - ResourcePathIndication.class); + private static final ContextTracer PROTOCOL = new ContextTracer(OM.DEBUG_PROTOCOL, ResourcePathIndication.class); private String path; diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/store/RegisterResourceOperation.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/store/RegisterResourceOperation.java index 16f1087b8e..01be1f7035 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/store/RegisterResourceOperation.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/store/RegisterResourceOperation.java @@ -29,7 +29,7 @@ public abstract class RegisterResourceOperation<T extends ITransaction> implemen this.pathToIDMap = pathToIDMap; } -public Object prepare(T transaction) throws Exception + public Object prepare(T transaction) throws Exception { update(transaction, id, path); idToPathMap.put(id, path); |