Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Frost2012-02-29 09:20:36 -0500
committerChristopher Frost2012-02-29 09:20:36 -0500
commit9995a2b5f9b1669c8ed9e9f945d97789c263579c (patch)
treeb3b112fd755dff5305170e5033c98feae5ee6fbd /org.eclipse.virgo.kernel.deployer.test
parent907c6861c6296bb2c4c30a2408286f9157f23ec9 (diff)
downloadorg.eclipse.virgo.kernel-9995a2b5f9b1669c8ed9e9f945d97789c263579c.tar.gz
org.eclipse.virgo.kernel-9995a2b5f9b1669c8ed9e9f945d97789c263579c.tar.xz
org.eclipse.virgo.kernel-9995a2b5f9b1669c8ed9e9f945d97789c263579c.zip
Fixes to get the kernel build to pass
Diffstat (limited to 'org.eclipse.virgo.kernel.deployer.test')
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/.classpath2
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/java-profile/java6-server.profile6
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/no.heap.dump.test.config.properties2
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/spring256.test.config.properties2
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/test.config.properties2
5 files changed, 8 insertions, 6 deletions
diff --git a/org.eclipse.virgo.kernel.deployer.test/.classpath b/org.eclipse.virgo.kernel.deployer.test/.classpath
index cd7d38b7..3d947573 100644
--- a/org.eclipse.virgo.kernel.deployer.test/.classpath
+++ b/org.eclipse.virgo.kernel.deployer.test/.classpath
@@ -19,7 +19,7 @@
<classpathentry kind="src" path="/org.eclipse.virgo.kernel.deployer"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/com.mchange.c3p0/com.springsource.com.mchange.v2.c3p0/0.9.1.2/com.springsource.com.mchange.v2.c3p0-0.9.1.2.jar" sourcepath="/KERNEL_IVY_CACHE/com.mchange.c3p0/com.springsource.com.mchange.v2.c3p0/0.9.1.2/com.springsource.com.mchange.v2.c3p0-sources-0.9.1.2.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/com.oracle.toplink.essentials/com.springsource.oracle.toplink.essentials/2.0.0.b41-beta2/com.springsource.oracle.toplink.essentials-2.0.0.b41-beta2.jar" sourcepath="/KERNEL_IVY_CACHE/com.oracle.toplink.essentials/com.springsource.oracle.toplink.essentials/2.0.0.b41-beta2/com.springsource.oracle.toplink.essentials-sources-2.0.0.b41-beta2.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.weaver/1.6.6.RELEASE/com.springsource.org.aspectj.weaver-1.6.6.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.weaver/1.6.6.RELEASE/com.springsource.org.aspectj.weaver-sources-1.6.6.RELEASE.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.weaver/1.6.12.RELEASE/com.springsource.org.aspectj.weaver-1.6.12.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.weaver/1.6.12.RELEASE/com.springsource.org.aspectj.weaver-sources-1.6.12.RELEASE.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.hsqldb/com.springsource.org.hsqldb/1.8.0.9/com.springsource.org.hsqldb-1.8.0.9.jar" sourcepath="/KERNEL_IVY_CACHE/org.hsqldb/com.springsource.org.hsqldb/1.8.0.9/com.springsource.org.hsqldb-sources-1.8.0.9.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/KERNEL_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/>
<classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.beans/3.0.5.RELEASE/org.springframework.beans-3.0.5.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.beans/3.0.5.RELEASE/org.springframework.beans-sources-3.0.5.RELEASE.jar"/>
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/java-profile/java6-server.profile b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/java-profile/java6-server.profile
index 72c7529e..7cf885b1 100644
--- a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/java-profile/java6-server.profile
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/java-profile/java6-server.profile
@@ -145,6 +145,10 @@ org.osgi.framework.system.packages = \
javax.xml.ws.spi,\
javax.xml.ws.spi;version="2.1.1",\
javax.xml.xpath,\
+ org.eclipse.virgo.osgi.extensions.equinox;version="3.5.0",\
+ org.eclipse.virgo.osgi.extensions.equinox.hooks;version="3.5.0",\
+ org.eclipse.virgo.osgi.launcher;version="3.5.0",\
+ org.eclipse.virgo.osgi.launcher.parser;version="3.5.0",\
org.ietf.jgss,\
org.omg.CORBA,\
org.omg.CORBA_2_3,\
@@ -188,8 +192,6 @@ org.osgi.framework.system.packages = \
org.xml.sax.ext,\
org.xml.sax.helpers
org.osgi.framework.bootdelegation = \
- org.eclipse.virgo.osgi.extensions.*,\
- org.eclipse.virgo.osgi.launcher.*,\
org.eclipse.virgo.kernel.authentication,\
com.sun.*,\
javax.xml.*,\
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/no.heap.dump.test.config.properties b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/no.heap.dump.test.config.properties
index 78f1aa19..cecee728 100644
--- a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/no.heap.dump.test.config.properties
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/no.heap.dump.test.config.properties
@@ -51,7 +51,7 @@ launcher.bundles =\
org.eclipse.virgo.test.properties.include=file:../build.versions,file:../build.properties
#Equinox Configuration
-osgi.parentClassloader=fwk
+osgi.parentClassloader=ext
osgi.context.bootdelegation=false
osgi.compatibility.bootdelegation=false
osgi.clean=true
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/spring256.test.config.properties b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/spring256.test.config.properties
index 108323b5..9ef84d17 100644
--- a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/spring256.test.config.properties
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/spring256.test.config.properties
@@ -51,7 +51,7 @@ launcher.bundles =\
org.eclipse.virgo.test.properties.include=file:../build.versions,file:../build.properties
#Equinox Configuration
-osgi.parentClassloader=fwk
+osgi.parentClassloader=ext
osgi.context.bootdelegation=false
osgi.compatibility.bootdelegation=false
osgi.clean=true
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/test.config.properties b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/test.config.properties
index 18094a19..ab20ff38 100644
--- a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/test.config.properties
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/test.config.properties
@@ -51,7 +51,7 @@ launcher.bundles =\
org.eclipse.virgo.test.properties.include=file:../build.versions,file:../build.properties
#Equinox Configuration
-osgi.parentClassloader=fwk
+osgi.parentClassloader=ext
osgi.context.bootdelegation=false
osgi.compatibility.bootdelegation=false
osgi.clean=true

Back to the top