Google GitGoogle Git
Sign in
eclipse/gemini.web/org.eclipse.gemini.web.gemini-web-container/fcdee2995877186314a42b006e49a9225ee7ca4f^!/.
commit
fcdee2995877186314a42b006e49a9225ee7ca4f
[log]
author
Violeta Georgieva <milesg78@gmail.com>
Mon Jan 05 15:22:09 2015 +0200
committer
Violeta Georgieva <milesg78@gmail.com>
Mon Jan 05 15:22:09 2015 +0200
tree
4d32e959792e475af8d85a5df931530a6e74535d
parent
f0da07b8907fe3f6a334791e3192c83c71b8daf4 [diff]
Integration with Equinox 3.10.x.

diff --git a/build.versions b/build.versions
index 2ca5f13..7ea64e3 100644
--- a/build.versions
+++ b/build.versions

@@ -1,10 +1,10 @@
 # Test
 org.junit=4.7.0
 org.easymock=2.3.0
-org.eclipse.virgo.test=3.6.0.RELEASE
+org.eclipse.virgo.test=3.7.0.BUILD-20150104200311
 
 # Compile
-org.eclipse.virgo.util=3.6.0.RELEASE
+org.eclipse.virgo.util=3.7.0.BUILD-20150105070106
 org.eclipse.virgo.build.tools=1.4.1.RELEASE
 org.eclipse.equinox.launcher=1.3.0.v20120308-1358
 javax.activation=1.1.1
@@ -21,9 +21,9 @@
 javax.xml.soap=1.3.0.v201105210645
 javax.websocket=1.0.0.v201312030745
 org.apache.taglibs=1.1.2.v20110517
-org.eclipse.osgi=3.8.1.v20120830-144521
-org.eclipse.osgi.services=3.3.0.v20120307-2102
-org.eclipse.equinox.event=1.2.100.v20111010-1614
+org.eclipse.osgi=3.10.0.v20140606-1445
+org.eclipse.osgi.services=3.4.0.v20140312-2051
+org.eclipse.equinox.event=1.3.100.v20140115-1647
 org.apache.catalina=7.0.55.v201409050650
 org.apache.catalina.ha=7.0.55.v201409050650
 org.apache.catalina.tribes=7.0.55.v201409050650

diff --git a/org.eclipse.gemini.web.core/.classpath b/org.eclipse.gemini.web.core/.classpath
index 5b8a656..d702009 100644
--- a/org.eclipse.gemini.web.core/.classpath
+++ b/org.eclipse.gemini.web.core/.classpath

