Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Powell2010-06-15 09:55:04 -0400
committerSteve Powell2010-06-15 09:55:04 -0400
commit507f62214ddb92af4cd4eb953c5367f9fb88204a (patch)
tree02763a1562bc245cd97d53a4810112585da471b2
parentadce84e6b55bcbe0ca7005a2f4794f5fd3faf467 (diff)
parent6df13253674d8c09befdea066cdc5ebf82017960 (diff)
downloadorg.eclipse.virgo.kernel-507f62214ddb92af4cd4eb953c5367f9fb88204a.tar.gz
org.eclipse.virgo.kernel-507f62214ddb92af4cd4eb953c5367f9fb88204a.tar.xz
org.eclipse.virgo.kernel-507f62214ddb92af4cd4eb953c5367f9fb88204a.zip
Merge branch 'userregion-properties'
-rw-r--r--build-kernel/config/org.eclipse.virgo.kernel.userregion.properties36
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/main/java/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties34
-rw-r--r--org.eclipse.virgo.kernel.test/src/test/resources/config/org.eclipse.virgo.kernel.userregion.properties34
4 files changed, 53 insertions, 53 deletions
diff --git a/build-kernel/config/org.eclipse.virgo.kernel.userregion.properties b/build-kernel/config/org.eclipse.virgo.kernel.userregion.properties
index 8e2f292d..c2342f15 100644
--- a/build-kernel/config/org.eclipse.virgo.kernel.userregion.properties
+++ b/build-kernel/config/org.eclipse.virgo.kernel.userregion.properties
@@ -3,24 +3,24 @@ baseBundles = \
file:lib/org.eclipse.virgo.kernel.osgicommand-@KERNEL.VERSION@.jar@start
packageImports =\
- org.eclipse.virgo.kernel.artifact.*;version="[2.1.0,2.1.1)",\
- org.eclipse.virgo.kernel.core;version="[2.1.0,2.1.1)",\
- org.eclipse.virgo.kernel.deployer.core;version="[2.1.0,2.1.1)",\
- org.eclipse.virgo.kernel.deployer.core.event;version="[2.1.0,2.1.1)",\
- org.eclipse.virgo.kernel.install.*;version="[2.1.0,2.1.1)",\
- org.eclipse.virgo.kernel.osgi.*;version="[2.1.0,2.1.1)",\
- org.eclipse.virgo.kernel.model.management;version="[2.1.0,2.1.1)",\
- org.eclipse.virgo.kernel.module;version="[2.1.0,2.1.1)",\
- org.eclipse.virgo.kernel.serviceability;version="[2.1.0,2.1.1)",\
- org.eclipse.virgo.kernel.serviceability.*;version="[2.1.0,2.1.1)",\
- org.eclipse.virgo.kernel.services.work;version="[2.1.0,2.1.1)",\
- org.eclipse.virgo.kernel.shell;version="[2.1.0,2.1.1)",\
- org.eclipse.virgo.kernel.shell.*;version="[2.1.0,2.1.1)",\
- org.eclipse.virgo.kernel.shim.*;version="[2.1.0,2.1.1)",\
- org.eclipse.virgo.medic.*;version="[1.0,2)",\
- org.eclipse.virgo.repository;version="[2.0,3)",\
- org.eclipse.virgo.repository.*;version="[2.0,3)",\
- org.eclipse.virgo.util.*;version="[2.0,3)",\
+ org.eclipse.virgo.kernel.artifact.*;version="0",\
+ org.eclipse.virgo.kernel.core;version="0",\
+ org.eclipse.virgo.kernel.deployer.core;version="0",\
+ org.eclipse.virgo.kernel.deployer.core.event;version="0",\
+ org.eclipse.virgo.kernel.install.*;version="0",\
+ org.eclipse.virgo.kernel.osgi.*;version="0",\
+ org.eclipse.virgo.kernel.model.management;version="0",\
+ org.eclipse.virgo.kernel.module;version="0",\
+ org.eclipse.virgo.kernel.serviceability;version="0",\
+ org.eclipse.virgo.kernel.serviceability.*;version="0",\
+ org.eclipse.virgo.kernel.services.work;version="0",\
+ org.eclipse.virgo.kernel.shell;version="0",\
+ org.eclipse.virgo.kernel.shell.*;version="0",\
+ org.eclipse.virgo.kernel.shim.*;version="0",\
+ org.eclipse.virgo.medic.*;version="0",\
+ org.eclipse.virgo.repository;version="0",\
+ org.eclipse.virgo.repository.*;version="0",\
+ org.eclipse.virgo.util.*;version="0",\
org.apache.commons.logging;version="[1.0.0,2.0.0)",\
org.apache.commons.logging.impl;version="[1.0.0,2.0.0)",\
org.aspectj.*;version="[1.6.5.RELEASE,2.0.0)",\
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/main/java/META-INF/MANIFEST.MF b/org.eclipse.virgo.kernel.deployer.test/src/main/java/META-INF/MANIFEST.MF
index ebf03da4..ede71e63 100644
--- a/org.eclipse.virgo.kernel.deployer.test/src/main/java/META-INF/MANIFEST.MF
+++ b/org.eclipse.virgo.kernel.deployer.test/src/main/java/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
Bundle-Version: 2.1.0
-Tool: Bundlor 1.0.0.M6
+Tool: Bundlor 1.0.0.RELEASE
Bundle-Name: Virgo Kernel Deployer Test
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.virgo.kernel.deployer.test.loadable
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 9a27a7ad..262faa28 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
@@ -22,23 +22,23 @@ baseBundles =\
file:../ivy-cache/repository/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
packageImports =\
- org.eclipse.virgo.kernel.artifact.*;version="[2.1.0,2.1.1)",\
- org.eclipse.virgo.kernel.core;version="[2.1.0,2.1.1)",\
- org.eclipse.virgo.kernel.deployer.core;version="[2.1.0,2.1.1)",\
- org.eclipse.virgo.kernel.deployer.core.event;version="[2.1.0,2.1.1)",\
- org.eclipse.virgo.kernel.install.*;version="[2.1.0,2.1.1)",\
- org.eclipse.virgo.kernel.osgi.*;version="[2.1.0,2.1.1)",\
- org.eclipse.virgo.kernel.model;version="[2.1.0,2.1.1)",\
- org.eclipse.virgo.kernel.model.management;version="[2.1.0,2.1.1)",\
- org.eclipse.virgo.kernel.module;version="[2.1.0,2.1.1)",\
- org.eclipse.virgo.kernel.serviceability;version="[2.1.0,2.1.1)",\
- org.eclipse.virgo.kernel.serviceability.dump;version="[2.1.0,2.1.1)",\
- org.eclipse.virgo.kernel.serviceability.enforcement;version="[2.1.0,2.1.1)",\
- org.eclipse.virgo.kernel.services.work;version="[2.1.0,2.1.1)",\
- org.eclipse.virgo.kernel.shim.*;version="[2.1.0,2.1.1)",\
- org.eclipse.virgo.medic.*;version="[1.0,2)",\
- org.eclipse.virgo.repository;version="[2.0,3)",\
- org.eclipse.virgo.util.*;version="[2.0,3)",\
+ org.eclipse.virgo.kernel.artifact.*;version="0",\
+ org.eclipse.virgo.kernel.core;version="0",\
+ org.eclipse.virgo.kernel.deployer.core;version="0",\
+ org.eclipse.virgo.kernel.deployer.core.event;version="0",\
+ org.eclipse.virgo.kernel.install.*;version="0",\
+ org.eclipse.virgo.kernel.osgi.*;version="0",\
+ 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.serviceability;version="0",\
+ org.eclipse.virgo.kernel.serviceability.dump;version="0",\
+ org.eclipse.virgo.kernel.serviceability.enforcement;version="0",\
+ org.eclipse.virgo.kernel.services.work;version="0",\
+ org.eclipse.virgo.kernel.shim.*;version="0",\
+ org.eclipse.virgo.medic.*;version="0",\
+ org.eclipse.virgo.repository;version="0",\
+ org.eclipse.virgo.util.*;version="0",\
org.apache.commons.logging;version="[1.0.0,2.0.0)",\
org.aspectj.*;version="[1.6.5.RELEASE,2.0.0)",\
org.junit;version="[4.7.0,5.0.0)",\
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 f6fde4ac..3013c120 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
@@ -16,23 +16,23 @@ baseBundles =\
file:../org.eclipse.virgo.kernel.osgicommand/target/classes@start
packageImports =\
- org.eclipse.virgo.kernel.artifact.*;version="[2.1.0,2.1.1)",\
- org.eclipse.virgo.kernel.core;version="[2.1.0,2.1.1)",\
- org.eclipse.virgo.kernel.deployer.core;version="[2.1.0,2.1.1)",\
- org.eclipse.virgo.kernel.deployer.core.event;version="[2.1.0,2.1.1)",\
- org.eclipse.virgo.kernel.install.*;version="[2.1.0,2.1.1)",\
- org.eclipse.virgo.kernel.osgi.*;version="[2.1.0,2.1.1)",\
- org.eclipse.virgo.kernel.module;version="[2.1.0,2.1.1)",\
- org.eclipse.virgo.kernel.serviceability;version="[2.1.0,2.1.1)",\
- org.eclipse.virgo.kernel.serviceability.dump;version="[2.1.0,2.1.1)",\
- org.eclipse.virgo.kernel.serviceability.enforcement;version="[2.1.0,2.1.1)",\
- org.eclipse.virgo.kernel.services.work;version="[2.1.0,2.1.1)",\
- org.eclipse.virgo.kernel.shell;version="[2.1.0,2.1.1)",\
- org.eclipse.virgo.kernel.shell.*;version="[2.1.0,2.1.1)",\
- org.eclipse.virgo.kernel.shim.*;version="[2.1.0,2.1.1)",\
- org.eclipse.virgo.medic.*;version="[1.0,2)",\
- org.eclipse.virgo.repository;version="[2.0,3)",\
- org.eclipse.virgo.util.*;version="[2.0,3)",\
+ org.eclipse.virgo.kernel.artifact.*;version="0",\
+ org.eclipse.virgo.kernel.core;version="0",\
+ org.eclipse.virgo.kernel.deployer.core;version="0",\
+ org.eclipse.virgo.kernel.deployer.core.event;version="0",\
+ org.eclipse.virgo.kernel.install.*;version="0",\
+ org.eclipse.virgo.kernel.osgi.*;version="0",\
+ org.eclipse.virgo.kernel.module;version="0",\
+ org.eclipse.virgo.kernel.serviceability;version="0",\
+ org.eclipse.virgo.kernel.serviceability.dump;version="0",\
+ org.eclipse.virgo.kernel.serviceability.enforcement;version="0",\
+ org.eclipse.virgo.kernel.services.work;version="0",\
+ org.eclipse.virgo.kernel.shell;version="0",\
+ org.eclipse.virgo.kernel.shell.*;version="0",\
+ org.eclipse.virgo.kernel.shim.*;version="0",\
+ org.eclipse.virgo.medic.*;version="0",\
+ org.eclipse.virgo.repository;version="0",\
+ org.eclipse.virgo.util.*;version="0",\
org.apache.commons.logging;version="[1.0.0,2.0.0)",\
org.aspectj.*;version="[1.6.5.RELEASE,2.0.0)",\
org.junit;version="[4.7.0,5.0.0)",\

Back to the top