Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Frost2012-08-17 16:43:09 +0000
committerChristopher Frost2012-08-17 16:43:09 +0000
commit31da1f987715dd0918754c741b3a5d817d39d3e8 (patch)
tree4be3ea0a6b6cebd78f0747c955643b4ec33607bb
parentcc7deae351471df404b8cec53bce2918674499de (diff)
downloadorg.eclipse.virgo.kernel-31da1f987715dd0918754c741b3a5d817d39d3e8.tar.gz
org.eclipse.virgo.kernel-31da1f987715dd0918754c741b3a5d817d39d3e8.tar.xz
org.eclipse.virgo.kernel-31da1f987715dd0918754c741b3a5d817d39d3e8.zip
385314 Consolidate git repos - Fixing the Java 6 profile
-rw-r--r--build-kernel/configuration/org.eclipse.virgo.kernel.userregion.properties1
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/java-profile/java6-server.profile7
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties1
-rw-r--r--org.eclipse.virgo.kernel.test/src/test/resources/META-INF/java-profile/java6-server.profile7
-rw-r--r--org.eclipse.virgo.kernel.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties1
5 files changed, 12 insertions, 5 deletions
diff --git a/build-kernel/configuration/org.eclipse.virgo.kernel.userregion.properties b/build-kernel/configuration/org.eclipse.virgo.kernel.userregion.properties
index a09cffa0..025573c8 100644
--- a/build-kernel/configuration/org.eclipse.virgo.kernel.userregion.properties
+++ b/build-kernel/configuration/org.eclipse.virgo.kernel.userregion.properties
@@ -23,7 +23,6 @@ packageImports =\
org.eclipse.virgo.kernel.model;version="0",\
org.eclipse.virgo.kernel.model.management;version="0",\
org.eclipse.virgo.kernel.module;version="0",\
- org.eclipse.virgo.kernel.equinox.extensions.hooks;version="0",\
org.eclipse.virgo.nano.serviceability;version="0",\
org.eclipse.virgo.nano.serviceability.*;version="0",\
org.eclipse.virgo.kernel.services.work;version="0",\
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 0e391fc6..45be81cd 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
@@ -5,6 +5,7 @@ org.osgi.framework.system.packages = \
javax.activity,\
javax.annotation,\
javax.annotation;version="1.0.0",\
+ javax.annotation;version="1.1.0",\
javax.annotation.processing,\
javax.crypto,\
javax.crypto.interfaces,\
@@ -144,8 +145,11 @@ org.osgi.framework.system.packages = \
javax.xml.ws.soap;version="2.1.1",\
javax.xml.ws.spi,\
javax.xml.ws.spi;version="2.1.1",\
+ javax.xml.ws.wsaddressing;version="2.1.1",\
javax.xml.xpath,\
+ org.eclipse.virgo.kernel.equinox.extensions,\
org.eclipse.virgo.kernel.equinox.extensions;version="3.6.0",\
+ org.eclipse.virgo.kernel.equinox.extensions.hooks,\
org.eclipse.virgo.kernel.equinox.extensions.hooks;version="3.6.0",\
org.ietf.jgss,\
org.omg.CORBA,\
@@ -200,8 +204,9 @@ org.osgi.framework.bootdelegation = \
org.osgi.framework.executionenvironment = \
OSGi/Minimum-1.0,\
OSGi/Minimum-1.1,\
+ J2SE-1.2,\
J2SE-1.3,\
J2SE-1.4,\
J2SE-1.5,\
JavaSE-1.6
-osgi.java.profile.name = Virgo-Kernel-Java6
+osgi.java.profile.name = Virgo-Java6
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties
index 61d0cdca..1a612615 100644
--- a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties
@@ -36,7 +36,6 @@ packageImports =\
org.eclipse.virgo.kernel.model;version="0",\
org.eclipse.virgo.kernel.model.management;version="0",\
org.eclipse.virgo.kernel.module;version="0",\
- org.eclipse.virgo.kernel.equinox.extensions.hooks;version="0",\
org.eclipse.virgo.nano.serviceability;version="0",\
org.eclipse.virgo.nano.serviceability.*;version="0",\
org.eclipse.virgo.kernel.services.work;version="0",\
diff --git a/org.eclipse.virgo.kernel.test/src/test/resources/META-INF/java-profile/java6-server.profile b/org.eclipse.virgo.kernel.test/src/test/resources/META-INF/java-profile/java6-server.profile
index 0e391fc6..45be81cd 100644
--- a/org.eclipse.virgo.kernel.test/src/test/resources/META-INF/java-profile/java6-server.profile
+++ b/org.eclipse.virgo.kernel.test/src/test/resources/META-INF/java-profile/java6-server.profile
@@ -5,6 +5,7 @@ org.osgi.framework.system.packages = \
javax.activity,\
javax.annotation,\
javax.annotation;version="1.0.0",\
+ javax.annotation;version="1.1.0",\
javax.annotation.processing,\
javax.crypto,\
javax.crypto.interfaces,\
@@ -144,8 +145,11 @@ org.osgi.framework.system.packages = \
javax.xml.ws.soap;version="2.1.1",\
javax.xml.ws.spi,\
javax.xml.ws.spi;version="2.1.1",\
+ javax.xml.ws.wsaddressing;version="2.1.1",\
javax.xml.xpath,\
+ org.eclipse.virgo.kernel.equinox.extensions,\
org.eclipse.virgo.kernel.equinox.extensions;version="3.6.0",\
+ org.eclipse.virgo.kernel.equinox.extensions.hooks,\
org.eclipse.virgo.kernel.equinox.extensions.hooks;version="3.6.0",\
org.ietf.jgss,\
org.omg.CORBA,\
@@ -200,8 +204,9 @@ org.osgi.framework.bootdelegation = \
org.osgi.framework.executionenvironment = \
OSGi/Minimum-1.0,\
OSGi/Minimum-1.1,\
+ J2SE-1.2,\
J2SE-1.3,\
J2SE-1.4,\
J2SE-1.5,\
JavaSE-1.6
-osgi.java.profile.name = Virgo-Kernel-Java6
+osgi.java.profile.name = Virgo-Java6
diff --git a/org.eclipse.virgo.kernel.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties b/org.eclipse.virgo.kernel.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties
index 445f7c8a..759c58bb 100644
--- a/org.eclipse.virgo.kernel.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties
+++ b/org.eclipse.virgo.kernel.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties
@@ -38,7 +38,6 @@ packageImports =\
org.eclipse.virgo.kernel.model;version="0",\
org.eclipse.virgo.kernel.model.management;version="0",\
org.eclipse.virgo.kernel.module;version="0",\
- org.eclipse.virgo.kernel.equinox.extensions.hooks;version="0",\
org.eclipse.virgo.nano.serviceability;version="0",\
org.eclipse.virgo.nano.serviceability.*;version="0",\
org.eclipse.virgo.kernel.services.work;version="0",\

Back to the top