@@ -31,16 +31,16 @@
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.coyote/7.0.55.v201409050650/org.apache.coyote-7.0.55.v201409050650.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.coyote/7.0.55.v201409050650/org.apache.coyote.source-7.0.55.v201409050650.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/javax.servlet/javax.servlet/3.0.0.v201103241009/javax.servlet-3.0.0.v201103241009.jar" sourcepath="/IVY_CACHE/javax.servlet/javax.servlet/3.0.0.v201103241009/javax.servlet-sources-3.0.0.v201103241009.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.equinox.event/1.2.100.v20111010-1614/org.eclipse.equinox.event-1.2.100.v20111010-1614.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.equinox.event/1.2.100.v20111010-1614/org.eclipse.equinox.event-sources-1.2.100.v20111010-1614.jar.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.equinox.event/1.3.100.v20140115-1647/org.eclipse.equinox.event-1.3.100.v20140115-1647.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.equinox.event/1.3.100.v20140115-1647/org.eclipse.equinox.event-sources-1.3.100.v20140115-1647.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.slf4j.nop/1.7.2.v201212060727/org.slf4j.nop-1.7.2.v201212060727.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.slf4j.nop/1.7.2.v201212060727/org.slf4j.nop-sources-1.7.2.v201212060727.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.stubs/3.6.0.RELEASE/org.eclipse.virgo.test.stubs-3.6.0.RELEASE.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.stubs/3.6.0.RELEASE/org.eclipse.virgo.test.stubs-sources-3.6.0.RELEASE.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.stubs/3.7.0.BUILD-20150104200311/org.eclipse.virgo.test.stubs-3.7.0.BUILD-20150104200311.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.stubs/3.7.0.BUILD-20150104200311/org.eclipse.virgo.test.stubs-sources-3.7.0.BUILD-20150104200311.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.12.RELEASE/com.springsource.org.aspectj.runtime-1.6.12.RELEASE.jar" sourcepath="/IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.12.RELEASE/com.springsource.org.aspectj.runtime-sources-1.6.12.RELEASE.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi.services/3.3.0.v20120307-2102/org.eclipse.osgi.services-3.3.0.v20120307-2102.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi.services/3.3.0.v20120307-2102/org.eclipse.osgi.services-sources-3.3.0.v20120307-2102.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.8.1.v20120830-144521/org.eclipse.osgi-3.8.1.v20120830-144521.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.8.1.v20120830-144521/org.eclipse.osgi.source-3.8.1.v20120830-144521.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.6.0.RELEASE/org.eclipse.virgo.util.common-3.6.0.RELEASE.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.RELEASE/org.eclipse.virgo.util.io-3.6.0.RELEASE.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.6.0.RELEASE/org.eclipse.virgo.util.osgi-3.6.0.RELEASE.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.6.0.RELEASE/org.eclipse.virgo.util.osgi.manifest-3.6.0.RELEASE.jar" sourcepath="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.6.0.RELEASE/org.eclipse.virgo.util.osgi.manifest-sources-3.6.0.RELEASE.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.6.0.RELEASE/org.eclipse.virgo.util.parser.manifest-3.6.0.RELEASE.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi.services/3.4.0.v20140312-2051/org.eclipse.osgi.services-3.4.0.v20140312-2051.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi.services/3.4.0.v20140312-2051/org.eclipse.osgi.services-sources-3.4.0.v20140312-2051.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.10.0.v20140606-1445/org.eclipse.osgi-3.10.0.v20140606-1445.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.10.0.v20140606-1445/org.eclipse.osgi.source-3.10.0.v20140606-1445.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.7.0.BUILD-20150105070106/org.eclipse.virgo.util.common-3.7.0.BUILD-20150105070106.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.7.0.BUILD-20150105070106/org.eclipse.virgo.util.io-3.7.0.BUILD-20150105070106.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.7.0.BUILD-20150105070106/org.eclipse.virgo.util.osgi-3.7.0.BUILD-20150105070106.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.7.0.BUILD-20150105070106/org.eclipse.virgo.util.osgi.manifest-3.7.0.BUILD-20150105070106.jar" sourcepath="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.7.0.BUILD-20150105070106/org.eclipse.virgo.util.osgi.manifest-sources-3.7.0.BUILD-20150105070106.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.7.0.BUILD-20150105070106/org.eclipse.virgo.util.parser.manifest-3.7.0.BUILD-20150105070106.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

diff --git a/org.eclipse.gemini.web.extender/.classpath b/org.eclipse.gemini.web.extender/.classpath
index a8bd987..b93d22d 100644
--- a/org.eclipse.gemini.web.extender/.classpath
+++ b/org.eclipse.gemini.web.extender/.classpath

@@ -22,9 +22,9 @@
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.gemini.web.core"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.8.1.v20120830-144521/org.eclipse.osgi-3.8.1.v20120830-144521.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.8.1.v20120830-144521/org.eclipse.osgi.source-3.8.1.v20120830-144521.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.10.0.v20140606-1445/org.eclipse.osgi-3.10.0.v20140606-1445.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.10.0.v20140606-1445/org.eclipse.osgi.source-3.10.0.v20140606-1445.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/javax.servlet/javax.servlet/3.0.0.v201103241009/javax.servlet-3.0.0.v201103241009.jar" sourcepath="/IVY_CACHE/javax.servlet/javax.servlet/3.0.0.v201103241009/javax.servlet-sources-3.0.0.v201103241009.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.stubs/3.6.0.RELEASE/org.eclipse.virgo.test.stubs-3.6.0.RELEASE.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.stubs/3.6.0.RELEASE/org.eclipse.virgo.test.stubs-sources-3.6.0.RELEASE.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.stubs/3.7.0.BUILD-20150104200311/org.eclipse.virgo.test.stubs-3.7.0.BUILD-20150104200311.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.stubs/3.7.0.BUILD-20150104200311/org.eclipse.virgo.test.stubs-sources-3.7.0.BUILD-20150104200311.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.5.0/com.springsource.org.junit-sources-4.5.0.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.slf4j.api/1.7.2.v20121108-1250/org.slf4j.api-1.7.2.v20121108-1250.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.slf4j.api/1.7.2.v20121108-1250/org.slf4j.api-sources-1.7.2.v20121108-1250.jar"/>

