Change product exports to shrink the site.p2

7 files changed, 96 insertions, 12 deletions

diff --git a/features/org.eclipse.emf.cdo.site-feature/feature.xml b/features/org.eclipse.emf.cdo.site-feature/feature.xml
index 03c48ddd73..ea6a6b967e 100644
--- a/features/org.eclipse.emf.cdo.site-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.site-feature/feature.xml
@@ -83,6 +83,10 @@
          version="0.0.0"/>
 
    <includes
+         id="org.eclipse.emf.cdo.server"
+         version="0.0.0"/>
+
+   <includes
          id="org.eclipse.emf.cdo.server.objectivity"
          version="0.0.0"/>
 
@@ -115,10 +119,6 @@
          version="0.0.0"/>
 
    <includes
-         id="org.eclipse.emf.cdo.server.product"
-         version="0.0.0"/>
-
-   <includes
          id="org.eclipse.emf.cdo.tests"
          version="0.0.0"/>
 
diff --git a/plugins/org.eclipse.emf.cdo.server.product/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.emf.cdo.server.product/.settings/org.eclipse.core.resources.prefs
index d5ce883737..a8a0d3bd86 100644
--- a/plugins/org.eclipse.emf.cdo.server.product/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/org.eclipse.emf.cdo.server.product/.settings/org.eclipse.core.resources.prefs
@@ -1,3 +1,2 @@
-#Mon Jul 04 13:03:48 CEST 2011
 eclipse.preferences.version=1
-
+encoding/CDOServer.product=UTF-8
diff --git a/plugins/org.eclipse.emf.cdo.server.product/CDOServer.product b/plugins/org.eclipse.emf.cdo.server.product/CDOServer.product
new file mode 100644
index 0000000000..507cdab861
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.server.product/CDOServer.product
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?pde version="3.5"?>
+
+<product name="CDO Server" id="org.eclipse.emf.cdo.server.product.tcp_h2" application="org.eclipse.emf.cdo.server.app" useFeatures="false" includeLaunchers="true">
+
+   <configIni use="">
+   </configIni>
+
+   <launcherArgs>
+      <programArgs>-debug
+-console
+--launcher.XXMaxPermSize
+128M</programArgs>
+      <vmArgs>-Xms256M
+-Xmx1024M
+-Ddebug=true
+-Dnet4j.config=.</vmArgs>
+      <vmArgsMac>-XstartOnFirstThread
+-Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
+   </launcherArgs>
+
+   <windowImages/>
+
+   <launcher name="cdo-server">
+      <solaris/>
+      <win useIco="false">
+         <bmp/>
+      </win>
+   </launcher>
+
+   <vm>
+   </vm>
+
+   <plugins>
+      <plugin id="org.apache.felix.gogo.command"/>
+      <plugin id="org.apache.felix.gogo.runtime"/>
+      <plugin id="org.apache.felix.gogo.shell"/>
+      <plugin id="org.eclipse.core.contenttype"/>
+      <plugin id="org.eclipse.core.jobs"/>
+      <plugin id="org.eclipse.core.runtime"/>
+      <plugin id="org.eclipse.core.runtime.compatibility.registry" fragment="true"/>
+      <plugin id="org.eclipse.emf.cdo"/>
+      <plugin id="org.eclipse.emf.cdo.common"/>
+      <plugin id="org.eclipse.emf.cdo.net4j"/>
+      <plugin id="org.eclipse.emf.cdo.security"/>
+      <plugin id="org.eclipse.emf.cdo.server"/>
+      <plugin id="org.eclipse.emf.cdo.server.db"/>
+      <plugin id="org.eclipse.emf.cdo.server.net4j"/>
+      <plugin id="org.eclipse.emf.cdo.server.product"/>
+      <plugin id="org.eclipse.emf.cdo.server.security"/>
+      <plugin id="org.eclipse.emf.common"/>
+      <plugin id="org.eclipse.emf.ecore"/>
+      <plugin id="org.eclipse.emf.ecore.change"/>
+      <plugin id="org.eclipse.emf.ecore.xmi"/>
+      <plugin id="org.eclipse.equinox.app"/>
+      <plugin id="org.eclipse.equinox.common"/>
+      <plugin id="org.eclipse.equinox.console"/>
+      <plugin id="org.eclipse.equinox.preferences"/>
+      <plugin id="org.eclipse.equinox.registry"/>
+      <plugin id="org.eclipse.net4j"/>
+      <plugin id="org.eclipse.net4j.db"/>
+      <plugin id="org.eclipse.net4j.db.h2"/>
+      <plugin id="org.eclipse.net4j.db.jdbc"/>
+      <plugin id="org.eclipse.net4j.jvm"/>
+      <plugin id="org.eclipse.net4j.tcp"/>
+      <plugin id="org.eclipse.net4j.util"/>
+      <plugin id="org.eclipse.osgi"/>
+      <plugin id="org.h2"/>
+   </plugins>
+
+   <features>
+   </features>
+
+
+</product>
diff --git a/plugins/org.eclipse.emf.cdo.server.product/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.server.product/META-INF/MANIFEST.MF
index 0214acbbbf..33c70f0e24 100644
--- a/plugins/org.eclipse.emf.cdo.server.product/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.server.product/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.emf.cdo.server.product;singleton:=true
-Bundle-Version: 4.1.100.qualifier
+Bundle-Version: 4.1.200.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -13,5 +13,5 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.cdo.server.net4j;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.net4j.db.h2;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.net4j.tcp;bundle-version="[4.0.0,5.0.0)"
-Export-Package: org.eclipse.emf.cdo.server.internal.product.bundle;version="4.1.100";x-internal:=true
+Export-Package: org.eclipse.emf.cdo.server.internal.product.bundle;version="4.1.200";x-internal:=true
 Bundle-Activator: org.eclipse.emf.cdo.server.internal.product.bundle.OM$Activator
