Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--features/org.eclipse.emf.cdo.server-feature/feature.xml12
-rw-r--r--features/org.eclipse.emf.cdo.server.product-feature/CDOServer.product21
-rw-r--r--features/org.eclipse.emf.cdo.server.product-feature/feature.xml96
-rw-r--r--features/org.eclipse.emf.cdo.server.product-feature/rootfiles/derby/lib/derby.jarbin0 -> 2343388 bytes
-rw-r--r--features/org.eclipse.emf.cdo.server.product-feature/rootfiles/derby/windows/derby_common.bat8
5 files changed, 119 insertions, 18 deletions
diff --git a/features/org.eclipse.emf.cdo.server-feature/feature.xml b/features/org.eclipse.emf.cdo.server-feature/feature.xml
index cb23bc942a..f6c42e493a 100644
--- a/features/org.eclipse.emf.cdo.server-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.server-feature/feature.xml
@@ -9,13 +9,12 @@
Contributors:
Eike Stepper - initial API and implementation
-->
-
<feature
id="org.eclipse.emf.cdo.server"
label="%featureName"
- image="eclipse_update_120.jpg"
version="2.0.0.qualifier"
- provider-name="%providerName">
+ provider-name="%providerName"
+ image="eclipse_update_120.jpg">
<description>
%description
@@ -56,4 +55,11 @@
version="0.0.0"
unpack="false"/>
+ <plugin
+ id="org.eclipse.emf.cdo"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
</feature>
diff --git a/features/org.eclipse.emf.cdo.server.product-feature/CDOServer.product b/features/org.eclipse.emf.cdo.server.product-feature/CDOServer.product
index 91fc228329..d645424d76 100644
--- a/features/org.eclipse.emf.cdo.server.product-feature/CDOServer.product
+++ b/features/org.eclipse.emf.cdo.server.product-feature/CDOServer.product
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.4"?>
+<?pde version="3.5"?>
<product name="CDO Server" id="org.eclipse.emf.cdo.server.product" application="org.eclipse.emf.cdo.server.app" useFeatures="true">
- <configIni>
+
+ <configIni use="">
<linux>/org.eclipse.emf.cdo.server.product/config.ini</linux>
<macosx>/org.eclipse.emf.cdo.server.product/config.ini</macosx>
<solaris>/org.eclipse.emf.cdo.server.product/config.ini</solaris>
@@ -20,11 +21,15 @@
-Xmx512M
-Ddebug=true</vmArgs>
<vmArgsLin>-Dnet4j.config=configuration</vmArgsLin>
- <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts -Dnet4j.config=configuration</vmArgsMac>
+ <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
+-Dnet4j.config=configuration</vmArgsMac>
<vmArgsSol>-Dnet4j.config=configuration</vmArgsSol>
- <vmArgsWin>-Dnet4j.config=../../../configuration</vmArgsWin>
+ <vmArgsWin>-Dnet4j.config=configuration</vmArgsWin>
</launcherArgs>
+ <windowImages/>
+
+
<launcher name="cdo-server.exe">
<solaris/>
<win useIco="false">
@@ -32,9 +37,11 @@
</win>
</launcher>
+
<vm>
</vm>
+
<plugins>
<plugin id="org.eclipse.core.contenttype"/>
<plugin id="org.eclipse.core.jobs"/>
@@ -60,10 +67,8 @@
</plugins>
<features>
- <feature id="org.eclipse.emf.cdo.server.product" version="0.8.0.qualifier"/>
- <feature id="org.eclipse.net4j" version="0.8.0.qualifier"/>
- <feature id="org.eclipse.net4j.db" version="0.8.0.qualifier"/>
- <feature id="org.eclipse.emf.cdo.server" version="0.8.0.qualifier"/>
+ <feature id="org.eclipse.emf.cdo.server.product" version="2.0.0.qualifier"/>
</features>
+
</product>
diff --git a/features/org.eclipse.emf.cdo.server.product-feature/feature.xml b/features/org.eclipse.emf.cdo.server.product-feature/feature.xml
index 91c64a601f..43ef13e749 100644
--- a/features/org.eclipse.emf.cdo.server.product-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.server.product-feature/feature.xml
@@ -9,13 +9,12 @@
Contributors:
Eike Stepper - initial API and implementation
-->
-
<feature
id="org.eclipse.emf.cdo.server.product"
label="%featureName"
- image="eclipse_update_120.jpg"
version="2.0.0.qualifier"
- provider-name="%providerName">
+ provider-name="%providerName"
+ image="eclipse_update_120.jpg">
<description>
%description
@@ -140,4 +139,95 @@
version="0.0.0"
unpack="false"/>
+ <plugin
+ id="org.eclipse.emf.common"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.ecore"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.ecore.xmi"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.cdo.server.db"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.net4j"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.net4j.tcp"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.net4j.util"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.cdo"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.cdo.common"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.cdo.server"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.net4j.db"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.net4j.db.derby"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.derby"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
</feature>
diff --git a/features/org.eclipse.emf.cdo.server.product-feature/rootfiles/derby/lib/derby.jar b/features/org.eclipse.emf.cdo.server.product-feature/rootfiles/derby/lib/derby.jar
new file mode 100644
index 0000000000..76ada492fd
--- /dev/null
+++ b/features/org.eclipse.emf.cdo.server.product-feature/rootfiles/derby/lib/derby.jar
Binary files differ
diff --git a/features/org.eclipse.emf.cdo.server.product-feature/rootfiles/derby/windows/derby_common.bat b/features/org.eclipse.emf.cdo.server.product-feature/rootfiles/derby/windows/derby_common.bat
index 2c14f18e16..187aea7554 100644
--- a/features/org.eclipse.emf.cdo.server.product-feature/rootfiles/derby/windows/derby_common.bat
+++ b/features/org.eclipse.emf.cdo.server.product-feature/rootfiles/derby/windows/derby_common.bat
@@ -17,10 +17,10 @@
@REM specific language governing permissions and limitations
@REM under the License.
-if exist "%~dp0..\lib\derby.jar" goto libsCopied
-cd %~dp0..\..\plugins\org.eclipse.net4j.db.derby_*
-cd lib
-copy derby.jar ..\..\..\derby\lib
+@REM if exist "%~dp0..\lib\derby.jar" goto libsCopied
+@REM cd %~dp0..\..\plugins\org.eclipse.net4j.db.derby_*
+@REM cd lib
+@REM copy derby.jar ..\..\..\derby\lib
:libsCopied
cd %~dp0..\work

Back to the top