diff --git a/org.eclipse.gemini.web.test/.classpath b/org.eclipse.gemini.web.test/.classpath
index 1157b7f..3947afa 100644
--- a/org.eclipse.gemini.web.test/.classpath
+++ b/org.eclipse.gemini.web.test/.classpath

@@ -6,12 +6,12 @@
 	<classpathentry excluding=".gitignore" kind="src" path="src/main/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.5.0/com.springsource.org.junit-sources-4.5.0.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.8.1.v20120830-144521/org.eclipse.osgi-3.8.1.v20120830-144521.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.8.1.v20120830-144521/org.eclipse.osgi.source_3.8.1.v20120830-144521.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.6.0.RELEASE/org.eclipse.virgo.util.osgi-3.6.0.RELEASE.jar" sourcepath="/IVY_CACHE/org.eclispe.virgo.util/org.eclipse.virgo.util.osgi/3.6.0.RELEASE/org.eclipse.virgo.util.osgi-sources-3.6.0.RELEASE.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.6.0.RELEASE/org.eclipse.virgo.util.osgi.manifest-3.6.0.RELEASE.jar" sourcepath="/IVY_CACHE/org.eclispe.virgo.util/org.eclipse.virgo.util.osgi/3.6.0.RELEASE/org.eclipse.virgo.util.osgi-sources-3.6.0.RELEASE.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.6.0.RELEASE/org.eclipse.virgo.util.common-3.6.0.RELEASE.jar" sourcepath="/IVY_CACHE/org.eclispe.virgo.util/org.eclipse.virgo.util.common/3.6.0.RELEASE/org.eclipse.virgo.util.common-sources-3.6.0.RELEASE.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.launcher/3.6.0.RELEASE/org.eclipse.virgo.util.parser.launcher-3.6.0.RELEASE.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.launcher/3.6.0.RELEASE/org.eclipse.virgo.test.launcher-3.6.0.RELEASE.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.10.0.v20140606-1445/org.eclipse.osgi-3.10.0.v20140606-1445.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.10.0.v20140606-1445/org.eclipse.osgi.source-3.10.0.v20140606-1445.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.7.0.BUILD-20150105070106/org.eclipse.virgo.util.osgi-3.7.0.BUILD-20150105070106.jar" sourcepath="/IVY_CACHE/org.eclispe.virgo.util/org.eclipse.virgo.util.osgi/3.7.0.BUILD-20150105070106/org.eclipse.virgo.util.osgi-sources-3.7.0.BUILD-20150105070106.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.7.0.BUILD-20150105070106/org.eclipse.virgo.util.osgi.manifest-3.7.0.BUILD-20150105070106.jar" sourcepath="/IVY_CACHE/org.eclispe.virgo.util/org.eclipse.virgo.util.osgi/3.7.0.BUILD-20150105070106/org.eclipse.virgo.util.osgi-sources-3.7.0.BUILD-20150105070106.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.7.0.BUILD-20150105070106/org.eclipse.virgo.util.common-3.7.0.BUILD-20150105070106.jar" sourcepath="/IVY_CACHE/org.eclispe.virgo.util/org.eclipse.virgo.util.common/3.7.0.BUILD-20150105070106/org.eclipse.virgo.util.common-sources-3.7.0.BUILD-20150105070106.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.launcher/3.7.0.BUILD-20150105070106/org.eclipse.virgo.util.parser.launcher-3.7.0.BUILD-20150105070106.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.launcher/3.7.0.BUILD-20150104200311/org.eclipse.virgo.test.launcher-3.7.0.BUILD-20150104200311.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.slf4j.api/1.7.2.v20121108-1250/org.slf4j.api-1.7.2.v20121108-1250.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.slf4j.api/1.7.2.v20121108-1250/org.slf4j.api-sources-1.7.2.v20121108-1250.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina/7.0.55.v201409050650/org.apache.catalina-7.0.55.v201409050650.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina/7.0.55.v201409050650/org.apache.catalina.source-7.0.55.v201409050650.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.juli.extras/7.0.55.v201409050650/org.apache.juli.extras-7.0.55.v201409050650.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.juli.extras/7.0.55.v201409050650/org.apache.juli.extras.source-7.0.55.v201409050650.jar"/>
