summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2006-12-17 14:50:52 (EST)
committerEike Stepper2006-12-17 14:50:52 (EST)
commit528b388311b85e941a8aef2809c34f3ab8bc86ae (patch)
tree598f9ceba817fc06099a365858b4552a319ec9b6
parent7f12a7754e50ed8a3c6a1b53321ada8ca0b114b2 (diff)
downloadcdo-528b388311b85e941a8aef2809c34f3ab8bc86ae.zip
cdo-528b388311b85e941a8aef2809c34f3ab8bc86ae.tar.gz
cdo-528b388311b85e941a8aef2809c34f3ab8bc86ae.tar.bz2
Fixed manifests
-rw-r--r--plugins/org.eclipse.emf.cdo.server/.classpath2
-rw-r--r--plugins/org.eclipse.emf.cdo.server/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--plugins/org.eclipse.emf.cdo.server/META-INF/MANIFEST.MF3
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/.classpath2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/META-INF/MANIFEST.MF3
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/topology/ClientServerTopology.java25
7 files changed, 38 insertions, 11 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server/.classpath b/plugins/org.eclipse.emf.cdo.server/.classpath
index 751c8f2..304e861 100644
--- a/plugins/org.eclipse.emf.cdo.server/.classpath
+++ b/plugins/org.eclipse.emf.cdo.server/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/plugins/org.eclipse.emf.cdo.server/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.server/.settings/org.eclipse.jdt.core.prefs
index a26cfdb..90fd9b2 100644
--- a/plugins/org.eclipse.emf.cdo.server/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.server/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Tue Mar 21 17:41:42 CET 2006
+#Sun Dec 17 20:32:25 CET 2006
eclipse.preferences.version=1
org.eclipse.jdt.core.codeComplete.argumentPrefixes=
org.eclipse.jdt.core.codeComplete.argumentSuffixes=
@@ -8,6 +8,11 @@ org.eclipse.jdt.core.codeComplete.localPrefixes=
org.eclipse.jdt.core.codeComplete.localSuffixes=
org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
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 f4ad29b..daf2574 100644
--- a/plugins/org.eclipse.emf.cdo.server/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.server/META-INF/MANIFEST.MF
@@ -6,11 +6,12 @@ Bundle-Version: 0.8.0.qualifier
Bundle-Activator: org.eclipse.emf.cdo.server.internal.Activator
Bundle-Vendor: %providerName
Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.emf.cdo.core;visibility:=reexport,
org.eclipse.emf.cdo.dbgen;visibility:=reexport
-Eclipse-LazyStart: true
Export-Package: org.eclipse.emf.cdo.server,
org.eclipse.emf.cdo.server.impl,
org.eclipse.emf.cdo.server.internal,
org.eclipse.emf.cdo.server.protocol
+Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.emf.cdo.tests/.classpath b/plugins/org.eclipse.emf.cdo.tests/.classpath
index 7b6e15f..b242d5d 100644
--- a/plugins/org.eclipse.emf.cdo.tests/.classpath
+++ b/plugins/org.eclipse.emf.cdo.tests/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry excluding="org/eclipse/emf/cdo/tests/topology/ClientSeparatedServerTopology.java|org/eclipse/emf/cdo/tests/topology/ClientTopology.java|org/eclipse/emf/cdo/tests/topology/EmbeddedTopology.java" kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/plugins/org.eclipse.emf.cdo.tests/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.tests/.settings/org.eclipse.jdt.core.prefs
index e74445d..2596826 100644
--- a/plugins/org.eclipse.emf.cdo.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.tests/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Wed Aug 09 09:49:26 CEST 2006
+#Sun Dec 17 20:32:26 CET 2006
eclipse.preferences.version=1
org.eclipse.jdt.core.codeComplete.argumentPrefixes=
org.eclipse.jdt.core.codeComplete.argumentSuffixes=
@@ -8,6 +8,11 @@ org.eclipse.jdt.core.codeComplete.localPrefixes=
org.eclipse.jdt.core.codeComplete.localSuffixes=
org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
diff --git a/plugins/org.eclipse.emf.cdo.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests/META-INF/MANIFEST.MF
index 5efd9a9..e04d54f 100644
--- a/plugins/org.eclipse.emf.cdo.tests/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.tests/META-INF/MANIFEST.MF
@@ -7,9 +7,10 @@ Bundle-Activator: org.eclipse.emf.cdo.tests.internal.CDOTestPlugin
Bundle-ClassPath: cdo.tests.jar
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Eclipse-LazyStart: true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.eclipse.core.runtime,
org.junit,
org.eclipse.emf.cdo.client,
org.eclipse.emf.cdo.server,
org.eclipse.emf.cdo.client.ocl
+Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/topology/ClientServerTopology.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/topology/ClientServerTopology.java
index ae81733..c3dd62f 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/topology/ClientServerTopology.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/topology/ClientServerTopology.java
@@ -169,8 +169,16 @@ public class ClientServerTopology implements ITopology
transactionTemplate.setTransactionManager(transactionManager);
serverRegistry = new HashMapRegistry();
- serverRegistry.register(new ServerCDOResProtocolImpl.Factory(mapper, transactionTemplate));
- serverRegistry.register(new ServerCDOProtocolImpl.Factory(mapper, transactionTemplate));
+ {
+ ServerCDOResProtocolImpl.Factory factory = new ServerCDOResProtocolImpl.Factory(mapper,
+ transactionTemplate);
+ serverRegistry.put(factory.getID(), factory);
+ }
+ {
+ ServerCDOProtocolImpl.Factory factory = new ServerCDOProtocolImpl.Factory(mapper,
+ transactionTemplate);
+ serverRegistry.put(factory.getID(), factory);
+ }
acceptor = Net4jUtil.createTCPAcceptor(bufferPool, selector);
acceptor.setProtocolFactoryRegistry(serverRegistry);
@@ -188,8 +196,15 @@ public class ClientServerTopology implements ITopology
LifecycleUtil.activate(clientPackageManager);
clientRegistry = new HashMapRegistry();
- clientRegistry.register(new ClientCDOProtocolImpl.Factory(clientPackageManager));
- clientRegistry.register(new ClientCDOResProtocolImpl.Factory());
+ {
+ ClientCDOProtocolImpl.Factory factory = new ClientCDOProtocolImpl.Factory(
+ clientPackageManager);
+ clientRegistry.put(factory.getID(), factory);
+ }
+ {
+ ClientCDOResProtocolImpl.Factory factory = new ClientCDOResProtocolImpl.Factory();
+ clientRegistry.put(factory.getID(), factory);
+ }
connector = Net4jUtil.createTCPConnector(bufferPool, selector, "localhost");
connector.setProtocolFactoryRegistry(clientRegistry);
@@ -252,7 +267,7 @@ public class ClientServerTopology implements ITopology
public void waitForSignals()
{
- Collection<Channel> channels = Channel.REGISTRY.getElements();
+ Collection<Channel> channels = Channel.REGISTRY.values();
for (Channel channel : channels)
{
BufferHandler receiveHandler = channel.getReceiveHandler();