Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBorislav Kapukaranov2012-08-20 15:00:44 +0000
committerBorislav Kapukaranov2012-08-20 15:00:44 +0000
commitbf685e7acea0071c02a45f6a1981efdc37004f9e (patch)
treea987bb209caf30132edd0761ea839fe39f4ed243 /org.eclipse.virgo.kernel.test/src/test
parent52a46f87b3ada31fabe96bb1ff46b885e3bb3682 (diff)
parent43b54959cdf73eeff2253d396f68caac036f6c37 (diff)
downloadorg.eclipse.virgo.kernel-bf685e7acea0071c02a45f6a1981efdc37004f9e.tar.gz
org.eclipse.virgo.kernel-bf685e7acea0071c02a45f6a1981efdc37004f9e.tar.xz
org.eclipse.virgo.kernel-bf685e7acea0071c02a45f6a1981efdc37004f9e.zip
Merge branch 'master' of ssh://git.eclipse.org/gitroot/virgo/org.eclipse.virgo.kernel
Conflicts: build.versions org.eclipse.virgo.kernel.agent.dm/.classpath org.eclipse.virgo.kernel.artifact/.classpath org.eclipse.virgo.kernel.deployer.dm/.classpath org.eclipse.virgo.kernel.deployer.test/.classpath org.eclipse.virgo.kernel.deployer/.classpath org.eclipse.virgo.kernel.dmfragment/.classpath org.eclipse.virgo.kernel.model/.classpath org.eclipse.virgo.kernel.osgi/.classpath org.eclipse.virgo.kernel.services/.classpath org.eclipse.virgo.kernel.shell/.classpath org.eclipse.virgo.kernel.stubs/.classpath org.eclipse.virgo.kernel.test/.classpath org.eclipse.virgo.kernel.userregion/.classpath org.eclipse.virgo.kernel.userregionfactory/.classpath
Diffstat (limited to 'org.eclipse.virgo.kernel.test/src/test')
-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
2 files changed, 6 insertions, 2 deletions
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 3ca0f840..d7d9d242 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