@@ -22,7 +22,7 @@
 	<classpathentry kind="var" path="IVY_CACHE/javax.servlet/javax.servlet/3.0.0.v201103241009/javax.servlet-3.0.0.v201103241009.jar" sourcepath="/IVY_CACHE/javax.servlet/javax.servlet/3.0.0.v201103241009/javax.servlet-sources-3.0.0.v201103241009.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.gemini.web.tomcat"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/3.6.0.RELEASE/org.eclipse.virgo.test.framework-3.6.0.RELEASE.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/3.6.0.RELEASE/org.eclipse.virgo.test.framework-sources-3.6.0.RELEASE.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/3.7.0.BUILD-20150104200311/org.eclipse.virgo.test.framework-3.7.0.BUILD-20150104200311.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/3.7.0.BUILD-20150104200311/org.eclipse.virgo.test.framework-sources-3.7.0.BUILD-20150104200311.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.gemini.web.core"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

diff --git a/org.eclipse.gemini.web.test/src/test/resources/META-INF/test.config.properties b/org.eclipse.gemini.web.test/src/test/resources/META-INF/test.config.properties
index d928c7a..414b700 100644
--- a/org.eclipse.gemini.web.test/src/test/resources/META-INF/test.config.properties
+++ b/org.eclipse.gemini.web.test/src/test/resources/META-INF/test.config.properties

@@ -36,7 +36,7 @@
 
 org.eclipse.virgo.test.properties.include=file:../build.versions,file:../user-ivy.properties
 
-osgi.java.profile=file:src/test/resources/java6-server.profile
+osgi.java.profile=file:src/test/resources/java7-server.profile
 osgi.java.profile.bootdelegation=override
 osgi.parentClassloader=fwk
 osgi.context.bootdelegation=false

diff --git a/org.eclipse.gemini.web.test/src/test/resources/java6-server.profile b/org.eclipse.gemini.web.test/src/test/resources/java7-server.profile
similarity index 72%
rename from org.eclipse.gemini.web.test/src/test/resources/java6-server.profile
rename to org.eclipse.gemini.web.test/src/test/resources/java7-server.profile
index 2c04c0e..b1eec8c 100644
--- a/org.eclipse.gemini.web.test/src/test/resources/java6-server.profile
+++ b/org.eclipse.gemini.web.test/src/test/resources/java7-server.profile

@@ -1,15 +1,8 @@
 org.osgi.framework.system.packages = \
- com.sun.org.apache.xalan.internal.res,\
- com.sun.org.apache.xml.internal.utils,\
- com.sun.org.apache.xpath.internal,\
- com.sun.org.apache.xpath.internal.jaxp,\
- com.sun.org.apache.xpath.internal.objects,\
  javax.accessibility,\
  javax.activation,\
- javax.activation;version="1.1.1",\
  javax.activity,\
  javax.annotation,\
- javax.annotation;version="1.0.0",\
  javax.annotation.processing,\
  javax.crypto,\
  javax.crypto.interfaces,\
@@ -22,9 +15,7 @@
  javax.imageio.spi,\
  javax.imageio.stream,\
  javax.jws,\
- javax.jws;version="2.0",\
  javax.jws.soap,\
- javax.jws.soap;version="2.0",\
  javax.lang.model,\
  javax.lang.model.element,\
  javax.lang.model.type,\
