diff options
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal')
10 files changed, 42 insertions, 16 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/CDOAdminServer.java b/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/CDOAdminServer.java index cae3e82cda..4d7eb6562f 100644 --- a/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/CDOAdminServer.java +++ b/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/CDOAdminServer.java @@ -14,8 +14,9 @@ import org.eclipse.emf.cdo.common.CDOCommonRepository.State; import org.eclipse.emf.cdo.common.CDOCommonRepository.Type; import org.eclipse.emf.cdo.server.CDOServerUtil; import org.eclipse.emf.cdo.server.IRepository; -import org.eclipse.emf.cdo.server.admin.CDOAdminHandler; import org.eclipse.emf.cdo.server.internal.admin.bundle.OM; +import org.eclipse.emf.cdo.server.internal.admin.protocol.CDOAdminServerProtocol; +import org.eclipse.emf.cdo.server.spi.admin.CDOAdminHandler; import org.eclipse.emf.cdo.spi.common.admin.AbstractCDOAdmin; import org.eclipse.emf.cdo.spi.server.RepositoryFactory; diff --git a/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/bundle/OM.java b/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/bundle/OM.java index 2e964bfb17..c3c8710fcb 100644 --- a/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/bundle/OM.java +++ b/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/bundle/OM.java @@ -29,6 +29,8 @@ public abstract 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 OMLogger LOG = BUNDLE.logger(); /** diff --git a/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/CDOAdminServerProtocol.java b/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/protocol/CDOAdminServerProtocol.java index 5fb7a3d2ff..a479852740 100644 --- a/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/CDOAdminServerProtocol.java +++ b/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/protocol/CDOAdminServerProtocol.java @@ -8,10 +8,12 @@ * Contributors: * Eike Stepper - initial API and implementation */ -package org.eclipse.emf.cdo.server.internal.admin; +package org.eclipse.emf.cdo.server.internal.admin.protocol; import org.eclipse.emf.cdo.common.CDOCommonRepository.State; import org.eclipse.emf.cdo.common.CDOCommonRepository.Type; +import org.eclipse.emf.cdo.server.internal.admin.CDOAdminServer; +import org.eclipse.emf.cdo.server.internal.admin.CDOAdminServerRepository; import org.eclipse.emf.cdo.spi.common.admin.CDOAdminProtocolConstants; import org.eclipse.net4j.signal.SignalProtocol; @@ -83,10 +85,10 @@ public class CDOAdminServerProtocol extends SignalProtocol<CDOAdminServer> return new QueryRepositoriesIndication(this); case CDOAdminProtocolConstants.SIGNAL_CREATE_REPOSITORY: - return new QueryRepositoriesIndication(this); + return new CreateRepositoryIndication(this); case CDOAdminProtocolConstants.SIGNAL_DELETE_REPOSITORY: - return new QueryRepositoriesIndication(this); + return new DeleteRepositoryIndication(this); default: return super.createSignalReactor(signalID); diff --git a/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/CreateRepositoryIndication.java b/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/protocol/CreateRepositoryIndication.java index e30edb22d8..69dd58c5b8 100644 --- a/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/CreateRepositoryIndication.java +++ b/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/protocol/CreateRepositoryIndication.java @@ -8,9 +8,10 @@ * Contributors: * Eike Stepper - initial API and implementation */ -package org.eclipse.emf.cdo.server.internal.admin; +package org.eclipse.emf.cdo.server.internal.admin.protocol; import org.eclipse.emf.cdo.common.admin.CDOAdminRepository; +import org.eclipse.emf.cdo.server.internal.admin.CDOAdminServer; import org.eclipse.emf.cdo.spi.common.admin.CDOAdminProtocolConstants; import org.eclipse.net4j.signal.IndicationWithResponse; diff --git a/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/DeleteRepositoryIndication.java b/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/protocol/DeleteRepositoryIndication.java index c5d82b3bc4..9696749acb 100644 --- a/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/DeleteRepositoryIndication.java +++ b/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/protocol/DeleteRepositoryIndication.java @@ -8,8 +8,10 @@ * Contributors: * Eike Stepper - initial API and implementation */ -package org.eclipse.emf.cdo.server.internal.admin; +package org.eclipse.emf.cdo.server.internal.admin.protocol; +import org.eclipse.emf.cdo.server.internal.admin.CDOAdminServer; +import org.eclipse.emf.cdo.server.internal.admin.CDOAdminServerRepository; import org.eclipse.emf.cdo.spi.common.admin.CDOAdminProtocolConstants; import org.eclipse.net4j.signal.IndicationWithResponse; diff --git a/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/QueryRepositoriesIndication.java b/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/protocol/QueryRepositoriesIndication.java index f6fdf31e64..9e5aa8d94b 100644 --- a/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/QueryRepositoriesIndication.java +++ b/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/protocol/QueryRepositoriesIndication.java @@ -8,19 +8,26 @@ * Contributors: * Eike Stepper - initial API and implementation */ -package org.eclipse.emf.cdo.server.internal.admin; +package org.eclipse.emf.cdo.server.internal.admin.protocol; +import org.eclipse.emf.cdo.common.admin.CDOAdminRepository; +import org.eclipse.emf.cdo.server.internal.admin.CDOAdminServer; +import org.eclipse.emf.cdo.server.internal.admin.CDOAdminServerRepository; +import org.eclipse.emf.cdo.server.internal.admin.bundle.OM; import org.eclipse.emf.cdo.spi.common.admin.CDOAdminProtocolConstants; import org.eclipse.net4j.signal.IndicationWithResponse; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; +import org.eclipse.net4j.util.om.trace.ContextTracer; /** * @author Eike Stepper */ public class QueryRepositoriesIndication extends IndicationWithResponse { + private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_PROTOCOL, QueryRepositoriesIndication.class); + public QueryRepositoriesIndication(CDOAdminServerProtocol protocol) { super(protocol, CDOAdminProtocolConstants.SIGNAL_QUERY_REPOSITORIES); @@ -38,12 +45,22 @@ public class QueryRepositoriesIndication extends IndicationWithResponse CDOAdminServerProtocol protocol = (CDOAdminServerProtocol)getProtocol(); CDOAdminServer admin = protocol.getInfraStructure(); - CDOAdminServerRepository[] repositories = (CDOAdminServerRepository[])admin.getRepositories(); - out.writeInt(repositories.length); + CDOAdminRepository[] repositories = admin.getRepositories(); + int size = repositories.length; + if (TRACER.isEnabled()) + { + TRACER.format("Writing {0} repository infos...", size); //$NON-NLS-1$ + } - for (int i = 0; i < repositories.length; i++) + out.writeInt(size); + for (int i = 0; i < size; i++) { - CDOAdminServerRepository repository = repositories[i]; + CDOAdminServerRepository repository = (CDOAdminServerRepository)repositories[i]; + if (TRACER.isEnabled()) + { + TRACER.format("Writing repository info for {0}", repository.getName()); //$NON-NLS-1$ + } + repository.write(out); } } diff --git a/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/RepositoryAddedRequest.java b/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/protocol/RepositoryAddedRequest.java index 56c464af0d..a1c4903f26 100644 --- a/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/RepositoryAddedRequest.java +++ b/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/protocol/RepositoryAddedRequest.java @@ -8,8 +8,9 @@ * Contributors: * Eike Stepper - initial API and implementation */ -package org.eclipse.emf.cdo.server.internal.admin; +package org.eclipse.emf.cdo.server.internal.admin.protocol; +import org.eclipse.emf.cdo.server.internal.admin.CDOAdminServerRepository; import org.eclipse.emf.cdo.spi.common.admin.CDOAdminProtocolConstants; import org.eclipse.net4j.signal.Request; diff --git a/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/RepositoryRemovedRequest.java b/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/protocol/RepositoryRemovedRequest.java index f1ed00311e..0980811d24 100644 --- a/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/RepositoryRemovedRequest.java +++ b/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/protocol/RepositoryRemovedRequest.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation */ -package org.eclipse.emf.cdo.server.internal.admin; +package org.eclipse.emf.cdo.server.internal.admin.protocol; import org.eclipse.emf.cdo.spi.common.admin.CDOAdminProtocolConstants; @@ -24,7 +24,7 @@ public class RepositoryRemovedRequest extends Request public RepositoryRemovedRequest(CDOAdminServerProtocol serverProtocol, String name) { - super(serverProtocol, CDOAdminProtocolConstants.SIGNAL_REPOSITORY_ADDED); + super(serverProtocol, CDOAdminProtocolConstants.SIGNAL_REPOSITORY_REMOVED); this.name = name; } diff --git a/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/RepositoryStateChangedRequest.java b/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/protocol/RepositoryStateChangedRequest.java index ea81e0e0d7..6c7fd0f7b8 100644 --- a/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/RepositoryStateChangedRequest.java +++ b/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/protocol/RepositoryStateChangedRequest.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation */ -package org.eclipse.emf.cdo.server.internal.admin; +package org.eclipse.emf.cdo.server.internal.admin.protocol; import org.eclipse.emf.cdo.common.CDOCommonRepository.State; import org.eclipse.emf.cdo.spi.common.admin.CDOAdminProtocolConstants; diff --git a/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/RepositoryTypeChangedRequest.java b/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/protocol/RepositoryTypeChangedRequest.java index 3577716722..641a2eab34 100644 --- a/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/RepositoryTypeChangedRequest.java +++ b/plugins/org.eclipse.emf.cdo.server.admin/src/org/eclipse/emf/cdo/server/internal/admin/protocol/RepositoryTypeChangedRequest.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation */ -package org.eclipse.emf.cdo.server.internal.admin; +package org.eclipse.emf.cdo.server.internal.admin.protocol; import org.eclipse.emf.cdo.common.CDOCommonRepository.Type; import org.eclipse.emf.cdo.spi.common.admin.CDOAdminProtocolConstants; |