diff options
author | Eike Stepper | 2012-09-28 14:26:01 +0000 |
---|---|---|
committer | Eike Stepper | 2012-09-28 14:26:01 +0000 |
commit | d7f4926343eae4be01655cea25cf40c6587a1148 (patch) | |
tree | 7d6b08b9b21c6900a3271d4bdb60e51841d971bc | |
parent | 1998cf2e53c6b1e03e47a61abd67570695641998 (diff) | |
download | cdo-d7f4926343eae4be01655cea25cf40c6587a1148.tar.gz cdo-d7f4926343eae4be01655cea25cf40c6587a1148.tar.xz cdo-d7f4926343eae4be01655cea25cf40c6587a1148.zip |
Change example master name.
3 files changed, 11 insertions, 8 deletions
diff --git a/plugins/org.eclipse.emf.cdo.examples/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples/META-INF/MANIFEST.MF index 739d065c6c..81e5c05a16 100644 --- a/plugins/org.eclipse.emf.cdo.examples/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.examples/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.emf.cdo.examples;singleton:=true -Bundle-Version: 4.0.100.qualifier +Bundle-Version: 4.0.101.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Activator: org.eclipse.emf.cdo.internal.examples.bundle.OM$Activator @@ -20,7 +20,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)";resoluti org.eclipse.net4j.tcp;bundle-version="[4.0.0,5.0.0)", org.eclipse.net4j.db.h2;bundle-version="[4.0.0,5.0.0)" Import-Package: org.h2.jdbcx;version="[1.0.0,2.0.0)" -Export-Package: org.eclipse.emf.cdo.examples;version="4.0.100";x-internal:=true, - org.eclipse.emf.cdo.examples.server;version="4.0.100";x-internal:=true, - org.eclipse.emf.cdo.examples.server.offline;version="4.0.100";x-internal:=true, - org.eclipse.emf.cdo.internal.examples.bundle;version="4.0.100";x-internal:=true +Export-Package: org.eclipse.emf.cdo.examples;version="4.0.101";x-internal:=true, + org.eclipse.emf.cdo.examples.server;version="4.0.101";x-internal:=true, + org.eclipse.emf.cdo.examples.server.offline;version="4.0.101";x-internal:=true, + org.eclipse.emf.cdo.internal.examples.bundle;version="4.0.101";x-internal:=true diff --git a/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java index 7e7e314f1e..2828c24ea7 100644 --- a/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java +++ b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/offline/AbstractOfflineExampleServer.java @@ -13,6 +13,7 @@ package org.eclipse.emf.cdo.examples.server.offline; import org.eclipse.emf.cdo.common.CDOCommonRepository.Type; import org.eclipse.emf.cdo.common.util.RepositoryStateChangedEvent; import org.eclipse.emf.cdo.common.util.RepositoryTypeChangedEvent; +import org.eclipse.emf.cdo.examples.company.CompanyPackage; import org.eclipse.emf.cdo.server.CDOServerUtil; import org.eclipse.emf.cdo.server.IRepository; import org.eclipse.emf.cdo.server.ISession; @@ -31,6 +32,8 @@ import org.eclipse.net4j.util.container.IManagedContainer; import org.eclipse.net4j.util.event.IEvent; import org.eclipse.net4j.util.event.IListener; import org.eclipse.net4j.util.lifecycle.LifecycleUtil; +import org.eclipse.net4j.util.om.OMPlatform; +import org.eclipse.net4j.util.om.log.PrintLogHandler; import org.h2.jdbcx.JdbcDataSource; @@ -62,9 +65,9 @@ public abstract class AbstractOfflineExampleServer { // OMPlatform.INSTANCE.setDebugging(true); // OMPlatform.INSTANCE.addTraceHandler(PrintTraceHandler.CONSOLE); - // OMPlatform.INSTANCE.addLogHandler(PrintLogHandler.CONSOLE); + OMPlatform.INSTANCE.addLogHandler(PrintLogHandler.CONSOLE); - // CompanyPackage.eINSTANCE.getClass(); // Register EPackage in standalone + CompanyPackage.eINSTANCE.getClass(); // Register EPackage in standalone } public AbstractOfflineExampleServer(String name, int port, int dbBrowserPort) diff --git a/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/offline/OfflineExampleUtil.java b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/offline/OfflineExampleUtil.java index 4405d542c8..e877cecf33 100644 --- a/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/offline/OfflineExampleUtil.java +++ b/plugins/org.eclipse.emf.cdo.examples/src/org/eclipse/emf/cdo/examples/server/offline/OfflineExampleUtil.java @@ -26,7 +26,7 @@ import org.eclipse.net4j.util.container.IManagedContainer; */ public class OfflineExampleUtil { - public static final String MASTER_NAME = "master"; + public static final String MASTER_NAME = "repo1"; public static final int MASTER_PORT = 2036; |