summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-09-27 08:08:28 (EDT)
committerEike Stepper2007-09-27 08:08:28 (EDT)
commit21b2d86ef1d3b807ff540a6d4c63eabb2a11ec4d (patch)
treeb451d32c03b2e7d60dfbecedfe1230c9e9ee9deb
parenta56e414805714ed57f0c9999f77c819b4c3db6e9 (diff)
downloadcdo-21b2d86ef1d3b807ff540a6d4c63eabb2a11ec4d.zip
cdo-21b2d86ef1d3b807ff540a6d4c63eabb2a11ec4d.tar.gz
cdo-21b2d86ef1d3b807ff540a6d4c63eabb2a11ec4d.tar.bz2
[204739] Provide CDOServer application entry point
https://bugs.eclipse.org/bugs/show_bug.cgi?id=204739
-rw-r--r--plugins/org.eclipse.emf.cdo.server/CDOServer.launch2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/build.properties1
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/config/cdo.server.xml40
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OSGiApplication.java15
4 files changed, 10 insertions, 48 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server/CDOServer.launch b/plugins/org.eclipse.emf.cdo.server/CDOServer.launch
index 0704d0a..4c422eb 100644
--- a/plugins/org.eclipse.emf.cdo.server/CDOServer.launch
+++ b/plugins/org.eclipse.emf.cdo.server/CDOServer.launch
@@ -21,7 +21,7 @@
</listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}&#13;&#10;-console&#13;&#10;-noExit"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.application.launchDefault=true&#13;&#10;-Dnet4j.config=${resource_loc:/org.eclipse.emf.cdo.server-feature/rootfiles/net4j-config}"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dnet4j.config=${resource_loc:/org.eclipse.emf.cdo.server-feature/rootfiles/net4j-config}"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
<stringAttribute key="selectedPlugin" value="org.eclipse.net4j.util"/>
diff --git a/plugins/org.eclipse.emf.cdo.ui/build.properties b/plugins/org.eclipse.emf.cdo.ui/build.properties
index d293cce..93fed57 100644
--- a/plugins/org.eclipse.emf.cdo.ui/build.properties
+++ b/plugins/org.eclipse.emf.cdo.ui/build.properties
@@ -17,5 +17,4 @@ bin.includes = META-INF/,\
plugin.properties,\
model/,\
icons/,\
- config/,\
.options
diff --git a/plugins/org.eclipse.emf.cdo.ui/config/cdo.server.xml b/plugins/org.eclipse.emf.cdo.ui/config/cdo.server.xml
deleted file mode 100644
index 3f21313..0000000
--- a/plugins/org.eclipse.emf.cdo.ui/config/cdo.server.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<repositories>
-
- <repository name="repo1">
- <property name="overrideUUID" value="1ff5d226-b1f0-40fb-aba2-0c31b38c764f"/>
- <property name="supportingAudits" value="true"/>
- <property name="verifyingRevisions" value="false"/>
- <property name="rememberingKnownTypes" value="false"/>
-
- <store type="db">
- <!-- mode: OFF | EXPRESS | NORMAL | GUARANTEED -->
- <invalidationStrategy mode="EXPRESS"/>
-
- <!-- type: horizontal | vertical | <any user-contributed type> -->
- <mappingStrategy type="horizontal">
- <!-- ONE_TABLE_PER_REFERENCE | ONE_TABLE_PER_CLASS | ONE_TABLE_PER_PACKAGE | ONE_TABLE_PER_REPOSITORY | LIKE_ATTRIBUTES -->
- <property name="toManyReferences" value="ONE_TABLE_PER_REFERENCE"/>
-
- <!-- LIKE_ATTRIBUTES | LIKE_TO_MANY_REFERENCES -->
- <property name="toOneReferences" value="LIKE_ATTRIBUTES"/>
-
- <!-- MODEL | STRATEGY -->
- <property name="mappingPrecedence" value="MODEL"/>
- </mappingStrategy>
-
- <!-- name: <any user-contributed DBAdapter name> -->
- <dbAdapter name="derby"/>
-
- <!-- <dataSource
- driverClass="org.apache.derby.jdbc.EmbeddedDataSource"
- databaseName="/temp/cdodb1"
- createDatabase="create"/> -->
- <dataSource
- driverClass="org.apache.derby.jdbc.ClientDataSource"
- databaseName="cdodb1"
- createDatabase="create"/>
- </store>
- </repository>
-
-</repositories> \ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OSGiApplication.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OSGiApplication.java
index 382e98e..d96616c 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OSGiApplication.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OSGiApplication.java
@@ -76,13 +76,7 @@ public class OSGiApplication implements IApplication
stopLatch.await();
stopLatch = null;
- return EXIT_OK;
- }
-
- public final void stop()
- {
traceStop(applicationID);
- stopLatch.countDown();
try
{
@@ -99,6 +93,15 @@ public class OSGiApplication implements IApplication
}
context = null;
+ return EXIT_OK;
+ }
+
+ public final void stop()
+ {
+ if (stopLatch != null)
+ {
+ stopLatch.countDown();
+ }
}
protected void doStart() throws Exception