@@ -53,7 +44,6 @@
  javax.rmi.CORBA,\
  javax.rmi.ssl,\
  javax.script,\
- javax.script;version="1.1",\
  javax.security.auth,\
  javax.security.auth.callback,\
  javax.security.auth.kerberos,\
@@ -79,6 +69,7 @@
  javax.swing.plaf.basic,\
  javax.swing.plaf.metal,\
  javax.swing.plaf.multi,\
+ javax.swing.plaf.nimbus,\
  javax.swing.plaf.synth,\
  javax.swing.table,\
  javax.swing.text,\
@@ -89,48 +80,28 @@
  javax.swing.undo,\
  javax.tools,\
  javax.transaction,\
- javax.transaction;version="1.0.1",\
  javax.transaction;version="1.1.0",\
  javax.transaction.xa,\
- javax.transaction.xa;version="1.0.1",\
- javax.transaction.xa;version="1.1.0",\
  javax.xml,\
- javax.xml;version="1.0.1",\
  javax.xml.bind,\
- javax.xml.bind;version="2.0",\
  javax.xml.bind.annotation,\
- javax.xml.bind.annotation;version="2.0",\
  javax.xml.bind.annotation.adapters,\
- javax.xml.bind.annotation.adapters;version="2.0",\
  javax.xml.bind.attachment,\
- javax.xml.bind.attachment;version="2.0",\
  javax.xml.bind.helpers,\
- javax.xml.bind.helpers;version="2.0",\
  javax.xml.bind.util,\
- javax.xml.bind.util;version="2.0",\
  javax.xml.crypto,\
- javax.xml.crypto;version="1.0",\
  javax.xml.crypto.dom,\
- javax.xml.crypto.dom;version="1.0",\
  javax.xml.crypto.dsig,\
- javax.xml.crypto.dsig;version="1.0",\
  javax.xml.crypto.dsig.dom,\
- javax.xml.crypto.dsig.dom;version="1.0",\
  javax.xml.crypto.dsig.keyinfo,\
- javax.xml.crypto.dsig.keyinfo;version="1.0",\
  javax.xml.crypto.dsig.spec,\
- javax.xml.crypto.dsig.spec;version="1.0",\
  javax.xml.datatype,\
  javax.xml.namespace,\
  javax.xml.parsers,\
  javax.xml.soap,\
- javax.xml.soap;version="1.3.0",\
  javax.xml.stream,\
- javax.xml.stream;version="1.0.1",\
  javax.xml.stream.events,\
- javax.xml.stream.events;version="1.0.1",\
  javax.xml.stream.util,\
- javax.xml.stream.util;version="1.0.1",\
  javax.xml.transform,\
  javax.xml.transform.dom,\
  javax.xml.transform.sax,\
@@ -138,17 +109,13 @@
  javax.xml.transform.stream,\
  javax.xml.validation,\
  javax.xml.ws,\
- javax.xml.ws;version="2.1.1",\
  javax.xml.ws.handler,\
- javax.xml.ws.handler;version="2.1.1",\
  javax.xml.ws.handler.soap,\
- javax.xml.ws.handler.soap;version="2.1.1",\
  javax.xml.ws.http,\
- javax.xml.ws.http;version="2.1.1",\
  javax.xml.ws.soap,\
- javax.xml.ws.soap;version="2.1.1",\
  javax.xml.ws.spi,\
- javax.xml.ws.spi;version="2.1.1",\
+ javax.xml.ws.spi.http,\
+ javax.xml.ws.wsaddressing,\
  javax.xml.xpath,\
  org.ietf.jgss,\
  org.omg.CORBA,\
@@ -188,22 +155,38 @@
  org.w3c.dom.ranges,\
  org.w3c.dom.stylesheets,\
  org.w3c.dom.traversal,\
- org.w3c.dom.views ,\
+ org.w3c.dom.views,\
+ org.w3c.dom.xpath,\
  org.xml.sax,\
  org.xml.sax.ext,\
  org.xml.sax.helpers
 org.osgi.framework.bootdelegation = \
