summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-09-27 10:19:08 (EDT)
committerEike Stepper2007-09-27 10:19:08 (EDT)
commit9bab05937283397c62984158d8ab8497f12b8821 (patch)
tree1b28e96bb86f29b466a890f3025845630a57c2da
parent21b2d86ef1d3b807ff540a6d4c63eabb2a11ec4d (diff)
downloadcdo-9bab05937283397c62984158d8ab8497f12b8821.zip
cdo-9bab05937283397c62984158d8ab8497f12b8821.tar.gz
cdo-9bab05937283397c62984158d8ab8497f12b8821.tar.bz2
[204795] Provide Net4j Server initialization
https://bugs.eclipse.org/bugs/show_bug.cgi?id=204795
-rw-r--r--features/org.eclipse.emf.cdo.server-feature/rootfiles/net4j-config/cdo-server.xml4
-rw-r--r--features/org.eclipse.emf.cdo.server-feature/rootfiles/net4j-config/net4j-server.xml6
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/RepositoryConfigurator.java2
3 files changed, 6 insertions, 6 deletions
diff --git a/features/org.eclipse.emf.cdo.server-feature/rootfiles/net4j-config/cdo-server.xml b/features/org.eclipse.emf.cdo.server-feature/rootfiles/net4j-config/cdo-server.xml
index 2dab392..af5e2bc 100644
--- a/features/org.eclipse.emf.cdo.server-feature/rootfiles/net4j-config/cdo-server.xml
+++ b/features/org.eclipse.emf.cdo.server-feature/rootfiles/net4j-config/cdo-server.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<cdo-server>
+<cdoServer>
<repository name="repo1">
<property name="overrideUUID" value="1ff5d226-b1f0-40fb-aba2-0c31b38c764f"/>
@@ -37,4 +37,4 @@
</store>
</repository>
-</cdo-server>
+</cdoServer>
diff --git a/features/org.eclipse.emf.cdo.server-feature/rootfiles/net4j-config/net4j-server.xml b/features/org.eclipse.emf.cdo.server-feature/rootfiles/net4j-config/net4j-server.xml
index aabacc6..d610cc1 100644
--- a/features/org.eclipse.emf.cdo.server-feature/rootfiles/net4j-config/net4j-server.xml
+++ b/features/org.eclipse.emf.cdo.server-feature/rootfiles/net4j-config/net4j-server.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<net4j-server>
+<net4jServer>
- <acceptor type="tcp" listen-addr="0.0.0.0" port="2036"/>
+ <acceptor type="tcp" listenAddr="0.0.0.0" port="2036"/>
-</net4j-server>
+</net4jServer>
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/RepositoryConfigurator.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/RepositoryConfigurator.java
index f094f24..27aba67 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/RepositoryConfigurator.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/RepositoryConfigurator.java
@@ -68,7 +68,7 @@ public class RepositoryConfigurator
{
if (TRACER.isEnabled())
{
- TRACER.trace("Configuring repositories from " + configFile.getAbsolutePath());
+ TRACER.trace("Configuring CDO server from " + configFile.getAbsolutePath());
}
List<IRepository> repositories = new ArrayList<IRepository>();