vserver

7 files changed, 20 insertions, 22 deletions

diff --git a/features/org.eclipse.net4j.sdk-feature/feature.xml b/features/org.eclipse.net4j.sdk-feature/feature.xml
index 88d7bf3ff8..1db7d39885 100644
--- a/features/org.eclipse.net4j.sdk-feature/feature.xml
+++ b/features/org.eclipse.net4j.sdk-feature/feature.xml
@@ -67,5 +67,9 @@
 		<plugin id="org.eclipse.net4j.db.hsqldb.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
 		<plugin id="org.eclipse.net4j.db.mysql.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
 		<plugin id="org.eclipse.net4j.db.postgresql.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+		<plugin id="org.apache.commons.codec.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+		<plugin id="org.apache.commons.httpclient.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+		<plugin id="org.apache.derby.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+		<plugin id="org.h2.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
 
 </feature>
diff --git a/features/org.gastro-feature/feature.xml b/features/org.gastro-feature/feature.xml
index 59f83996ba..4b056bb9cb 100644
--- a/features/org.gastro-feature/feature.xml
+++ b/features/org.gastro-feature/feature.xml
@@ -102,6 +102,13 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.apache.commons.lang"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 		<plugin id="org.gastro.business.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
 		<plugin id="org.gastro.business.edit.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
 		<plugin id="org.gastro.inventory.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
@@ -112,5 +119,6 @@
 		<plugin id="org.gastro.server.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
 		<plugin id="org.gastro.server.web.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
 		<plugin id="org.gastro.testclient.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+		<plugin id="org.apache.commons.lang.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
 
 </feature>
diff --git a/plugins/org.gastro.server.web/.classpath b/plugins/org.gastro.server.web/.classpath
index 6bd93db154..16057af74c 100644
--- a/plugins/org.gastro.server.web/.classpath
+++ b/plugins/org.gastro.server.web/.classpath
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="org.apache.commons.lang_2.3.0.v200803061910.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
diff --git a/plugins/org.gastro.server.web/META-INF/MANIFEST.MF b/plugins/org.gastro.server.web/META-INF/MANIFEST.MF
index 24c627e9ef..cb7941fba8 100644
--- a/plugins/org.gastro.server.web/META-INF/MANIFEST.MF
+++ b/plugins/org.gastro.server.web/META-INF/MANIFEST.MF
@@ -17,17 +17,9 @@ Require-Bundle: org.apache.commons.logging;bundle-version="[1.0.0,2.0.0)",
  org.gastro.inventory;bundle-version="1.0.0"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Import-Package: javax.servlet;version="[2.5.0,2.6.0)",
- javax.servlet.http;version="[2.5.0,2.6.0)"
+ javax.servlet.http;version="[2.5.0,2.6.0)",
+ org.apache.commons.lang;version="[2.3.0,3.0.0)"
 Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .,
- org.apache.commons.lang_2.3.0.v200803061910.jar
-Export-Package: org.apache.commons.lang;version="2.3.0";x-internal:=true,
- org.apache.commons.lang.builder;version="2.3.0";x-internal:=true,
- org.apache.commons.lang.enums;version="2.3.0";x-internal:=true,
- org.apache.commons.lang.exception;version="2.3.0";x-internal:=true,
- org.apache.commons.lang.math;version="2.3.0";x-internal:=true,
- org.apache.commons.lang.mutable;version="2.3.0";x-internal:=true,
- org.apache.commons.lang.text;version="2.3.0";x-internal:=true,
- org.apache.commons.lang.time;version="2.3.0";x-internal:=true,
- org.gastro.server.internal.web;version="3.0.0";x-internal:=true,
+Bundle-ClassPath: .
+Export-Package: org.gastro.server.internal.web;version="3.0.0";x-internal:=true,
  templates;version="3.0.0";x-internal:=true
diff --git a/plugins/org.gastro.server.web/build.properties b/plugins/org.gastro.server.web/build.properties
index ff175cd7bc..35731fcca7 100644
--- a/plugins/org.gastro.server.web/build.properties
+++ b/plugins/org.gastro.server.web/build.properties
@@ -16,7 +16,6 @@ bin.includes = META-INF/,\
                .,\
                plugin.xml,\
                gastro.css,\
-               org.apache.commons.lang_2.3.0.v200803061910.jar,\
                copyright.txt,\
                about.html,\
                CommonsLang.README
diff --git a/plugins/org.gastro.server.web/org.apache.commons.lang_2.3.0.v200803061910.jar b/plugins/org.gastro.server.web/org.apache.commons.lang_2.3.0.v200803061910.jar
deleted file mode 100644
index ee5558ce47..0000000000
--- a/plugins/org.gastro.server.web/org.apache.commons.lang_2.3.0.v200803061910.jar
+++ /dev/null
diff --git a/releng/org.eclipse.emf.cdo.releng/build.rmap b/releng/org.eclipse.emf.cdo.releng/build.rmap
index b70b4680c7..07a8954d36 100644
--- a/releng/org.eclipse.emf.cdo.releng/build.rmap
+++ b/releng/org.eclipse.emf.cdo.releng/build.rmap
@@ -191,8 +191,7 @@
 	</rm:searchPath>
 
 	<rm:searchPath name="orbit">
-		<rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false"
-			resolutionFilter="(build.type=N)">
+		<rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false">
 			<rm:uri format="{0}/tools/orbit/downloads/drops/S20100508202910/updateSite">
 				<bc:propertyRef key="eclipse.downloads"/>
 			</rm:uri>
@@ -207,8 +206,7 @@
 	</rm:searchPath>
 
 	<rm:searchPath name="gef.milestones">
-		<rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false"
-			resolutionFilter="(build.type=N)">
+		<rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false">
 			<rm:uri format="{0}/tools/gef/updates/milestones/">
 				<bc:propertyRef key="eclipse.downloads"/>
 			</rm:uri>
@@ -216,14 +214,12 @@
 	</rm:searchPath>
 
 	<rm:searchPath name="modeling.milestones">
-		<rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false"
-			resolutionFilter="(build.type=N)">
+		<rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false">
 			<rm:uri format="{0}/modeling/emf/teneo/updates/1.2.0/milestones">
 				<bc:propertyRef key="eclipse.downloads"/>
 			</rm:uri>
 		</rm:provider>
-		<rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false"
-			resolutionFilter="(build.type=N)">
+		<rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false">
 			<rm:uri format="{0}/modeling/emf/updates/milestones">
 				<bc:propertyRef key="eclipse.downloads"/>
 			</rm:uri>