- com.sun.*,\
- javax.xml.*,\
- org.apache.xerces.jaxp.*,\
+ javax.*,\
+ org.ietf.jgss,\
+ org.omg.*,\
  org.w3c.*,\
  org.xml.*,\
- sun.*
+ sun.*,\
+ com.sun.*
 org.osgi.framework.executionenvironment = \
  OSGi/Minimum-1.0,\
  OSGi/Minimum-1.1,\
+ OSGi/Minimum-1.2,\
+ JRE-1.1,\
+ J2SE-1.2,\
  J2SE-1.3,\
  J2SE-1.4,\
  J2SE-1.5,\
- JavaSE-1.6
-osgi.java.profile.name = Virgo-Kernel-Java6
+ JavaSE-1.6,\
+ JavaSE-1.7
+org.osgi.framework.system.capabilities = \
+ osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0, 1.1, 1.2",\
+ osgi.ee; osgi.ee="JRE"; version:List<Version>="1.0, 1.1",\
+ osgi.ee; osgi.ee="JavaSE"; version:List<Version>="1.0, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7"
+osgi.java.profile.name = JavaSE-1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

diff --git a/org.eclipse.gemini.web.tomcat/.classpath b/org.eclipse.gemini.web.tomcat/.classpath
index bd03038..0a2f1e3 100644
--- a/org.eclipse.gemini.web.tomcat/.classpath
+++ b/org.eclipse.gemini.web.tomcat/.classpath

@@ -22,9 +22,9 @@
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.5.0/com.springsource.org.junit-sources-4.5.0.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.8.1.v20120830-144521/org.eclipse.osgi-3.8.1.v20120830-144521.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.8.1.v20120830-144521/org.eclipse.osgi-sources-3.8.1.v20120830-144521.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.6.0.RELEASE/org.eclipse.virgo.util.osgi-3.6.0.RELEASE.jar" sourcepath="/IVY_CACHE/org.eclispe.virgo.util/org.eclipse.virgo.util.osgi/3.6.0.RELEASE/org.eclipse.virgo.util.osgi-sources-3.6.0.RELEASE.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.6.0.RELEASE/org.eclipse.virgo.util.common-3.6.0.RELEASE.jar" sourcepath="/IVY_CACHE/org.eclispe.virgo.util/org.eclipse.virgo.util.common/3.6.0.RELEASE/org.eclipse.virgo.util.common-sources-3.6.0.RELEASE.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.10.0.v20140606-1445/org.eclipse.osgi-3.10.0.v20140606-1445.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.10.0.v20140606-1445/org.eclipse.osgi.source-3.10.0.v20140606-1445.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.7.0.BUILD-20150105070106/org.eclipse.virgo.util.osgi-3.7.0.BUILD-20150105070106.jar" sourcepath="/IVY_CACHE/org.eclispe.virgo.util/org.eclipse.virgo.util.osgi/3.7.0.BUILD-20150105070106/org.eclipse.virgo.util.osgi-sources-3.7.0.BUILD-20150105070106.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.7.0.BUILD-20150105070106/org.eclipse.virgo.util.common-3.7.0.BUILD-20150105070106.jar" sourcepath="/IVY_CACHE/org.eclispe.virgo.util/org.eclipse.virgo.util.common/3.7.0.BUILD-20150105070106/org.eclipse.virgo.util.common-sources-3.7.0.BUILD-20150105070106.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.slf4j.api/1.7.2.v20121108-1250/org.slf4j.api-1.7.2.v20121108-1250.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.slf4j.api/1.7.2.v20121108-1250/org.slf4j.api-sources-1.7.2.v20121108-1250.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina/7.0.55.v201409050650/org.apache.catalina-7.0.55.v201409050650.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.catalina/7.0.55.v201409050650/org.apache.catalina.source-7.0.55.v201409050650.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.juli.extras/7.0.55.v201409050650/org.apache.juli.extras-7.0.55.v201409050650.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.juli.extras/7.0.55.v201409050650/org.apache.juli.extras.source-7.0.55.v201409050650.jar"/>
@@ -39,6 +39,6 @@
 	<classpathentry kind="var" path="IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.gemini.web.core"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/javax.el/2.2.0.v201108011116/javax.el-2.2.0.v201108011116.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/javax.el/2.2.0.v201108011116/javax.el.source-2.2.0.v201108011116.jar"/>
