summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2006-09-25 04:23:43 (EDT)
committerEike Stepper2006-09-25 04:23:43 (EDT)
commitd9f4d0ea50aa62c30bdc18b8c809573f57f5552a (patch)
tree5fa755b9ac7462667996582bbdd1d16373ff984b
parentd6e02102a15ad56637178fb8613ec184e4e26326 (diff)
downloadcdo-d9f4d0ea50aa62c30bdc18b8c809573f57f5552a.zip
cdo-d9f4d0ea50aa62c30bdc18b8c809573f57f5552a.tar.gz
cdo-d9f4d0ea50aa62c30bdc18b8c809573f57f5552a.tar.bz2
Fixed build.properties and plugin.properties
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.server/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.server/META-INF/server.properties20
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/launches/CDO All Suites.launch4
3 files changed, 15 insertions, 12 deletions
diff --git a/plugins/org.eclipse.emf.cdo.examples.server/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.emf.cdo.examples.server/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..642a296
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.examples.server/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,3 @@
+#Mon Sep 25 10:15:59 CEST 2006
+eclipse.preferences.version=1
+encoding//launches/CDO\ Server.launch=UTF-8
diff --git a/plugins/org.eclipse.emf.cdo.examples.server/META-INF/server.properties b/plugins/org.eclipse.emf.cdo.examples.server/META-INF/server.properties
index 5ba75a6..08a63f3 100644
--- a/plugins/org.eclipse.emf.cdo.examples.server/META-INF/server.properties
+++ b/plugins/org.eclipse.emf.cdo.examples.server/META-INF/server.properties
@@ -7,21 +7,21 @@
# DERBY #
#########
-jdbc.dialect=DERBY
-jdbc.driver=org.apache.derby.jdbc.EmbeddedDriver
-jdbc.url=jdbc:derby:cdoTest;create=true
-jdbc.username=test
-jdbc.password=test
+#jdbc.dialect=DERBY
+#jdbc.driver=org.apache.derby.jdbc.EmbeddedDriver
+#jdbc.url=jdbc:derby:cdoTest;create=true
+#jdbc.username=test
+#jdbc.password=test
##########
# HSQLDB #
##########
-#jdbc.dialect=HSQLDB
-#jdbc.driver=org.hsqldb.jdbcDriver
-#jdbc.url=jdbc:hsqldb:.
-#jdbc.username=sa
-#jdbc.password=
+jdbc.dialect=HSQLDB
+jdbc.driver=org.hsqldb.jdbcDriver
+jdbc.url=jdbc:hsqldb:.
+jdbc.username=sa
+jdbc.password=
#########
# MYSQL #
diff --git a/plugins/org.eclipse.emf.cdo.tests/launches/CDO All Suites.launch b/plugins/org.eclipse.emf.cdo.tests/launches/CDO All Suites.launch
index 32e61fd..8fa11fb 100644
--- a/plugins/org.eclipse.emf.cdo.tests/launches/CDO All Suites.launch
+++ b/plugins/org.eclipse.emf.cdo.tests/launches/CDO All Suites.launch
@@ -18,10 +18,10 @@
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
<booleanAttribute key="automaticAdd" value="false"/>
<stringAttribute key="checked" value="[NONE]"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.cdo.jdbc,org.eclipse.net4j.spring,org.eclipse.net4j.socket,org.eclipse.net4j.core,org.eclipse.net4j.spring.db,org.eclipse.emf.cdo.dbgen,org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo.mapping,org.eclipse.emf.cdo.core,org.eclipse.emf.cdo.client,org.eclipse.net4j.util,org.eclipse.emf.cdo.server,org.eclipse.emf.cdo.client.ocl,org.eclipse.net4j.embedded,org.eclipse.emf.cdo.jdbc.derby,org.eclipse.emf.cdo.dbgen.derby,org.eclipse.emf.cdo.dbgen.oracle,org.eclipse.emf.cdo.jdbc.hsqldb,org.eclipse.emf.cdo.jdbc.mysql,org.eclipse.emf.cdo.dbgen.ansi92,org.eclipse.emf.cdo.dbgen.mysql,org.eclipse.emf.cdo.dbgen.hsqldb"/>
<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.cdo.jdbc,org.eclipse.net4j.spring,org.eclipse.net4j.socket,org.eclipse.net4j.core,org.eclipse.net4j.spring.db,org.eclipse.emf.cdo.dbgen,org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo.core,org.eclipse.emf.cdo.mapping,org.eclipse.emf.cdo.client,org.eclipse.net4j.util,org.eclipse.emf.cdo.client.ocl,org.eclipse.emf.cdo.server,org.eclipse.net4j.embedded,org.eclipse.emf.cdo.jdbc.derby,org.eclipse.emf.cdo.dbgen.derby,org.eclipse.emf.cdo.dbgen.oracle,org.eclipse.emf.cdo.jdbc.hsqldb,org.eclipse.emf.cdo.jdbc.mysql,org.eclipse.emf.cdo.dbgen.ansi92,org.eclipse.emf.cdo.dbgen.mysql,org.eclipse.emf.cdo.dbgen.hsqldb"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
<booleanAttribute key="clearws" value="true"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.cdo.tests.AllSuites"/>
<stringAttribute key="pde.version" value="3.2a"/>