summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-11-14 08:03:14 (EST)
committerEike Stepper2007-11-14 08:03:14 (EST)
commitaf77c9da8a5639b4d0c20f5d6a24c8d0eb60269b (patch)
tree54120844526f7c19d06ce018b407b49b643078a2
parentfbe57cba7392c42ad8e38aa6b05555bf0ae7b65b (diff)
downloadcdo-af77c9da8a5639b4d0c20f5d6a24c8d0eb60269b.zip
cdo-af77c9da8a5639b4d0c20f5d6a24c8d0eb60269b.tar.gz
cdo-af77c9da8a5639b4d0c20f5d6a24c8d0eb60269b.tar.bz2
*** empty log message ***
-rw-r--r--features/org.eclipse.emf.cdo.server.product-feature/rootfiles/configuration/cdo-server.xml8
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Net4jConfigurator.java1
2 files changed, 5 insertions, 4 deletions
diff --git a/features/org.eclipse.emf.cdo.server.product-feature/rootfiles/configuration/cdo-server.xml b/features/org.eclipse.emf.cdo.server.product-feature/rootfiles/configuration/cdo-server.xml
index 611662f..d30019e 100644
--- a/features/org.eclipse.emf.cdo.server.product-feature/rootfiles/configuration/cdo-server.xml
+++ b/features/org.eclipse.emf.cdo.server.product-feature/rootfiles/configuration/cdo-server.xml
@@ -37,17 +37,17 @@
databaseName="/temp/cdodb1"
createDatabase="create"/> -->
- <dbAdapter name="derby"/>
+ <!--<dbAdapter name="derby"/>
<dataSource
driverClass="org.apache.derby.jdbc.ClientDataSource"
databaseName="cdodb1"
- createDatabase="create"/>
+ createDatabase="create"/>-->
- <!--<dbAdapter name="hsqldb"/>
+ <dbAdapter name="hsqldb"/>
<dataSource
driverClass="org.eclipse.net4j.db.hsqldb.HSQLDBDataSource"
database="jdbc:hsqldb:mem:cdodb1"
- user="sa"/>-->
+ user="sa"/>
<!--<dbAdapter name="mysql"/>
<dataSource
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Net4jConfigurator.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Net4jConfigurator.java
index f72cf03..0058aaf 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Net4jConfigurator.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Net4jConfigurator.java
@@ -79,6 +79,7 @@ public class Net4jConfigurator
protected IAcceptor configureAcceptor(Element acceptorConfig)
{
String type = acceptorConfig.getAttribute("type");
+ // TODO Make the following dependent on the "type" attribute value
String listenAddr = acceptorConfig.getAttribute("listenAddr");
String port = acceptorConfig.getAttribute("port");
String description = (listenAddr == null ? "" : listenAddr) + (port == null ? "" : ":" + port);