-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.stubs/3.6.0.RELEASE/org.eclipse.virgo.test.stubs-3.6.0.RELEASE.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.stubs/3.6.0.RELEASE/org.eclipse.virgo.test.stubs-sources-3.6.0.RELEASE.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.stubs/3.7.0.BUILD-20150104200311/org.eclipse.virgo.test.stubs-3.7.0.BUILD-20150104200311.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.stubs/3.7.0.BUILD-20150104200311/org.eclipse.virgo.test.stubs-sources-3.7.0.BUILD-20150104200311.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

diff --git a/org.eclipse.gemini.web.tomcat/src/main/java/org/eclipse/gemini/web/tomcat/internal/support/EquinoxBundleFileResolver.java b/org.eclipse.gemini.web.tomcat/src/main/java/org/eclipse/gemini/web/tomcat/internal/support/EquinoxBundleFileResolver.java
index 1957731..2911ab5 100644
--- a/org.eclipse.gemini.web.tomcat/src/main/java/org/eclipse/gemini/web/tomcat/internal/support/EquinoxBundleFileResolver.java
+++ b/org.eclipse.gemini.web.tomcat/src/main/java/org/eclipse/gemini/web/tomcat/internal/support/EquinoxBundleFileResolver.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2014 VMware Inc.
+ * Copyright (c) 2009, 2015 VMware Inc.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -18,11 +18,10 @@
 
 import java.io.File;
 
