Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Kaegi2010-01-11 16:16:59 +0000
committerSimon Kaegi2010-01-11 16:16:59 +0000
commita5d61da8948c1aff3b163e632a2b566ddd41f0b6 (patch)
tree4d0954cc8c195c3ca8e3d25300b9418413026852
parentf34dc1f3faf61c7df01e800745163452ca991dde (diff)
downloadrt.equinox.bundles-a5d61da8948c1aff3b163e632a2b566ddd41f0b6.tar.gz
rt.equinox.bundles-a5d61da8948c1aff3b163e632a2b566ddd41f0b6.tar.xz
rt.equinox.bundles-a5d61da8948c1aff3b163e632a2b566ddd41f0b6.zip
Bug 275762 - [server-side] easier creation of Equinox server with servletbridge, p2
-rw-r--r--examples/org.eclipse.equinox.server.examples.servletbridge.product/.project17
-rw-r--r--examples/org.eclipse.equinox.server.examples.servletbridge.product/build.properties2
-rw-r--r--examples/org.eclipse.equinox.server.examples.servletbridge.product/feature.xml20
-rw-r--r--examples/org.eclipse.equinox.server.examples.servletbridge.product/products/server.core.p2.product42
-rw-r--r--examples/org.eclipse.equinox.server.examples.servletbridge.product/products/server.core.product38
-rw-r--r--features/org.eclipse.equinox.server.p2/feature.xml16
-rw-r--r--features/org.eclipse.equinox.server.servletbridge/build.properties4
-rw-r--r--features/org.eclipse.equinox.server.servletbridge/rootfiles/launch.ini11
8 files changed, 134 insertions, 16 deletions
diff --git a/examples/org.eclipse.equinox.server.examples.servletbridge.product/.project b/examples/org.eclipse.equinox.server.examples.servletbridge.product/.project
new file mode 100644
index 000000000..49c7befc5
--- /dev/null
+++ b/examples/org.eclipse.equinox.server.examples.servletbridge.product/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.equinox.server.examples.servletbridge.product</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.pde.FeatureBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.FeatureNature</nature>
+ </natures>
+</projectDescription>
diff --git a/examples/org.eclipse.equinox.server.examples.servletbridge.product/build.properties b/examples/org.eclipse.equinox.server.examples.servletbridge.product/build.properties
new file mode 100644
index 000000000..f48100673
--- /dev/null
+++ b/examples/org.eclipse.equinox.server.examples.servletbridge.product/build.properties
@@ -0,0 +1,2 @@
+bin.includes = feature.xml,\
+ products/
diff --git a/examples/org.eclipse.equinox.server.examples.servletbridge.product/feature.xml b/examples/org.eclipse.equinox.server.examples.servletbridge.product/feature.xml
new file mode 100644
index 000000000..f7763eaa1
--- /dev/null
+++ b/examples/org.eclipse.equinox.server.examples.servletbridge.product/feature.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.eclipse.equinox.server.examples.servletbridge.product"
+ label="Servletbridge Product Feature"
+ version="1.0.0.qualifier"
+ provider-name="Eclipse Foundation">
+
+ <description url="http://www.example.com/description">
+ [Enter Feature Description here.]
+ </description>
+
+ <copyright url="http://www.example.com/copyright">
+ [Enter Copyright Description here.]
+ </copyright>
+
+ <license url="http://www.example.com/license">
+ [Enter License Description here.]
+ </license>
+
+</feature>
diff --git a/examples/org.eclipse.equinox.server.examples.servletbridge.product/products/server.core.p2.product b/examples/org.eclipse.equinox.server.examples.servletbridge.product/products/server.core.p2.product
new file mode 100644
index 000000000..99cc8b1ac
--- /dev/null
+++ b/examples/org.eclipse.equinox.server.examples.servletbridge.product/products/server.core.p2.product
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?pde version="3.5"?>
+
+<product id="org.eclipse.sdk.ide" useFeatures="true" includeLaunchers="false">
+
+ <configIni use="default">
+ </configIni>
+
+ <launcherArgs>
+ <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
+ </launcherArgs>
+
+ <launcher>
+ <solaris/>
+ <win useIco="false">
+ <bmp/>
+ </win>
+ </launcher>
+
+ <vm>
+ </vm>
+
+ <plugins>
+ </plugins>
+
+ <features>
+ <feature id="org.eclipse.equinox.server.core" version="1.0.0.qualifier"/>
+ <feature id="org.eclipse.equinox.server.p2" version="1.0.0.qualifier"/>
+ <feature id="org.eclipse.equinox.server.servletbridge" version="1.0.0.qualifier"/>
+ </features>
+
+ <configurations>
+ <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
+ <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" />
+ <plugin id="org.eclipse.equinox.frameworkadmin.equinox" autoStart="true" startLevel="0" />
+ <plugin id="org.eclipse.equinox.http.servletbridge" autoStart="true" startLevel="2" />
+ <plugin id="org.eclipse.equinox.p2.exemplarysetup" autoStart="true" startLevel="0" />
+ <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
+ <plugin id="org.eclipse.equinox.simpleconfigurator.manipulator" autoStart="true" startLevel="0" />
+ </configurations>
+
+</product>
diff --git a/examples/org.eclipse.equinox.server.examples.servletbridge.product/products/server.core.product b/examples/org.eclipse.equinox.server.examples.servletbridge.product/products/server.core.product
new file mode 100644
index 000000000..98137cdce
--- /dev/null
+++ b/examples/org.eclipse.equinox.server.examples.servletbridge.product/products/server.core.product
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?pde version="3.5"?>
+
+<product id="org.eclipse.sdk.ide" useFeatures="true" includeLaunchers="false">
+
+ <configIni use="default">
+ </configIni>
+
+ <launcherArgs>
+ <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
+ </launcherArgs>
+
+ <launcher>
+ <solaris/>
+ <win useIco="false">
+ <bmp/>
+ </win>
+ </launcher>
+
+ <vm>
+ </vm>
+
+ <plugins>
+ </plugins>
+
+ <features>
+ <feature id="org.eclipse.equinox.server.core" version="1.0.0.qualifier"/>
+ <feature id="org.eclipse.equinox.server.servletbridge" version="1.0.0.qualifier"/>
+ </features>
+
+ <configurations>
+ <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
+ <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" />
+ <plugin id="org.eclipse.equinox.http.servletbridge" autoStart="true" startLevel="2" />
+ <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
+ </configurations>
+
+</product>
diff --git a/features/org.eclipse.equinox.server.p2/feature.xml b/features/org.eclipse.equinox.server.p2/feature.xml
index ecac0c2af..4a14b4027 100644
--- a/features/org.eclipse.equinox.server.p2/feature.xml
+++ b/features/org.eclipse.equinox.server.p2/feature.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.eclipse.equinox.server.p2"
- label="P2 Server Feature"
+ label="p2 Server Feature"
version="1.0.0.qualifier"
provider-name="Eclipse Foundation">
@@ -67,13 +67,6 @@
unpack="false"/>
<plugin
- id="org.eclipse.equinox.p2.jarprocessor"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.eclipse.equinox.p2.metadata"
download-size="0"
install-size="0"
@@ -88,13 +81,6 @@
unpack="false"/>
<plugin
- id="org.eclipse.equinox.p2.publisher"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.eclipse.equinox.p2.repository"
download-size="0"
install-size="0"
diff --git a/features/org.eclipse.equinox.server.servletbridge/build.properties b/features/org.eclipse.equinox.server.servletbridge/build.properties
index 64f93a9f0..0c74b3644 100644
--- a/features/org.eclipse.equinox.server.servletbridge/build.properties
+++ b/features/org.eclipse.equinox.server.servletbridge/build.properties
@@ -1 +1,3 @@
-bin.includes = feature.xml
+root=rootfiles
+bin.includes = feature.xml,\
+ rootfiles/
diff --git a/features/org.eclipse.equinox.server.servletbridge/rootfiles/launch.ini b/features/org.eclipse.equinox.server.servletbridge/rootfiles/launch.ini
new file mode 100644
index 000000000..a96f99e95
--- /dev/null
+++ b/features/org.eclipse.equinox.server.servletbridge/rootfiles/launch.ini
@@ -0,0 +1,11 @@
+# Eclipse Runtime Configuration Overrides
+# These properties are loaded prior to starting the framework and can also be used to override System Properties
+# @null is a special value used to override and clear the framework's copy of a System Property prior to starting the framework
+# "*" can be used together with @null to clear System Properties that match a prefix name.
+
+osgi.*=@null
+org.osgi.*=@null
+eclipse.*=@null
+
+osgi.parentClassloader=app
+osgi.contextClassLoaderParent=app

Back to the top