bug 310217: clean up the build
diff --git a/build.versions b/build.versions
index 6b8bb22..12762ce 100644
--- a/build.versions
+++ b/build.versions
@@ -37,6 +37,8 @@
org.junit=4.7.0
org.hsqldb=1.8.0.9
org.slf4j=1.6.1
+org.eclipse.osgi.services=3.1.200.v20071203
+org.eclipse.equinox.cm=1.0.200.v20100520
version-RANGE=${version:[=.=.=, =.+1)}
diff --git a/org.eclipse.virgo.web.core/.classpath b/org.eclipse.virgo.web.core/.classpath
index 36db1fe..eee0a66 100644
--- a/org.eclipse.virgo.web.core/.classpath
+++ b/org.eclipse.virgo.web.core/.classpath
@@ -36,10 +36,10 @@
<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/2.2.0.D-20101123171452/org.eclipse.virgo.kernel.osgi-2.2.0.D-20101123171452.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/2.2.0.D-20101123171452/org.eclipse.virgo.kernel.osgi-sources-2.2.0.D-20101123171452.jar"/>
<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.core/2.2.0.D-20101123171452/org.eclipse.virgo.kernel.core-2.2.0.D-20101123171452.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.core/2.2.0.D-20101123171452/org.eclipse.virgo.kernel.core-sources-2.2.0.D-20101123171452.jar"/>
<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/2.2.0.D-20101108165433/org.eclipse.virgo.util.common-2.2.0.D-20101108165433.jar"/>
- <classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.core/1.1.0.CI-46/org.eclipse.gemini.web.core-1.1.0.CI-46.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.core/1.1.0.CI-46/org.eclipse.gemini.web.core-sources-1.1.0.CI-46.jar"/>
+ <classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.core/1.2.0.M01/org.eclipse.gemini.web.core-1.2.0.M01.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.core/1.1.0.CI-46/org.eclipse.gemini.web.core-sources-1.1.0.CI-46.jar"/>
<classpathentry kind="var" path="WEB_IVY_CACHE/org.springframework/org.springframework.core/3.0.0.RELEASE/org.springframework.core-3.0.0.RELEASE.jar" sourcepath="/WEB_IVY_CACHE/org.springframework/org.springframework.core/3.0.0.RELEASE/org.springframework.core-sources-3.0.0.RELEASE.jar"/>
<classpathentry kind="var" path="WEB_IVY_CACHE/org.apache.felix/org.apache.felix.eventadmin/1.0.0/org.apache.felix.eventadmin-1.0.0.jar" sourcepath="/WEB_IVY_CACHE/org.apache.felix/org.apache.felix.eventadmin/1.0.0/org.apache.felix.eventadmin-sources-1.0.0.jar"/>
- <classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.teststubs/org.eclipse.virgo.teststubs.osgi/2.2.0.D-20101108170027/org.eclipse.virgo.teststubs.osgi-2.2.0.D-20101108170027.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.teststubs.osgi/2.2.0.D-20101108170027/org.eclipse.virgo.teststubs.osgi-sources-2.2.0.D-20101108170027.jar"/>
+ <classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.teststubs/org.eclipse.virgo.teststubs.osgi/2.2.0.M01/org.eclipse.virgo.teststubs.osgi-2.2.0.M01.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.teststubs.osgi/2.2.0.D-20101108170027/org.eclipse.virgo.teststubs.osgi-sources-2.2.0.D-20101108170027.jar"/>
<classpathentry kind="var" path="WEB_IVY_CACHE/org.springframework/org.springframework.test/3.0.0.RELEASE/org.springframework.test-3.0.0.RELEASE.jar"/>
<classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/2.2.0.D-20101108170256/org.eclipse.virgo.medic-2.2.0.D-20101108170256.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/2.2.0.D-20101108170256/org.eclipse.virgo.medic-sources-2.2.0.D-20101108170256.jar">
diff --git a/org.eclipse.virgo.web.test/.classpath b/org.eclipse.virgo.web.test/.classpath
index e91ae92..4f4a97d 100644
--- a/org.eclipse.virgo.web.test/.classpath
+++ b/org.eclipse.virgo.web.test/.classpath
@@ -36,12 +36,12 @@
<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/2.2.0.D-20101108170027/org.eclipse.virgo.test.framework-2.2.0.D-20101108170027.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/2.2.0.D-20101108170027/org.eclipse.virgo.test.framework-sources-2.2.0.D-20101108170027.jar"/>
<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/2.2.0.D-20101108165433/org.eclipse.virgo.util.osgi-2.2.0.D-20101108165433.jar"/>
<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.extensions.equinox/2.2.0.M01/org.eclipse.virgo.osgi.extensions.equinox-2.2.0.M01.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.extensions.equinox/2.2.0.M01/org.eclipse.virgo.osgi.extensions.equinox-sources-2.2.0.M01.jar"/>
- <classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.tomcat/1.1.0.CI-46/org.eclipse.gemini.web.tomcat-1.1.0.CI-46.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.tomcat/1.1.0.CI-46/org.eclipse.gemini.web.tomcat-sources-1.1.0.CI-46.jar"/>
+ <classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.tomcat/1.2.0.M01/org.eclipse.gemini.web.tomcat-1.2.0.M01.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.tomcat/1.1.0.CI-46/org.eclipse.gemini.web.tomcat-sources-1.1.0.CI-46.jar"/>
<classpathentry kind="var" path="WEB_IVY_CACHE/org.apache.catalina.springsource/com.springsource.org.apache.catalina.springsource/6.0.29.S2-r1559/com.springsource.org.apache.catalina.springsource-6.0.29.S2-r1559.jar" sourcepath="/WEB_IVY_CACHE/org.apache.catalina.springsource/com.springsource.org.apache.catalina.springsource/6.0.29.S2-r1559/com.springsource.org.apache.catalina.springsource-sources-6.0.29.S2-r1559.jar"/>
<classpathentry kind="var" path="WEB_IVY_CACHE/org.apache.coyote.springsource/com.springsource.org.apache.coyote.springsource/6.0.29.S2-r1559/com.springsource.org.apache.coyote.springsource-6.0.29.S2-r1559.jar" sourcepath="/WEB_IVY_CACHE/org.apache.coyote.springsource/com.springsource.org.apache.coyote.springsource/6.0.29.S2-r1559/com.springsource.org.apache.coyote.springsource-sources-6.0.29.S2-r1559.jar"/>
<classpathentry kind="var" path="WEB_IVY_CACHE/javax.servlet/com.springsource.javax.servlet.jsp/2.1.0/com.springsource.javax.servlet.jsp-2.1.0.jar" sourcepath="/WEB_IVY_CACHE/javax.servlet/com.springsource.javax.servlet.jsp/2.1.0/com.springsource.javax.servlet.jsp-sources-2.1.0.jar"/>
<classpathentry kind="var" path="WEB_IVY_CACHE/org.apache.jasper.springsource/com.springsource.org.apache.jasper.springsource/6.0.29.S2-r1559/com.springsource.org.apache.jasper.springsource-6.0.29.S2-r1559.jar" sourcepath="/WEB_IVY_CACHE/org.apache.jasper.springsource/com.springsource.org.apache.jasper.springsource/6.0.29.S2-r1559/com.springsource.org.apache.jasper.springsource-sources-6.0.29.S2-r1559.jar"/>
- <classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.core/1.1.0.CI-46/org.eclipse.gemini.web.core-1.1.0.CI-46.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.core/1.1.0.CI-46/org.eclipse.gemini.web.core-sources-1.1.0.CI-46.jar"/>
+ <classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.core/1.2.0.M01/org.eclipse.gemini.web.core-1.2.0.M01.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.core/1.1.0.CI-46/org.eclipse.gemini.web.core-sources-1.1.0.CI-46.jar"/>
<classpathentry kind="var" path="WEB_IVY_CACHE/org.springframework/org.springframework.core/3.0.0.RELEASE/org.springframework.core-3.0.0.RELEASE.jar" sourcepath="/WEB_IVY_CACHE/org.springframework/org.springframework.core/3.0.0.RELEASE/org.springframework.core-sources-3.0.0.RELEASE.jar"/>
<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.launcher/2.2.0.M01/org.eclipse.virgo.osgi.launcher-2.2.0.M01.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.launcher/2.2.0.M01/org.eclipse.virgo.osgi.launcher-sources-2.2.0.M01.jar"/>
<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/2.2.0.D-20101108165433/org.eclipse.virgo.util.common-2.2.0.D-20101108165433.jar"/>
diff --git a/org.eclipse.virgo.web.test/ivy.xml b/org.eclipse.virgo.web.test/ivy.xml
index 9cb1c19..8f79be2 100644
--- a/org.eclipse.virgo.web.test/ivy.xml
+++ b/org.eclipse.virgo.web.test/ivy.xml
@@ -45,6 +45,9 @@
<dependency org="org.eclipse.virgo.test" name="org.eclipse.virgo.test.framework" rev="${org.eclipse.virgo.test}" conf="test->runtime"/>
<dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="${org.aspectj}" conf="test->runtime"/>
+ <dependency org="org.eclipse.osgi" name="org.eclipse.osgi.services" rev="${org.eclipse.osgi.services}" conf="test->runtime"/>
+ <dependency org="org.eclipse.equinox" name="org.eclipse.equinox.cm" rev="${org.eclipse.equinox.cm}" conf="test->runtime"/>
+
<dependency org="org.springframework.webflow.samples" name="swf-booking-mvc" rev="${org.springframework.webflow}" conf="test->provided"/>
<dependency org="org.springframework.webflow.samples" name="swf-booking-faces" rev="${org.springframework.webflow}" conf="test->provided"/>
diff --git a/org.eclipse.virgo.web.test/src/test/resources/META-INF/MANIFEST.MF b/org.eclipse.virgo.web.test/src/test/resources/META-INF/MANIFEST.MF
index 20a7a9c..0b9b3d3 100644
--- a/org.eclipse.virgo.web.test/src/test/resources/META-INF/MANIFEST.MF
+++ b/org.eclipse.virgo.web.test/src/test/resources/META-INF/MANIFEST.MF
@@ -3,15 +3,15 @@
apache.commons.httpclient,org.eclipse.virgo.kernel.deployer.core,org.
eclipse.virgo.util.io,org.junit,org.junit.runner"
Bundle-Version: 2.0.0
-Tool: Bundlor 1.0.0.M6
+Tool: Bundlor 1.0.0.RELEASE
Bundle-Name: Virgo Web Test Bundle
Bundle-ManifestVersion: 2
Import-Package: javax.management;version="0",org.apache.commons.httpcl
ient;version="[3.1.0,4)",org.apache.commons.httpclient.methods;versio
- n="[3.1.0,4)",org.eclipse.virgo.kernel.deployer.core;version="[2.1.0,
- 3)",org.eclipse.virgo.kernel.model.management;version="[2.1.0,3)",org
- .eclipse.virgo.kernel.osgi.framework;version="[2.1.0,3)",org.eclipse.
- virgo.util.io;version="[2.1.0,3)",org.junit;version="[4.7.0,5)",org.j
+ n="[3.1.0,4)",org.eclipse.virgo.kernel.deployer.core;version="[2.2.0,
+ 3)",org.eclipse.virgo.kernel.model.management;version="[2.2.0,3)",org
+ .eclipse.virgo.kernel.osgi.framework;version="[2.2.0,3)",org.eclipse.
+ virgo.util.io;version="[2.2.0,3)",org.junit;version="[4.7.0,5)",org.j
unit.runner;version="[4.7.0,5)",org.osgi.framework;version="0"
Bundle-SymbolicName: org.eclipse.virgo.web.test
diff --git a/org.eclipse.virgo.web.test/src/test/resources/META-INF/test.config.properties b/org.eclipse.virgo.web.test/src/test/resources/META-INF/test.config.properties
index 3ff622a..9e55b49 100644
--- a/org.eclipse.virgo.web.test/src/test/resources/META-INF/test.config.properties
+++ b/org.eclipse.virgo.web.test/src/test/resources/META-INF/test.config.properties
@@ -3,7 +3,8 @@
file:../ivy-cache/repository/org.slf4j/com.springsource.slf4j.org.apache.commons.logging/${org.slf4j}/com.springsource.slf4j.org.apache.commons.logging-${org.slf4j}.jar@start,\
file:../ivy-cache/repository/org.aspectj/com.springsource.org.aspectj.weaver/${org.aspectj}/com.springsource.org.aspectj.weaver-${org.aspectj}.jar@start,\
file:../ivy-cache/repository/org.eclipse.virgo.medic/org.eclipse.virgo.medic/${org.eclipse.virgo.medic}/org.eclipse.virgo.medic-${org.eclipse.virgo.medic}.jar@start,\
- file:../ivy-cache/repository/org.apache.felix/org.apache.felix.configadmin/${org.apache.felix}/org.apache.felix.configadmin-${org.apache.felix}.jar@start,\
+ file:../ivy-cache/repository/org.eclipse.osgi/org.eclipse.osgi.services/${org.eclipse.osgi.services}/org.eclipse.osgi.services-${org.eclipse.osgi.services}.jar,\
+ file:../ivy-cache/repository/org.eclipse.equinox/org.eclipse.equinox.cm/${org.eclipse.equinox.cm}/org.eclipse.equinox.cm-${org.eclipse.equinox.cm}.jar@start,\
file:../ivy-cache/repository/org.eclipse.virgo.medic/org.eclipse.virgo.medic.core/${org.eclipse.virgo.medic}/org.eclipse.virgo.medic.core-${org.eclipse.virgo.medic}.jar@start,\
file:../ivy-cache/repository/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/${org.eclipse.virgo.util}/org.eclipse.virgo.util.osgi-${org.eclipse.virgo.util}.jar@start,\
file:../ivy-cache/repository/org.apache.felix/org.apache.felix.eventadmin/${org.apache.felix.eventadmin}/org.apache.felix.eventadmin-${org.apache.felix.eventadmin}.jar@start,\
diff --git a/org.eclipse.virgo.web.tomcat/.classpath b/org.eclipse.virgo.web.tomcat/.classpath
index f595e6e..0a42b2a 100644
--- a/org.eclipse.virgo.web.tomcat/.classpath
+++ b/org.eclipse.virgo.web.tomcat/.classpath
@@ -26,7 +26,7 @@
<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.6.1.R36x_v20100806/org.eclipse.osgi-3.6.1.R36x_v20100806.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.6.1.R36x_v20100806/org.eclipse.osgi-sources-3.6.1.R36x_v20100806.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.web.core"/>
<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.math/2.2.0.D-20101108165433/org.eclipse.virgo.util.math-2.2.0.D-20101108165433.jar"/>
- <classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.tomcat/1.1.0.CI-46/org.eclipse.gemini.web.tomcat-1.1.0.CI-46.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.tomcat/1.1.0.CI-46/org.eclipse.gemini.web.tomcat-sources-1.1.0.CI-46.jar"/>
+ <classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.tomcat/1.2.0.M01/org.eclipse.gemini.web.tomcat-1.2.0.M01.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.gemini.web/org.eclipse.gemini.web.tomcat/1.1.0.CI-46/org.eclipse.gemini.web.tomcat-sources-1.1.0.CI-46.jar"/>
<classpathentry kind="var" path="WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/2.2.0.D-20101123171452/org.eclipse.virgo.kernel.osgi-2.2.0.D-20101123171452.jar" sourcepath="/WEB_IVY_CACHE/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.osgi/2.2.0.D-20101123171452/org.eclipse.virgo.kernel.osgi-sources-2.2.0.D-20101123171452.jar">
<attributes>
<attribute name="org.eclipse.ajdt.aspectpath" value="org.eclipse.ajdt.aspectpath"/>