diff --git a/plugins/org.eclipse.emf.cdo.server.product/buckminster.cspex b/plugins/org.eclipse.emf.cdo.server.product/buckminster.cspex
new file mode 100644
index 0000000000..de6e4ebd59
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.server.product/buckminster.cspex
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<cs:cspecExtension xmlns:cs="http://www.eclipse.org/buckminster/CSpec-1.0">
+	<cs:dependencies>
+		<cs:dependency name="org.eclipse.equinox.executable" componentType="eclipse.feature"/>
+	</cs:dependencies>
+</cs:cspecExtension>
\ No newline at end of file
diff --git a/plugins/org.eclipse.emf.cdo.server.product/build.properties b/plugins/org.eclipse.emf.cdo.server.product/build.properties
index 89a4e1258e..a58fd9a2e1 100644
--- a/plugins/org.eclipse.emf.cdo.server.product/build.properties
+++ b/plugins/org.eclipse.emf.cdo.server.product/build.properties
@@ -17,12 +17,17 @@ bin.includes = .,\
                copyright.txt,\
                plugin.xml,\
                icons/,\
-               config/
+               config/,\
+               config-ssl/,\
+               CDOServer.product
 src.includes = about.html,\
                copyright.txt,\
-               config/
+               config/,\
+               buckminster.cspex
 jars.compile.order = .
 source.. = src/
 output.. = bin/
 
+root=config
+
 generateSourceReferences = true
diff --git a/plugins/org.eclipse.emf.cdo.server.product/plugin.xml b/plugins/org.eclipse.emf.cdo.server.product/plugin.xml
index d08bf1b954..8bffbf76de 100644
--- a/plugins/org.eclipse.emf.cdo.server.product/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.server.product/plugin.xml
@@ -15,11 +15,10 @@
 
    	<extension id="tcp_h2" point="org.eclipse.core.runtime.products">
       	<product
-        	name="%product.name"
+        	name="CDO Server"
           description="%product.description"
           application="org.eclipse.emf.cdo.server.app">
         		<property name="appName" value="CDO Server"/>
-         		<property name="windowImages" value="icons/alt_window_16.gif,icons/alt_window_32.gif"/>
       	</product>
    	</extension>