-import org.eclipse.osgi.baseadaptor.BaseData;
-import org.eclipse.osgi.baseadaptor.bundlefile.BundleEntry;
-import org.eclipse.osgi.baseadaptor.bundlefile.BundleFile;
-import org.eclipse.osgi.framework.adaptor.BundleData;
-import org.eclipse.osgi.framework.internal.core.BundleHost;
+import org.eclipse.osgi.internal.framework.EquinoxBundle;
+import org.eclipse.osgi.storage.BundleInfo.Generation;
+import org.eclipse.osgi.storage.bundlefile.BundleEntry;
+import org.eclipse.osgi.storage.bundlefile.BundleFile;
 import org.osgi.framework.Bundle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -58,7 +57,7 @@
 
     public static boolean canUse() {
         try {
-            EquinoxBundleFileResolver.class.getClassLoader().loadClass(BundleHost.class.getName());
+            EquinoxBundleFileResolver.class.getClassLoader().loadClass(EquinoxBundle.class.getName());
             return true;
         } catch (Exception | LinkageError _) {
             return false;
@@ -66,12 +65,10 @@
     }
 
     private BundleFile getBundleFile(Bundle bundle) {
-        if (bundle instanceof BundleHost) {
-            BundleHost bh = (BundleHost) bundle;
-            BundleData bundleData = bh.getBundleData();
-            if (bundleData instanceof BaseData) {
-                return ((BaseData) bundleData).getBundleFile();
-            }
+        if (bundle instanceof EquinoxBundle) {
+            EquinoxBundle eb = (EquinoxBundle) bundle;
+            Generation current = (Generation) eb.getModule().getCurrentRevision().getRevisionInfo();
+            return current.getBundleFile();
         }
         return null;
     }

diff --git a/test-bundles/customizer-bundle/.classpath b/test-bundles/customizer-bundle/.classpath
index b510ea9..0283b26 100755
--- a/test-bundles/customizer-bundle/.classpath
+++ b/test-bundles/customizer-bundle/.classpath

@@ -3,7 +3,7 @@
 	<classpathentry kind="src" path="src/main/java"/>

 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>

 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.tomcat.api/7.0.55.v201409050650/org.apache.tomcat.api-7.0.55.v201409050650.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.tomcat.api/7.0.55.v201409050650/org.apache.tomcat.api.source-7.0.55.v201409050650.jar"/>

-	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.8.1.v20120830-144521/org.eclipse.osgi-3.8.1.v20120830-144521.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.8.1.v20120830-144521/org.eclipse.osgi-sources-3.8.1.v20120830-144521.jar"/>

+	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.10.0.v20140606-1445/org.eclipse.osgi-3.10.0.v20140606-1445.jar" sourcepath="/IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.10.0.v20140606-1445/org.eclipse.osgi.source-3.10.0.v20140606-1445.jar"/>

 	<classpathentry kind="var" path="IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.web.tomcat/2.2.0.M02/org.eclipse.gemini.web.tomcat-2.2.0.M02.jar" sourcepath="/IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.web.tomcat/2.2.0.M02/org.eclipse.gemini.web.tomcat-sources-2.2.0.M02.jar"/>

 	<classpathentry kind="var" path="IVY_CACHE/javax.servlet/javax.servlet/3.0.0.v201103241009/javax.servlet-3.0.0.v201103241009.jar" sourcepath="/IVY_CACHE/javax.servlet/javax.servlet/3.0.0.v201103241009/javax.servlet-sources-3.0.0.v201103241009.jar"/>

 	<classpathentry kind="output" path="target"/>


diff --git a/test-bundles/customizer-bundle/src/main/java/org/eclipse/gemini/web/BundleJarScanner.java b/test-bundles/customizer-bundle/src/main/java/org/eclipse/gemini/web/BundleJarScanner.java
index f89cef1..4b5f6e7 100755
--- a/test-bundles/customizer-bundle/src/main/java/org/eclipse/gemini/web/BundleJarScanner.java
+++ b/test-bundles/customizer-bundle/src/main/java/org/eclipse/gemini/web/BundleJarScanner.java

@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2012, 2014 SAP AG

+ * Copyright (c) 2012, 2015 SAP AG

  *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

@@ -28,10 +28,9 @@
 

 import org.apache.tomcat.JarScanner;

 import org.apache.tomcat.JarScannerCallback;

-import org.eclipse.osgi.baseadaptor.BaseData;

-import org.eclipse.osgi.baseadaptor.bundlefile.BundleFile;

-import org.eclipse.osgi.framework.adaptor.BundleData;

-import org.eclipse.osgi.framework.internal.core.BundleHost;

+import org.eclipse.osgi.internal.framework.EquinoxBundle;

+import org.eclipse.osgi.storage.BundleInfo.Generation;

+import org.eclipse.osgi.storage.bundlefile.BundleFile;

 import org.osgi.framework.Bundle;

 import org.osgi.framework.FrameworkUtil;

 

@@ -120,12 +119,10 @@
     }

 

     private BundleFile getBundleFile(Bundle bundle) {

-        if (bundle instanceof BundleHost) {

-            BundleHost bh = (BundleHost) bundle;

-            BundleData bundleData = bh.getBundleData();

-            if (bundleData instanceof BaseData) {

-                return ((BaseData) bundleData).getBundleFile();

-            }

+        if (bundle instanceof EquinoxBundle) {

+            EquinoxBundle eb = (EquinoxBundle) bundle;

+            Generation current = (Generation) eb.getModule().getCurrentRevision().getRevisionInfo();

+            return current.getBundleFile();

         }

         return null;

     }


diff --git a/test-bundles/customizer-bundle/src/main/resources/META-INF/MANIFEST.MF b/test-bundles/customizer-bundle/src/main/resources/META-INF/MANIFEST.MF
index a33c08a..6916b68 100755
--- a/test-bundles/customizer-bundle/src/main/resources/META-INF/MANIFEST.MF
+++ b/test-bundles/customizer-bundle/src/main/resources/META-INF/MANIFEST.MF

@@ -7,10 +7,10 @@
  org.osgi.framework,
  javax.servlet,
  javax.servlet.http,
- org.eclipse.osgi.baseadaptor,
- org.eclipse.osgi.baseadaptor.bundlefile,
- org.eclipse.osgi.framework.adaptor,
- org.eclipse.osgi.framework.internal.core
+ org.eclipse.osgi.container,
+ org.eclipse.osgi.internal.framework,
+ org.eclipse.osgi.storage.bundlefile,
+ org.eclipse.osgi.storage
 Bundle-Activator: org.eclipse.gemini.web.Activator