Merge with origin/master
diff --git a/org.eclipse.virgo.web.test/ivy.xml b/org.eclipse.virgo.web.test/ivy.xml
index 536f537..73c8e70 100644
--- a/org.eclipse.virgo.web.test/ivy.xml
+++ b/org.eclipse.virgo.web.test/ivy.xml
@@ -44,7 +44,8 @@
<dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel" rev="${org.eclipse.virgo.kernel}" conf="test->runtime"/>
<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" name="equinox-ds" rev="latest.integration"/>
+ <dependency org="org.eclipse" name="equinox-util" rev="latest.integration"/>
<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"/>
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 ac9a109..3135793 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,6 +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.eclipse/equinox-ds/1.2.100.v20101206/equinox-ds-1.2.100.v20101206.jar@start,\
+ file:../ivy-cache/repository/org.eclipse/equinox-util/1.0.200.v20100503/equinox-util-1.0.200.v20100503.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,\
diff --git a/org.eclipse.virgo.web.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties b/org.eclipse.virgo.web.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties
index 30ef09a..b2d3b4e 100644
--- a/org.eclipse.virgo.web.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties
+++ b/org.eclipse.virgo.web.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties
@@ -13,6 +13,9 @@
file:../ivy-cache/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.deployer.dm/3.0.0.D-20110201142952/org.eclipse.virgo.kernel.deployer.dm-3.0.0.D-20110201142952.jar@start,\
file:../ivy-cache/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.dmfragment/3.0.0.D-20110201142952/org.eclipse.virgo.kernel.dmfragment-3.0.0.D-20110201142952.jar,\
file:../ivy-cache/repository/org.eclipse.virgo.kernel/org.eclipse.virgo.kernel.userregion/3.0.0.D-20110201142952/org.eclipse.virgo.kernel.userregion-3.0.0.D-20110201142952.jar@start,\
+ file:../ivy-cache/repository/org.eclipse/equinox-ds/1.2.100.v20101206/equinox-ds-1.2.100.v20101206.jar@start,\
+ file:../ivy-cache/repository/org.eclipse/equinox-util/1.0.200.v20100503/equinox-util-1.0.200.v20100503.jar@start,\
+ file:../ivy-cache/repository/org.eclipse.osgi/org.eclipse.osgi.services/3.3.0.v20101018/org.eclipse.osgi.services-3.3.0.v20101018.jar,\
file:../ivy-cache/repository/org.hsqldb/com.springsource.org.hsqldb/1.8.0.9/com.springsource.org.hsqldb-1.8.0.9.jar,\
file:../ivy-cache/repository/org.springframework/org.springframework.orm/3.0.0.RELEASE/org.springframework.orm-3.0.0.RELEASE.jar@start,\
file:../ivy-cache/repository/org.springframework/org.springframework.transaction/3.0.0.RELEASE/org.springframework.transaction-3.0.0.RELEASE.jar@start,\
diff --git a/org.eclipse.virgo.web.test/template.mf b/org.eclipse.virgo.web.test/template.mf
index a532180..c8a17d6 100644
--- a/org.eclipse.virgo.web.test/template.mf
+++ b/org.eclipse.virgo.web.test/template.mf
@@ -14,6 +14,15 @@
org.aspectj.*;version="${org.aspectj:[=.=.=, +1)}",
org.osgi.framework.*;version="0",
org.springframework.*;version="${org.springframework:[2.5.6, +1)}",
+ org.osgi.service.cm.*;version="0",
+ org.osgi.service.component.*;version="0",
+ org.osgi.service.log.*;version="0",
+ org.eclipse.osgi.framework.log.*;version="0",
+ org.eclipse.osgi.framework.console.*;version="0",
+ org.eclipse.osgi.service.debug.*;version="0",
+ org.eclipse.osgi.service.environment.*;version="0",
+ org.eclipse.osgi.util.*;version="0",
+ org.osgi.util.tracker.*;version="0",
org.springframework.osgi.*;version="${org.springframework.osgi:[=.=.=, +1)}"
Excluded-Imports:
org.eclipse.virgo,
