diff options
| -rw-r--r-- | features/org.eclipse.emf.cdo.server.product-feature/rootfiles/configuration/cdo-server.xml | 8 | ||||
| -rw-r--r-- | plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Net4jConfigurator.java | 1 |
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 611662f11e..d30019e34a 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 f72cf0350d..0058aaf9ad 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); |