Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Frost2012-09-12 12:52:32 -0400
committerChristopher Frost2012-09-12 12:52:32 -0400
commit953602bb77539bac16cf181a0c96ae8293951a99 (patch)
tree5d7712d4ee07c38da2f143b14a5b3a7606559c77
parent3e8fa5c106cc13bf4dce777195b3b83ea01435f4 (diff)
downloadorg.eclipse.virgo.kernel-953602bb77539bac16cf181a0c96ae8293951a99.tar.gz
org.eclipse.virgo.kernel-953602bb77539bac16cf181a0c96ae8293951a99.tar.xz
org.eclipse.virgo.kernel-953602bb77539bac16cf181a0c96ae8293951a99.zip
357102 Masses of test fixes and a new build for the test apps to allow the use of Spring 3.1.0.RELEASE
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/AbstractDeployerIntegrationTest.java2
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/ParDeploymentTests.java2
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/PlanDeploymentWithDAGTests.java6
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/RefreshTests.java16
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/Spring256ABundleTests.java2
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/resources/activator-tccl.jarbin1775 -> 1819 bytes
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/resources/bundle-activation-policy.parbin2558 -> 2612 bytes
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/resources/clashing-exports-in-a-scope-par.parbin0 -> 1718 bytes
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/resources/manual-context.jarbin1834 -> 1843 bytes
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/resources/plan-deployment-dag/simple.bundle.three.jarbin604 -> 595 bytes
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/resources/plan-deployment/simple.bundle.one.jarbin591 -> 592 bytes
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/resources/plan-deployment/simple.bundle.two.jarbin591 -> 593 bytes
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/resources/quartz/quartz.bundle.a.jarbin3578 -> 3595 bytes
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/resources/quartz/quartz.bundle.b.jarbin3579 -> 3594 bytes
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/resources/quartz/quartz.bundle.same1.jarbin3614 -> 3632 bytes
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/resources/quartz/quartz.bundle.same2.jarbin3612 -> 3632 bytes
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/resources/redeploy-refresh/bad/simple.module.jarbin607 -> 609 bytes
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/resources/redeploy-refresh/good/simple.module.jarbin588 -> 590 bytes
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/resources/refresh-import-bundle.parbin4404 -> 4556 bytes
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/resources/refresh.parbin6818 -> 6869 bytes
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/resources/service-publication-from-repo/consumer.jarbin1103 -> 1119 bytes
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/resources/service-publication-from-repo/publisher.jarbin1117 -> 1137 bytes
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/resources/service-scoping/service-scoping-engine-1265.parbin3393 -> 3454 bytes
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/resources/service-scoping/service-scoping-platform-183.parbin2533 -> 2594 bytes
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/resources/service-scoping/service-scoping.parbin4770 -> 4759 bytes
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/resources/spring.256A.sample.jarbin2404 -> 2402 bytes
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/resources/synthetic-tccl/synthetic.tccl.global.jarbin1610 -> 1507 bytes
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/resources/synthetic-tccl/synthetic.tccl.parbin2952 -> 2925 bytes
-rw-r--r--org.eclipse.virgo.kernel.osgi/src/test/resources/.gitignore0
-rw-r--r--org.eclipse.virgo.kernel.osgi/src/test/resources/com/springsource/kernel/osgi/provisioning/tools/IMPORTBUNDLE.MF3
-rw-r--r--org.eclipse.virgo.kernel.osgi/src/test/resources/com/springsource/kernel/osgi/provisioning/tools/IMPORTLIBRARY.MF1
-rw-r--r--org.eclipse.virgo.kernel.osgi/src/test/resources/com/springsource/kernel/osgi/provisioning/tools/IMPORTPACKAGE.MF1
-rw-r--r--org.eclipse.virgo.kernel.osgi/src/test/resources/com/springsource/kernel/osgi/provisioning/tools/IMPORTSYSTEMPACKAGES.MF4
-rw-r--r--org.eclipse.virgo.kernel.osgi/src/test/resources/com/springsource/kernel/osgi/provisioning/tools/IMPORTSYSTEMPACKAGESJAVA6.MF1
-rw-r--r--org.eclipse.virgo.kernel.osgi/src/test/resources/com/springsource/kernel/osgi/provisioning/tools/REQUIREBUNDLE.MF2
-rw-r--r--org.eclipse.virgo.kernel.osgi/src/test/resources/com/springsource/kernel/osgi/provisioning/tools/SATISFIABLEANDUNSATISFIABLE.MF2
-rw-r--r--org.eclipse.virgo.kernel.osgi/src/test/resources/com/springsource/kernel/osgi/provisioning/tools/UNSATISFIABLEIMPORTBUNDLE.MF1
-rw-r--r--org.eclipse.virgo.kernel.osgi/src/test/resources/com/springsource/kernel/osgi/provisioning/tools/UNSATISFIABLEIMPORTLIBRARY.MF1
-rw-r--r--org.eclipse.virgo.kernel.osgi/src/test/resources/com/springsource/kernel/osgi/provisioning/tools/UNSATISFIABLEIMPORTPACKAGE.MF1
-rw-r--r--org.eclipse.virgo.kernel.osgi/src/test/resources/com/springsource/kernel/osgi/provisioning/tools/UNSATISFIABLEREQUIREBUNDLE.MF1
-rw-r--r--org.eclipse.virgo.kernel.osgi/src/test/resources/com/springsource/kernel/osgi/provisioning/tools/org.springframework_spring_2.5.3.libd5
-rw-r--r--org.eclipse.virgo.kernel.test/.classpath55
-rw-r--r--org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/osgi/test/QuasiFrameworkStateDumpIntegrationTests.java5
-rw-r--r--org.eclipse.virgo.shell.command/.classpath116
-rw-r--r--test-apps/activator-tccl/build.properties6
-rw-r--r--test-apps/activator-tccl/build.xml4
-rw-r--r--test-apps/activator-tccl/ivy.xml6
-rw-r--r--test-apps/build.properties6
-rw-r--r--test-apps/build.xml34
-rw-r--r--test-apps/bundle-activation-policy/README.TXT9
-rw-r--r--test-apps/bundle-activation-policy/build-par/build.xml4
-rw-r--r--test-apps/bundle-activation-policy/build.properties6
-rw-r--r--test-apps/bundle-activation-policy/bundle.activation.policy.module.a/build.xml6
-rw-r--r--test-apps/bundle-activation-policy/bundle.activation.policy.module.a/ivy.xml6
-rw-r--r--test-apps/bundle-activation-policy/bundle.activation.policy.module.b/build.xml4
-rw-r--r--test-apps/bundle-activation-policy/bundle.activation.policy.module.b/ivy.xml4
-rw-r--r--test-apps/bundle-update/class.load.after.update/README.TXT11
-rw-r--r--test-apps/bundle-update/class.load.after.update/build.properties6
-rw-r--r--test-apps/bundle-update/class.load.after.update/build.xml31
-rw-r--r--test-apps/bundle-update/class.load.after.update/but.B.after/.classpath6
-rw-r--r--test-apps/bundle-update/class.load.after.update/but.B.after/.project17
-rw-r--r--test-apps/bundle-update/class.load.after.update/but.B.after/build.xml9
-rw-r--r--test-apps/bundle-update/class.load.after.update/but.B.after/ivy.xml25
-rw-r--r--test-apps/bundle-update/class.load.after.update/but.B.after/src/main/java/but/but/A.java16
-rw-r--r--test-apps/bundle-update/class.load.after.update/but.B.after/src/main/java/but/but/B.java22
-rw-r--r--test-apps/bundle-update/class.load.after.update/but.B.after/src/main/java/but/but/I.java17
-rw-r--r--test-apps/bundle-update/class.load.after.update/but.B.after/src/main/resources/META-INF/MANIFEST.MF6
-rw-r--r--test-apps/bundle-update/class.load.after.update/but.B.before/.classpath6
-rw-r--r--test-apps/bundle-update/class.load.after.update/but.B.before/.project17
-rw-r--r--test-apps/bundle-update/class.load.after.update/but.B.before/build.xml9
-rw-r--r--test-apps/bundle-update/class.load.after.update/but.B.before/ivy.xml25
-rw-r--r--test-apps/bundle-update/class.load.after.update/but.B.before/src/main/java/but/but/A.java16
-rw-r--r--test-apps/bundle-update/class.load.after.update/but.B.before/src/main/java/but/but/B.java16
-rw-r--r--test-apps/bundle-update/class.load.after.update/but.B.before/src/main/resources/META-INF/MANIFEST.MF6
-rw-r--r--test-apps/bundle-update/class.load.after.update/but.C/.classpath8
-rw-r--r--test-apps/bundle-update/class.load.after.update/but.C/.project17
-rw-r--r--test-apps/bundle-update/class.load.after.update/but.C/build.xml9
-rw-r--r--test-apps/bundle-update/class.load.after.update/but.C/ivy.xml26
-rw-r--r--test-apps/bundle-update/class.load.after.update/but.C/src/main/java/but/c/C.java46
-rw-r--r--test-apps/bundle-update/class.load.after.update/but.C/src/main/resources/META-INF/MANIFEST.MF7
-rw-r--r--test-apps/deployer-edge-tests/clashing-exports-in-a-scope/README.TXT9
-rw-r--r--test-apps/deployer-edge-tests/clashing-exports-in-a-scope/build-par/build.xml8
-rw-r--r--test-apps/deployer-edge-tests/clashing-exports-in-a-scope/build.properties6
-rw-r--r--test-apps/deployer-edge-tests/clashing-exports-in-a-scope/build.xml18
-rw-r--r--test-apps/deployer-edge-tests/clashing-exports-in-a-scope/c1/build.xml4
-rw-r--r--test-apps/deployer-edge-tests/clashing-exports-in-a-scope/c1/ivy.xml4
-rw-r--r--test-apps/deployer-edge-tests/clashing-exports-in-a-scope/c1/src/main/java/.gitignore0
-rw-r--r--test-apps/deployer-edge-tests/clashing-exports-in-a-scope/c2/build.xml4
-rw-r--r--test-apps/deployer-edge-tests/clashing-exports-in-a-scope/c2/ivy.xml4
-rw-r--r--test-apps/deployer-edge-tests/clashing-exports-in-a-scope/c2/src/main/java/.gitignore0
-rw-r--r--test-apps/manual-context/build.properties6
-rw-r--r--test-apps/manual-context/build.xml4
-rw-r--r--test-apps/manual-context/ivy.xml6
-rw-r--r--test-apps/plan-deployment/build.properties6
-rw-r--r--test-apps/plan-deployment/simple.bundle.one/build.xml2
-rw-r--r--test-apps/plan-deployment/simple.bundle.one/ivy.xml4
-rw-r--r--test-apps/plan-deployment/simple.bundle.three/build.xml2
-rw-r--r--test-apps/plan-deployment/simple.bundle.three/ivy.xml2
-rw-r--r--test-apps/plan-deployment/simple.bundle.two/build.xml4
-rw-r--r--test-apps/plan-deployment/simple.bundle.two/ivy.xml4
-rw-r--r--test-apps/quartz-scheduler/README.TXT21
-rw-r--r--test-apps/quartz-scheduler/build.properties7
-rw-r--r--test-apps/quartz-scheduler/quartz.bundle.a/build.xml4
-rw-r--r--test-apps/quartz-scheduler/quartz.bundle.a/ivy.xml4
-rw-r--r--test-apps/quartz-scheduler/quartz.bundle.a/src/main/resources/META-INF/MANIFEST.MF2
-rw-r--r--test-apps/quartz-scheduler/quartz.bundle.b/build.xml4
-rw-r--r--test-apps/quartz-scheduler/quartz.bundle.b/ivy.xml4
-rw-r--r--test-apps/quartz-scheduler/quartz.bundle.b/src/main/resources/META-INF/MANIFEST.MF2
-rw-r--r--test-apps/quartz-scheduler/quartz.bundle.same1/build.xml4
-rw-r--r--test-apps/quartz-scheduler/quartz.bundle.same1/ivy.xml4
-rw-r--r--test-apps/quartz-scheduler/quartz.bundle.same1/src/main/resources/META-INF/MANIFEST.MF2
-rw-r--r--test-apps/quartz-scheduler/quartz.bundle.same2/build.xml4
-rw-r--r--test-apps/quartz-scheduler/quartz.bundle.same2/ivy.xml4
-rw-r--r--test-apps/quartz-scheduler/quartz.bundle.same2/src/main/resources/META-INF/MANIFEST.MF2
-rw-r--r--test-apps/redeploy-refresh/README.TXT11
-rw-r--r--test-apps/redeploy-refresh/build.properties6
-rw-r--r--test-apps/redeploy-refresh/simple.bundle.bad/build.xml6
-rw-r--r--test-apps/redeploy-refresh/simple.bundle.bad/ivy.xml4
-rw-r--r--test-apps/redeploy-refresh/simple.bundle.bad/src/main/java/.gitignore0
-rw-r--r--test-apps/redeploy-refresh/simple.bundle.ok/build.xml6
-rw-r--r--test-apps/redeploy-refresh/simple.bundle.ok/ivy.xml4
-rw-r--r--test-apps/refresh/README.TXT13
-rw-r--r--test-apps/refresh/refresh-import-bundle/build-par/build.xml4
-rw-r--r--test-apps/refresh/refresh-import-bundle/build.properties6
-rw-r--r--test-apps/refresh/refresh-import-bundle/exporter/build.xml4
-rw-r--r--test-apps/refresh/refresh-import-bundle/exporter/ivy.xml6
-rw-r--r--test-apps/refresh/refresh-import-bundle/importer/build.xml7
-rw-r--r--test-apps/refresh/refresh-import-bundle/importer/ivy.xml2
-rw-r--r--test-apps/refresh/refresh/build-par/build.xml7
-rw-r--r--test-apps/refresh/refresh/build.properties6
-rw-r--r--test-apps/refresh/refresh/exporter/build.xml4
-rw-r--r--test-apps/refresh/refresh/exporter/ivy.xml2
-rw-r--r--test-apps/refresh/refresh/exporter2/build.xml4
-rw-r--r--test-apps/refresh/refresh/exporter2/ivy.xml2
-rw-r--r--test-apps/refresh/refresh/exporter3/build.xml4
-rw-r--r--test-apps/refresh/refresh/exporter3/ivy.xml2
-rw-r--r--test-apps/refresh/refresh/importer/build.xml2
-rw-r--r--test-apps/refresh/refresh/importer/ivy.xml4
-rw-r--r--test-apps/service-publication-from-repo-bundles/README.TXT13
-rw-r--r--test-apps/service-publication-from-repo-bundles/build.properties6
-rw-r--r--test-apps/service-publication-from-repo-bundles/consumer/build.xml4
-rw-r--r--test-apps/service-publication-from-repo-bundles/consumer/ivy.xml4
-rw-r--r--test-apps/service-publication-from-repo-bundles/consumer/src/main/java/.gitignore0
-rw-r--r--test-apps/service-publication-from-repo-bundles/publisher/build.xml4
-rw-r--r--test-apps/service-publication-from-repo-bundles/publisher/ivy.xml4
-rw-r--r--test-apps/service-publication-from-repo-bundles/publisher/src/main/java/.gitignore0
-rw-r--r--test-apps/service-scoping-engine-1265/README.TXT9
-rw-r--r--test-apps/service-scoping-engine-1265/build-par/build.xml4
-rw-r--r--test-apps/service-scoping-engine-1265/build.properties6
-rw-r--r--test-apps/service-scoping-engine-1265/dependent/build.xml4
-rw-r--r--test-apps/service-scoping-engine-1265/dependent/ivy.xml4
-rw-r--r--test-apps/service-scoping-engine-1265/dependent/src/main/java/.gitignore0
-rw-r--r--test-apps/service-scoping-engine-1265/master/build.xml4
-rw-r--r--test-apps/service-scoping-engine-1265/master/ivy.xml4
-rw-r--r--test-apps/service-scoping-engine-1265/master/src/main/java/.gitignore0
-rw-r--r--test-apps/service-scoping-platform-183/README.TXT9
-rw-r--r--test-apps/service-scoping-platform-183/build-par/build.xml4
-rw-r--r--test-apps/service-scoping-platform-183/build.properties6
-rw-r--r--test-apps/service-scoping-platform-183/scoping.service.module.a/build.xml6
-rw-r--r--test-apps/service-scoping-platform-183/scoping.service.module.a/ivy.xml4
-rw-r--r--test-apps/service-scoping-platform-183/scoping.service.module.b/build.xml6
-rw-r--r--test-apps/service-scoping-platform-183/scoping.service.module.b/ivy.xml4
-rw-r--r--test-apps/service-scoping-platform-183/scoping.service.module.b/src/main/java/.gitignore0
-rw-r--r--test-apps/service-scoping/README.TXT13
-rw-r--r--test-apps/service-scoping/build-par/build.xml2
-rw-r--r--test-apps/service-scoping/build.properties6
-rw-r--r--test-apps/service-scoping/scoping.service.global/build.xml2
-rw-r--r--test-apps/service-scoping/scoping.service.global/ivy.xml2
-rw-r--r--test-apps/service-scoping/scoping.service.module.a/build.xml2
-rw-r--r--test-apps/service-scoping/scoping.service.module.a/ivy.xml2
-rw-r--r--test-apps/service-scoping/scoping.service.module.b/build.xml2
-rw-r--r--test-apps/service-scoping/scoping.service.module.b/ivy.xml4
-rw-r--r--test-apps/spring-2.5.6.A-sample/build.properties6
-rw-r--r--test-apps/spring-2.5.6.A-sample/build.xml6
-rw-r--r--test-apps/spring-2.5.6.A-sample/ivy.xml2
-rw-r--r--test-apps/synthetic-tccl/README.TXT13
-rw-r--r--test-apps/synthetic-tccl/build-par/build.xml2
-rw-r--r--test-apps/synthetic-tccl/build.properties5
-rw-r--r--test-apps/synthetic-tccl/synthetic.tccl.bundle.a/build.xml2
-rw-r--r--test-apps/synthetic-tccl/synthetic.tccl.bundle.a/ivy.xml2
-rw-r--r--test-apps/synthetic-tccl/synthetic.tccl.bundle.b/build.xml2
-rw-r--r--test-apps/synthetic-tccl/synthetic.tccl.bundle.b/ivy.xml6
-rw-r--r--test-apps/synthetic-tccl/synthetic.tccl.global/build.xml2
-rw-r--r--test-apps/synthetic-tccl/synthetic.tccl.global/ivy.xml2
184 files changed, 293 insertions, 878 deletions
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/AbstractDeployerIntegrationTest.java b/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/AbstractDeployerIntegrationTest.java
index 232ee128..a0c76c69 100644
--- a/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/AbstractDeployerIntegrationTest.java
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/AbstractDeployerIntegrationTest.java
@@ -43,6 +43,8 @@ public abstract class AbstractDeployerIntegrationTest {
protected final BundleContext context = FrameworkUtil.getBundle(getClass()).getBundleContext();
+ protected static final String TEST_APPS_VERSION = "1.0.0.BUILD-20120912133003";
+
protected volatile OsgiFramework framework;
protected volatile ApplicationDeployer deployer;
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/ParDeploymentTests.java b/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/ParDeploymentTests.java
index 028b0c25..92369904 100644
--- a/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/ParDeploymentTests.java
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/ParDeploymentTests.java
@@ -77,7 +77,7 @@ public class ParDeploymentTests extends AbstractDeployerIntegrationTest {
@Test
public void deployParContainingPlan() throws DeploymentException {
DeploymentIdentity deploymentIdentity = this.deployer.deploy(PAR_CONTAINING_PLAN.toURI());
- assertBundlePresent("par.with.plan-1-simple.bundle.one", new Version(1, 0, 0, "BUILD-20090326114035"));
+ assertBundlePresent("par.with.plan-1-simple.bundle.one", new Version(TEST_APPS_VERSION));
this.deployer.undeploy(deploymentIdentity);
}
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/PlanDeploymentWithDAGTests.java b/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/PlanDeploymentWithDAGTests.java
index 57af158d..d7636887 100644
--- a/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/PlanDeploymentWithDAGTests.java
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/PlanDeploymentWithDAGTests.java
@@ -44,8 +44,6 @@ import org.osgi.framework.Version;
// TODO 1c. (transitive dependencies) (@see https://bugs.eclipse.org/bugs/show_bug.cgi?id=365034)
public class PlanDeploymentWithDAGTests extends AbstractDeployerIntegrationTest {
- private static final String BUNDLE_ONE_VERSION = "1.0.0.BUILD-20090326114035";
-
private static final String BUNDLE_ONE_SYMBOLIC_NAME = "simple.bundle.one";
private static final DeploymentIdentity BUNDLE_ONE_IDENTITY = new DeploymentIdentity() {
@@ -64,7 +62,7 @@ public class PlanDeploymentWithDAGTests extends AbstractDeployerIntegrationTest
@Override
public String getVersion() {
- return BUNDLE_ONE_VERSION;
+ return TEST_APPS_VERSION;
}
};
@@ -1182,7 +1180,7 @@ public class PlanDeploymentWithDAGTests extends AbstractDeployerIntegrationTest
private Bundle getUnderlyingBundle() {
for (Bundle bundle : this.context.getBundles()) {
- if (BUNDLE_ONE_SYMBOLIC_NAME.equals(bundle.getSymbolicName()) && (new Version(BUNDLE_ONE_VERSION)).equals(bundle.getVersion())) {
+ if (BUNDLE_ONE_SYMBOLIC_NAME.equals(bundle.getSymbolicName()) && (new Version(TEST_APPS_VERSION)).equals(bundle.getVersion())) {
return bundle;
}
}
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/RefreshTests.java b/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/RefreshTests.java
index 350d75ee..c30afd97 100644
--- a/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/RefreshTests.java
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/RefreshTests.java
@@ -37,14 +37,10 @@ import org.osgi.framework.ServiceReference;
*
*/
public class RefreshTests extends AbstractDeployerIntegrationTest {
-
- private static final String REFRESH_IMPORTER_VERSION = "1.0.0.BUILD-20100310081114";
-
- private static final String REFRESH_EXPORTER_VERSION = "1.0.0.BUILD-20100310081114";
private final String TEST_IMPORTER_BUNDLE_SYMBOLIC_NAME = "RefreshTest-1-RefreshImporter";
- private final String TEST_IMPORT_BUNDLE_IMPORTER_BUNDLE_SYMBOLIC_NAME = "RefreshTest-Import-Bundle-1-RefreshImporter";
+ private final String TEST_IMPORT_BUNDLE_IMPORTER_BUNDLE_SYMBOLIC_NAME = "RefreshTest-Import-Bundle-" + TEST_APPS_VERSION + "-RefreshImporter";
private ServiceReference<ApplicationDeployer> appDeployerServiceReference;
@@ -159,19 +155,19 @@ public class RefreshTests extends AbstractDeployerIntegrationTest {
// Ensure bundles are not already deployed.
try {
- this.appDeployer.undeploy("bundle", "RefreshExporter.jar", REFRESH_EXPORTER_VERSION);
+ this.appDeployer.undeploy("bundle", "RefreshExporter.jar", TEST_APPS_VERSION);
} catch (DeploymentException e) {
}
try {
- this.appDeployer.undeploy("bundle", "RefreshImporter.jar", REFRESH_IMPORTER_VERSION);
+ this.appDeployer.undeploy("bundle", "RefreshImporter.jar", TEST_APPS_VERSION);
} catch (DeploymentException e) {
}
DeploymentIdentity diExporter = this.appDeployer.deploy(explodedExporterJar.toURI());
DeploymentIdentity diImporter = this.appDeployer.deploy(explodedImporterJar.toURI());
- assertDeploymentIdentityEquals(diExporter, "RefreshExporter", "bundle", "RefreshExporter", REFRESH_EXPORTER_VERSION);
- assertDeploymentIdentityEquals(diImporter, "RefreshImporter", "bundle", "RefreshImporter", REFRESH_IMPORTER_VERSION);
+ assertDeploymentIdentityEquals(diExporter, "RefreshExporter", "bundle", "RefreshExporter", TEST_APPS_VERSION);
+ assertDeploymentIdentityEquals(diImporter, "RefreshImporter", "bundle", "RefreshImporter", TEST_APPS_VERSION);
// Check that the test bundle's application contexts are created.
ApplicationContextUtils.awaitApplicationContext(this.context, "RefreshImporter", 10);
@@ -198,7 +194,7 @@ public class RefreshTests extends AbstractDeployerIntegrationTest {
// Redeploy the importer which should now succeed.
DeploymentIdentity deploymentIdentity = this.appDeployer.deploy(explodedImporterJar.toURI());
- assertDeploymentIdentityEquals(deploymentIdentity, "RefreshImporter", "bundle", "RefreshImporter", REFRESH_IMPORTER_VERSION);
+ assertDeploymentIdentityEquals(deploymentIdentity, "RefreshImporter", "bundle", "RefreshImporter", TEST_APPS_VERSION);
}
private void checkV1Classes() {
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/Spring256ABundleTests.java b/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/Spring256ABundleTests.java
index 10ae07a9..8a971360 100644
--- a/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/Spring256ABundleTests.java
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/Spring256ABundleTests.java
@@ -40,7 +40,7 @@ public class Spring256ABundleTests extends AbstractDeployerIntegrationTest {
private static final String SPRING_256A_BUNDLE_SYMBOLIC_NAME = "spring.256A.sample";
- private static final String SPRING_256A_BUNDLE_VERSION = "1.0.0.BUILD-20090921151600";
+ private static final String SPRING_256A_BUNDLE_VERSION = TEST_APPS_VERSION;
private ApplicationDeployer appDeployer;
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/activator-tccl.jar b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/activator-tccl.jar
index a714f924..2fa8cc77 100644
--- a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/activator-tccl.jar
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/activator-tccl.jar
Binary files differ
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/bundle-activation-policy.par b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/bundle-activation-policy.par
index c2391ade..7e8e0a40 100644
--- a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/bundle-activation-policy.par
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/bundle-activation-policy.par
Binary files differ
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/clashing-exports-in-a-scope-par.par b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/clashing-exports-in-a-scope-par.par
new file mode 100644
index 00000000..219ce8b5
--- /dev/null
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/clashing-exports-in-a-scope-par.par
Binary files differ
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/manual-context.jar b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/manual-context.jar
index 650e457c..e8b750c4 100644
--- a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/manual-context.jar
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/manual-context.jar
Binary files differ
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/plan-deployment-dag/simple.bundle.three.jar b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/plan-deployment-dag/simple.bundle.three.jar
index 454c88ad..380e058d 100644
--- a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/plan-deployment-dag/simple.bundle.three.jar
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/plan-deployment-dag/simple.bundle.three.jar
Binary files differ
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/plan-deployment/simple.bundle.one.jar b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/plan-deployment/simple.bundle.one.jar
index 35e868e7..90ba2bbd 100644
--- a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/plan-deployment/simple.bundle.one.jar
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/plan-deployment/simple.bundle.one.jar
Binary files differ
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/plan-deployment/simple.bundle.two.jar b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/plan-deployment/simple.bundle.two.jar
index 74946ea3..b2416df2 100644
--- a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/plan-deployment/simple.bundle.two.jar
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/plan-deployment/simple.bundle.two.jar
Binary files differ
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/quartz/quartz.bundle.a.jar b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/quartz/quartz.bundle.a.jar
index 66580c66..d76d59a4 100644
--- a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/quartz/quartz.bundle.a.jar
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/quartz/quartz.bundle.a.jar
Binary files differ
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/quartz/quartz.bundle.b.jar b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/quartz/quartz.bundle.b.jar
index 05cf362f..294b5d67 100644
--- a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/quartz/quartz.bundle.b.jar
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/quartz/quartz.bundle.b.jar
Binary files differ
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/quartz/quartz.bundle.same1.jar b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/quartz/quartz.bundle.same1.jar
index b015cd5f..0bbbcc1b 100644
--- a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/quartz/quartz.bundle.same1.jar
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/quartz/quartz.bundle.same1.jar
Binary files differ
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/quartz/quartz.bundle.same2.jar b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/quartz/quartz.bundle.same2.jar
index 3ad58801..81321fd3 100644
--- a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/quartz/quartz.bundle.same2.jar
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/quartz/quartz.bundle.same2.jar
Binary files differ
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/redeploy-refresh/bad/simple.module.jar b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/redeploy-refresh/bad/simple.module.jar
index 0065505a..ad36d35f 100644
--- a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/redeploy-refresh/bad/simple.module.jar
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/redeploy-refresh/bad/simple.module.jar
Binary files differ
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/redeploy-refresh/good/simple.module.jar b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/redeploy-refresh/good/simple.module.jar
index af96e7ce..4503a34a 100644
--- a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/redeploy-refresh/good/simple.module.jar
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/redeploy-refresh/good/simple.module.jar
Binary files differ
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/refresh-import-bundle.par b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/refresh-import-bundle.par
index 14fe0a4d..1327a1f6 100644
--- a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/refresh-import-bundle.par
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/refresh-import-bundle.par
Binary files differ
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/refresh.par b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/refresh.par
index 8e7cac47..b6077890 100644
--- a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/refresh.par
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/refresh.par
Binary files differ
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/service-publication-from-repo/consumer.jar b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/service-publication-from-repo/consumer.jar
index 9120fb70..f29e7bcf 100644
--- a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/service-publication-from-repo/consumer.jar
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/service-publication-from-repo/consumer.jar
Binary files differ
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/service-publication-from-repo/publisher.jar b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/service-publication-from-repo/publisher.jar
index a6778453..8e103549 100644
--- a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/service-publication-from-repo/publisher.jar
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/service-publication-from-repo/publisher.jar
Binary files differ
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/service-scoping/service-scoping-engine-1265.par b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/service-scoping/service-scoping-engine-1265.par
index 03f8c0d4..f75bd005 100644
--- a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/service-scoping/service-scoping-engine-1265.par
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/service-scoping/service-scoping-engine-1265.par
Binary files differ
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/service-scoping/service-scoping-platform-183.par b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/service-scoping/service-scoping-platform-183.par
index fc8c1ade..813a0a21 100644
--- a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/service-scoping/service-scoping-platform-183.par
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/service-scoping/service-scoping-platform-183.par
Binary files differ
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/service-scoping/service-scoping.par b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/service-scoping/service-scoping.par
index feb6dd11..d4b77270 100644
--- a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/service-scoping/service-scoping.par
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/service-scoping/service-scoping.par
Binary files differ
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/spring.256A.sample.jar b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/spring.256A.sample.jar
index e466b724..4781ed38 100644
--- a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/spring.256A.sample.jar
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/spring.256A.sample.jar
Binary files differ
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/synthetic-tccl/synthetic.tccl.global.jar b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/synthetic-tccl/synthetic.tccl.global.jar
index 365e4442..9d8ea7ee 100644
--- a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/synthetic-tccl/synthetic.tccl.global.jar
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/synthetic-tccl/synthetic.tccl.global.jar
Binary files differ
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/synthetic-tccl/synthetic.tccl.par b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/synthetic-tccl/synthetic.tccl.par
index 59235731..d8895404 100644
--- a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/synthetic-tccl/synthetic.tccl.par
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/synthetic-tccl/synthetic.tccl.par
Binary files differ
diff --git a/org.eclipse.virgo.kernel.osgi/src/test/resources/.gitignore b/org.eclipse.virgo.kernel.osgi/src/test/resources/.gitignore
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/org.eclipse.virgo.kernel.osgi/src/test/resources/.gitignore
diff --git a/org.eclipse.virgo.kernel.osgi/src/test/resources/com/springsource/kernel/osgi/provisioning/tools/IMPORTBUNDLE.MF b/org.eclipse.virgo.kernel.osgi/src/test/resources/com/springsource/kernel/osgi/provisioning/tools/IMPORTBUNDLE.MF
deleted file mode 100644
index 0d4f08c4..00000000
--- a/org.eclipse.virgo.kernel.osgi/src/test/resources/com/springsource/kernel/osgi/provisioning/tools/IMPORTBUNDLE.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Import-Bundle: org.springframework.core;version="2.5.3",
- org.springframework.beans;version="2.5.3",
- org.springframework.context;version="2.5.3"
diff --git a/org.eclipse.virgo.kernel.osgi/src/test/resources/com/springsource/kernel/osgi/provisioning/tools/IMPORTLIBRARY.MF b/org.eclipse.virgo.kernel.osgi/src/test/resources/com/springsource/kernel/osgi/provisioning/tools/IMPORTLIBRARY.MF
deleted file mode 100644
index b7541d03..00000000
--- a/org.eclipse.virgo.kernel.osgi/src/test/resources/com/springsource/kernel/osgi/provisioning/tools/IMPORTLIBRARY.MF
+++ /dev/null
@@ -1 +0,0 @@
-Import-Library: org.springframework_spring;version="2.5.3"
diff --git a/org.eclipse.virgo.kernel.osgi/src/test/resources/com/springsource/kernel/osgi/provisioning/tools/IMPORTPACKAGE.MF b/org.eclipse.virgo.kernel.osgi/src/test/resources/com/springsource/kernel/osgi/provisioning/tools/IMPORTPACKAGE.MF
deleted file mode 100644
index 0479f8c8..00000000
--- a/org.eclipse.virgo.kernel.osgi/src/test/resources/com/springsource/kernel/osgi/provisioning/tools/IMPORTPACKAGE.MF
+++ /dev/null
@@ -1 +0,0 @@
-Import-Package: org.springframework.beans;version=2.5.4,org.springframework.context;version=2.5.4,org.springframework.beans.factory;version=2.5.4
diff --git a/org.eclipse.virgo.kernel.osgi/src/test/resources/com/springsource/kernel/osgi/provisioning/tools/IMPORTSYSTEMPACKAGES.MF b/org.eclipse.virgo.kernel.osgi/src/test/resources/com/springsource/kernel/osgi/provisioning/tools/IMPORTSYSTEMPACKAGES.MF
deleted file mode 100644
index 3c12faf0..00000000
--- a/org.eclipse.virgo.kernel.osgi/src/test/resources/com/springsource/kernel/osgi/provisioning/tools/IMPORTSYSTEMPACKAGES.MF
+++ /dev/null
@@ -1,4 +0,0 @@
-Import-Package: javax.sql,
- javax.transaction,
- org.apache.commons.logging;version="[1.1.1,1.1.1]";resolution:=optional,
- org.osgi.framework
diff --git a/org.eclipse.virgo.kernel.osgi/src/test/resources/com/springsource/kernel/osgi/provisioning/tools/IMPORTSYSTEMPACKAGESJAVA6.MF b/org.eclipse.virgo.kernel.osgi/src/test/resources/com/springsource/kernel/osgi/provisioning/tools/IMPORTSYSTEMPACKAGESJAVA6.MF
deleted file mode 100644
index c25826a5..00000000
--- a/org.eclipse.virgo.kernel.osgi/src/test/resources/com/springsource/kernel/osgi/provisioning/tools/IMPORTSYSTEMPACKAGESJAVA6.MF
+++ /dev/null
@@ -1 +0,0 @@
-Import-Package: javax.xml.soap
diff --git a/org.eclipse.virgo.kernel.osgi/src/test/resources/com/springsource/kernel/osgi/provisioning/tools/REQUIREBUNDLE.MF b/org.eclipse.virgo.kernel.osgi/src/test/resources/com/springsource/kernel/osgi/provisioning/tools/REQUIREBUNDLE.MF
deleted file mode 100644
index b8048c05..00000000
--- a/org.eclipse.virgo.kernel.osgi/src/test/resources/com/springsource/kernel/osgi/provisioning/tools/REQUIREBUNDLE.MF
+++ /dev/null
@@ -1,2 +0,0 @@
-Require-Bundle: org.springframework.core;version="[2.5.4, 2.6.0)"
-Import-Package: org.springframework.core;version="2.5.4"
diff --git a/org.eclipse.virgo.kernel.osgi/src/test/resources/com/springsource/kernel/osgi/provisioning/tools/SATISFIABLEANDUNSATISFIABLE.MF b/org.eclipse.virgo.kernel.osgi/src/test/resources/com/springsource/kernel/osgi/provisioning/tools/SATISFIABLEANDUNSATISFIABLE.MF
deleted file mode 100644
index d804f6dc..00000000
--- a/org.eclipse.virgo.kernel.osgi/src/test/resources/com/springsource/kernel/osgi/provisioning/tools/SATISFIABLEANDUNSATISFIABLE.MF
+++ /dev/null
@@ -1,2 +0,0 @@
-Import-Library: org.springframework_spring;version="[2.5.3,2.5.3]"
-Require-Bundle: com.foo
diff --git a/org.eclipse.virgo.kernel.osgi/src/test/resources/com/springsource/kernel/osgi/provisioning/tools/UNSATISFIABLEIMPORTBUNDLE.MF b/org.eclipse.virgo.kernel.osgi/src/test/resources/com/springsource/kernel/osgi/provisioning/tools/UNSATISFIABLEIMPORTBUNDLE.MF
deleted file mode 100644
index 4f6ab98e..00000000
--- a/org.eclipse.virgo.kernel.osgi/src/test/resources/com/springsource/kernel/osgi/provisioning/tools/UNSATISFIABLEIMPORTBUNDLE.MF
+++ /dev/null
@@ -1 +0,0 @@
-Import-Bundle: com.foo, com.bar
diff --git a/org.eclipse.virgo.kernel.osgi/src/test/resources/com/springsource/kernel/osgi/provisioning/tools/UNSATISFIABLEIMPORTLIBRARY.MF b/org.eclipse.virgo.kernel.osgi/src/test/resources/com/springsource/kernel/osgi/provisioning/tools/UNSATISFIABLEIMPORTLIBRARY.MF
deleted file mode 100644
index 645a4a84..00000000
--- a/org.eclipse.virgo.kernel.osgi/src/test/resources/com/springsource/kernel/osgi/provisioning/tools/UNSATISFIABLEIMPORTLIBRARY.MF
+++ /dev/null
@@ -1 +0,0 @@
-Import-Library: com.foo.bar
diff --git a/org.eclipse.virgo.kernel.osgi/src/test/resources/com/springsource/kernel/osgi/provisioning/tools/UNSATISFIABLEIMPORTPACKAGE.MF b/org.eclipse.virgo.kernel.osgi/src/test/resources/com/springsource/kernel/osgi/provisioning/tools/UNSATISFIABLEIMPORTPACKAGE.MF
deleted file mode 100644
index 4bd54a5c..00000000
--- a/org.eclipse.virgo.kernel.osgi/src/test/resources/com/springsource/kernel/osgi/provisioning/tools/UNSATISFIABLEIMPORTPACKAGE.MF
+++ /dev/null
@@ -1 +0,0 @@
-Import-Package: com.foo.bar
diff --git a/org.eclipse.virgo.kernel.osgi/src/test/resources/com/springsource/kernel/osgi/provisioning/tools/UNSATISFIABLEREQUIREBUNDLE.MF b/org.eclipse.virgo.kernel.osgi/src/test/resources/com/springsource/kernel/osgi/provisioning/tools/UNSATISFIABLEREQUIREBUNDLE.MF
deleted file mode 100644
index 07dc36e5..00000000
--- a/org.eclipse.virgo.kernel.osgi/src/test/resources/com/springsource/kernel/osgi/provisioning/tools/UNSATISFIABLEREQUIREBUNDLE.MF
+++ /dev/null
@@ -1 +0,0 @@
-Require-Bundle: com.foo.bar
diff --git a/org.eclipse.virgo.kernel.osgi/src/test/resources/com/springsource/kernel/osgi/provisioning/tools/org.springframework_spring_2.5.3.libd b/org.eclipse.virgo.kernel.osgi/src/test/resources/com/springsource/kernel/osgi/provisioning/tools/org.springframework_spring_2.5.3.libd
deleted file mode 100644
index dd7f6776..00000000
--- a/org.eclipse.virgo.kernel.osgi/src/test/resources/com/springsource/kernel/osgi/provisioning/tools/org.springframework_spring_2.5.3.libd
+++ /dev/null
@@ -1,5 +0,0 @@
-Library-SymbolicName: org.springframework_spring
-Library-Version: 2.5.3
-Import-Bundle: org.springframework.core;version="2.5.3",
- org.springframework.beans;version="2.5.3",
- org.springframework.context;version="2.5.3" \ No newline at end of file
diff --git a/org.eclipse.virgo.kernel.test/.classpath b/org.eclipse.virgo.kernel.test/.classpath
index 702c80fd..8038fa4b 100644
--- a/org.eclipse.virgo.kernel.test/.classpath
+++ b/org.eclipse.virgo.kernel.test/.classpath
@@ -1,27 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/main/resources"/>
- <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
- <classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.8.0.v20120508-2119/org.eclipse.osgi-3.8.0.v20120508-2119.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.1.R37x_v20110808-1106/org.eclipse.osgi-sources-3.7.1.R37x_v20110808-1106.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="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.kernel.deployer"/>
- <classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.kernel.osgi"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/3.6.0.D-20120911175055/org.eclipse.virgo.test.framework-3.6.0.D-20120911175055.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/3.5.0.D-20120301131734/org.eclipse.virgo.test.framework-sources-3.5.0.D-20120301131734.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20120911174528/org.eclipse.virgo.util.io-3.6.0.D-20120911174528.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.5.0.D-20120615065828/org.eclipse.virgo.util.io-sources-3.5.0.D-20120615065828.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.6.0.D-20120911174528/org.eclipse.virgo.util.osgi.manifest-3.6.0.D-20120911174528.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.5.0.D-20120615065828/org.eclipse.virgo.util.osgi.manifest-sources-3.5.0.D-20120615065828.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.2.RELEASE/org.eclipse.gemini.blueprint.core-1.0.2.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.2.RELEASE/org.eclipse.gemini.blueprint.core-sources-1.0.2.RELEASE.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.context/3.1.0.RELEASE/org.springframework.context-3.1.0.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.context/3.1.0.RELEASE/org.springframework.context-sources-3.1.0.RELEASE.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.core/3.1.0.RELEASE/org.springframework.core-3.1.0.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.core/3.1.0.RELEASE/org.springframework.core-sources-3.1.0.RELEASE.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.launcher/3.6.0.D-20120911175055/org.eclipse.virgo.test.launcher-3.6.0.D-20120911175055.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.beans/3.1.0.RELEASE/org.springframework.beans-3.1.0.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.beans/3.1.0.RELEASE/org.springframework.beans-sources-3.1.0.RELEASE.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.6.0.D-20120911174528/org.eclipse.virgo.util.parser.manifest-3.6.0.D-20120911174528.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.5.0.D-20120615065828/org.eclipse.virgo.util.parser.manifest-sources-3.5.0.D-20120615065828.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.6.0.D-20120911175330/org.eclipse.virgo.medic-3.6.0.D-20120911175330.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/1.0.0.CI-B20/org.eclipse.virgo.medic-sources-1.0.0.CI-B20.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.shell.command"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.equinox.region/1.1.0.v20120319-1602/org.eclipse.equinox.region-1.1.0.v20120319-1602.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.core/3.6.0.D-20120911175638/org.eclipse.virgo.nano.core-3.6.0.D-20120911175638.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.api/3.6.0.D-20120911175638/org.eclipse.virgo.nano.deployer.api-3.6.0.D-20120911175638.jar"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="src/main/resources"/>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.8.0.v20120508-2119/org.eclipse.osgi-3.8.0.v20120508-2119.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.1.R37x_v20110808-1106/org.eclipse.osgi-sources-3.7.1.R37x_v20110808-1106.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="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.kernel.deployer"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.kernel.osgi"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/3.6.0.D-20120911175055/org.eclipse.virgo.test.framework-3.6.0.D-20120911175055.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/3.5.0.D-20120301131734/org.eclipse.virgo.test.framework-sources-3.5.0.D-20120301131734.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20120911174528/org.eclipse.virgo.util.io-3.6.0.D-20120911174528.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20120911174528/org.eclipse.virgo.util.io-sources-3.6.0.D-20120911174528.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.6.0.D-20120911174528/org.eclipse.virgo.util.osgi.manifest-3.6.0.D-20120911174528.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.5.0.D-20120615065828/org.eclipse.virgo.util.osgi.manifest-sources-3.5.0.D-20120615065828.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.2.RELEASE/org.eclipse.gemini.blueprint.core-1.0.2.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.gemini/org.eclipse.gemini.blueprint.core/1.0.2.RELEASE/org.eclipse.gemini.blueprint.core-sources-1.0.2.RELEASE.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.context/3.1.0.RELEASE/org.springframework.context-3.1.0.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.context/3.1.0.RELEASE/org.springframework.context-sources-3.1.0.RELEASE.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.core/3.1.0.RELEASE/org.springframework.core-3.1.0.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.core/3.1.0.RELEASE/org.springframework.core-sources-3.1.0.RELEASE.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.launcher/3.6.0.D-20120911175055/org.eclipse.virgo.test.launcher-3.6.0.D-20120911175055.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.beans/3.1.0.RELEASE/org.springframework.beans-3.1.0.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.beans/3.1.0.RELEASE/org.springframework.beans-sources-3.1.0.RELEASE.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.6.0.D-20120911174528/org.eclipse.virgo.util.parser.manifest-3.6.0.D-20120911174528.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.5.0.D-20120615065828/org.eclipse.virgo.util.parser.manifest-sources-3.5.0.D-20120615065828.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.6.0.D-20120911175330/org.eclipse.virgo.medic-3.6.0.D-20120911175330.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/1.0.0.CI-B20/org.eclipse.virgo.medic-sources-1.0.0.CI-B20.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.shell.command"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.equinox.region/1.1.0.v20120319-1602/org.eclipse.equinox.region-1.1.0.v20120319-1602.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.core/3.6.0.D-20120911175638/org.eclipse.virgo.nano.core-3.6.0.D-20120911175638.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.api/3.6.0.D-20120911175638/org.eclipse.virgo.nano.deployer.api-3.6.0.D-20120911175638.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.launcher/3.6.0.D-20120911174528/org.eclipse.virgo.util.parser.launcher-3.6.0.D-20120911174528.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.launcher/2.2.0.D-20101207150035/org.eclipse.virgo.util.parser.launcher-sources-2.2.0.D-20101207150035.jar"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/osgi/test/QuasiFrameworkStateDumpIntegrationTests.java b/org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/osgi/test/QuasiFrameworkStateDumpIntegrationTests.java
index cc9bb3f4..67e85fca 100644
--- a/org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/osgi/test/QuasiFrameworkStateDumpIntegrationTests.java
+++ b/org.eclipse.virgo.kernel.test/src/test/java/org/eclipse/virgo/kernel/osgi/test/QuasiFrameworkStateDumpIntegrationTests.java
@@ -24,6 +24,7 @@ import org.eclipse.virgo.kernel.osgi.quasi.QuasiBundle;
import org.eclipse.virgo.kernel.osgi.quasi.QuasiFramework;
import org.eclipse.virgo.kernel.osgi.quasi.QuasiFrameworkFactory;
import org.eclipse.virgo.kernel.test.AbstractKernelIntegrationTest;
+import org.eclipse.virgo.util.io.FileSystemUtils;
import org.eclipse.virgo.util.osgi.manifest.BundleManifest;
import org.eclipse.virgo.util.osgi.manifest.BundleManifestFactory;
import org.junit.Assert;
@@ -60,6 +61,10 @@ public class QuasiFrameworkStateDumpIntegrationTests extends AbstractKernelInteg
this.quasiFramework = this.quasiFrameworkFactory.create();
Assert.assertNotNull(this.quasiFramework);
this.dumpDir = new File("target/serviceability/dump/");
+ if(this.dumpDir.exists()){
+ FileSystemUtils.deleteRecursively(this.dumpDir);
+ }
+ this.dumpDir.mkdirs();
}
@Test
diff --git a/org.eclipse.virgo.shell.command/.classpath b/org.eclipse.virgo.shell.command/.classpath
index f32f95bb..bffc6a04 100644
--- a/org.eclipse.virgo.shell.command/.classpath
+++ b/org.eclipse.virgo.shell.command/.classpath
@@ -1,58 +1,58 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src/main/java">
- <attributes>
- <attribute name="com.springsource.server.ide.jdt.core.test.classpathentry" value="false"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="src" path="src/main/resources">
- <attributes>
- <attribute name="com.springsource.server.ide.jdt.core.test.classpathentry" value="false"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="src" output="target/test-classes" path="src/test/java">
- <attributes>
- <attribute name="com.springsource.server.ide.jdt.core.test.classpathentry" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="src" output="target/test-classes" path="src/test/resources">
- <attributes>
- <attribute name="com.springsource.server.ide.jdt.core.test.classpathentry" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="KERNEL_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"/>
- <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.4.0/com.springsource.org.junit-sources-4.4.0.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/KERNEL_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.12.RELEASE/com.springsource.org.aspectj.runtime-1.6.12.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.12.RELEASE/com.springsource.org.aspectj.runtime-1.6.12.RELEASE.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.6.0.D-20120911174528/org.eclipse.virgo.util.common-3.6.0.D-20120911174528.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.5.0.D-20120615065828/org.eclipse.virgo.util.common-sources-3.5.0.D-20120615065828.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.8.0.v20120508-2119/org.eclipse.osgi-3.8.0.v20120508-2119.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.1.R37x_v20110808-1106/org.eclipse.osgi-sources-3.7.1.R37x_v20110808-1106.jar"/>
- <classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.6.0.D-20120911175330/org.eclipse.virgo.medic-3.6.0.D-20120911175330.jar">
- <attributes>
- <attribute name="org.eclipse.ajdt.aspectpath" value="org.eclipse.ajdt.aspectpath"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/3.6.0.D-20120911175330/org.eclipse.virgo.medic.test-3.6.0.D-20120911175330.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.core/1.0.0.CI-B20/org.eclipse.virgo.medic.core-sources-1.0.0.CI-B20.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-1.6.1.jar" sourcepath="/KERNEL_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-sources-1.6.1.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.kernel.osgi"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.stubs/3.6.0.D-20120911175055/org.eclipse.virgo.test.stubs-3.6.0.D-20120911175055.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.stubs/3.6.0.D-20120911175055/org.eclipse.virgo.test.stubs-sources-3.6.0.D-20120911175055.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.context/3.1.0.RELEASE/org.springframework.context-3.1.0.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.context/3.1.0.RELEASE/org.springframework.context-sources-3.1.0.RELEASE.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.beans/3.1.0.RELEASE/org.springframework.beans-3.1.0.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.beans/3.1.0.RELEASE/org.springframework.beans-sources-3.1.0.RELEASE.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.core/3.1.0.RELEASE/org.springframework.core-3.1.0.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.core/3.1.0.RELEASE/org.springframework.core-sources-3.1.0.RELEASE.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20120911174528/org.eclipse.virgo.util.io-3.6.0.D-20120911174528.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.5.0.D-20120615065828/org.eclipse.virgo.util.io-sources-3.5.0.D-20120615065828.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.core/3.6.0.D-20120911175330/org.eclipse.virgo.medic.core-3.6.0.D-20120911175330.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/3.5.0.D-20120615070622/org.eclipse.virgo.medic.test-sources-3.5.0.D-20120615070622.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.kernel.deployer"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/3.6.0.D-20120911180141/org.eclipse.virgo.repository-3.6.0.D-20120911180141.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/3.5.0.D-20120615071313/org.eclipse.virgo.repository-sources-3.5.0.D-20120615071313.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.kernel.model"/>
- <classpathentry kind="var" path="KERNEL_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"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.equinox.region/1.1.0.v20120319-1602/org.eclipse.equinox.region-1.1.0.v20120319-1602.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.6.0.D-20120911174528/org.eclipse.virgo.util.osgi.manifest-3.6.0.D-20120911174528.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.kernel.artifact"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.api/3.6.0.D-20120911175638/org.eclipse.virgo.nano.deployer.api-3.6.0.D-20120911175638.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.mirrored/org.slf4j.jcl/1.6.4.v20120130-2120/org.slf4j.jcl-1.6.4.v20120130-2120.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.kernel.services"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.6.0.D-20120820124944/org.eclipse.virgo.util.osgi-3.6.0.D-20120820124944.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.1.0.M01/org.eclipse.virgo.util.osgi-sources-3.1.0.M01.jar"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.felix.gogo.runtime/0.8.0.v201108120515/org.apache.felix.gogo.runtime-0.8.0.v201108120515.jar" sourcepath="/KERNEL_IVY_CACHE/org.apache.felix/org.apache.felix.gogo.runtime/0.8.0.v201107131313/org.apache.felix.gogo.runtime-sources-0.8.0.v201107131313.jar"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main/java">
+ <attributes>
+ <attribute name="com.springsource.server.ide.jdt.core.test.classpathentry" value="false"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="src" path="src/main/resources">
+ <attributes>
+ <attribute name="com.springsource.server.ide.jdt.core.test.classpathentry" value="false"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java">
+ <attributes>
+ <attribute name="com.springsource.server.ide.jdt.core.test.classpathentry" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/resources">
+ <attributes>
+ <attribute name="com.springsource.server.ide.jdt.core.test.classpathentry" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="var" path="KERNEL_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"/>
+ <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.4.0/com.springsource.org.junit-sources-4.4.0.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/KERNEL_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.12.RELEASE/com.springsource.org.aspectj.runtime-1.6.12.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.12.RELEASE/com.springsource.org.aspectj.runtime-1.6.12.RELEASE.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.6.0.D-20120911174528/org.eclipse.virgo.util.common-3.6.0.D-20120911174528.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.5.0.D-20120615065828/org.eclipse.virgo.util.common-sources-3.5.0.D-20120615065828.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.8.0.v20120508-2119/org.eclipse.osgi-3.8.0.v20120508-2119.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.1.R37x_v20110808-1106/org.eclipse.osgi-sources-3.7.1.R37x_v20110808-1106.jar"/>
+ <classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic/3.6.0.D-20120911175330/org.eclipse.virgo.medic-3.6.0.D-20120911175330.jar">
+ <attributes>
+ <attribute name="org.eclipse.ajdt.aspectpath" value="org.eclipse.ajdt.aspectpath"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/3.6.0.D-20120911175330/org.eclipse.virgo.medic.test-3.6.0.D-20120911175330.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.core/1.0.0.CI-B20/org.eclipse.virgo.medic.core-sources-1.0.0.CI-B20.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-1.6.1.jar" sourcepath="/KERNEL_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-sources-1.6.1.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.kernel.osgi"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.stubs/3.6.0.D-20120911175055/org.eclipse.virgo.test.stubs-3.6.0.D-20120911175055.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.stubs/3.6.0.D-20120911175055/org.eclipse.virgo.test.stubs-sources-3.6.0.D-20120911175055.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.context/3.1.0.RELEASE/org.springframework.context-3.1.0.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.context/3.1.0.RELEASE/org.springframework.context-sources-3.1.0.RELEASE.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.beans/3.1.0.RELEASE/org.springframework.beans-3.1.0.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.beans/3.1.0.RELEASE/org.springframework.beans-sources-3.1.0.RELEASE.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.springframework/org.springframework.core/3.1.0.RELEASE/org.springframework.core-3.1.0.RELEASE.jar" sourcepath="/KERNEL_IVY_CACHE/org.springframework/org.springframework.core/3.1.0.RELEASE/org.springframework.core-sources-3.1.0.RELEASE.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.6.0.D-20120911174528/org.eclipse.virgo.util.io-3.6.0.D-20120911174528.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.5.0.D-20120615065828/org.eclipse.virgo.util.io-sources-3.5.0.D-20120615065828.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.core/3.6.0.D-20120911175330/org.eclipse.virgo.medic.core-3.6.0.D-20120911175330.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.medic/org.eclipse.virgo.medic.test/3.5.0.D-20120615070622/org.eclipse.virgo.medic.test-sources-3.5.0.D-20120615070622.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.kernel.deployer"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/3.6.0.D-20120911180141/org.eclipse.virgo.repository-3.6.0.D-20120911180141.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.repository/org.eclipse.virgo.repository/3.5.0.D-20120615071313/org.eclipse.virgo.repository-sources-3.5.0.D-20120615071313.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.kernel.model"/>
+ <classpathentry kind="var" path="KERNEL_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"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.equinox.region/1.1.0.v20120319-1602/org.eclipse.equinox.region-1.1.0.v20120319-1602.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi.manifest/3.6.0.D-20120911174528/org.eclipse.virgo.util.osgi.manifest-3.6.0.D-20120911174528.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.kernel.artifact"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.nano/org.eclipse.virgo.nano.deployer.api/3.6.0.D-20120911175638/org.eclipse.virgo.nano.deployer.api-3.6.0.D-20120911175638.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.mirrored/org.slf4j.jcl/1.6.4.v20120130-2120/org.slf4j.jcl-1.6.4.v20120130-2120.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.kernel.services"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.6.0.D-20120911174528/org.eclipse.virgo.util.osgi-3.6.0.D-20120911174528.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.1.0.M01/org.eclipse.virgo.util.osgi-sources-3.1.0.M01.jar"/>
+ <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.virgo.mirrored/org.apache.felix.gogo.runtime/0.8.0.v201108120515/org.apache.felix.gogo.runtime-0.8.0.v201108120515.jar" sourcepath="/KERNEL_IVY_CACHE/org.apache.felix/org.apache.felix.gogo.runtime/0.8.0.v201107131313/org.apache.felix.gogo.runtime-sources-0.8.0.v201107131313.jar"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/test-apps/activator-tccl/build.properties b/test-apps/activator-tccl/build.properties
deleted file mode 100644
index 0a1bca3f..00000000
--- a/test-apps/activator-tccl/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-version=1.0.0
-release.type=integration
-bucket.basename=springsource.com
-ivy.cache.dir=${basedir}/../../ivy-cache
-integration.repo.dir=${basedir}/../../integration-repo
-disable.bundlor=true
diff --git a/test-apps/activator-tccl/build.xml b/test-apps/activator-tccl/build.xml
index 6a8872c3..1c40c83a 100644
--- a/test-apps/activator-tccl/build.xml
+++ b/test-apps/activator-tccl/build.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="activator-tccl">
- <property file="${basedir}/build.properties"/>
+ <property file="${basedir}/../build.properties"/>
<property file="${basedir}/../../build.versions"/>
<property name="jar.output.file" value="${basedir}/../../org.eclipse.virgo.kernel.deployer.test/src/test/resources/activator-tccl.jar"/>
- <import file="${basedir}/../../spring-build/standard/default.xml"/>
+ <import file="${basedir}/../../virgo-build/standard/default.xml"/>
</project>
diff --git a/test-apps/activator-tccl/ivy.xml b/test-apps/activator-tccl/ivy.xml
index 6c53dbd4..346e13b9 100644
--- a/test-apps/activator-tccl/ivy.xml
+++ b/test-apps/activator-tccl/ivy.xml
@@ -5,10 +5,10 @@
xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
version="1.3">
- <info organisation="activator.tccl" module="${ant.project.name}"/>
+ <info organisation="${project.organisation}" module="${ant.project.name}"/>
<configurations>
- <include file="${spring.build.dir}/common/default-ivy-configurations.xml"/>
+ <include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
</configurations>
<publications>
@@ -16,7 +16,7 @@
<dependencies>
<dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit}" conf="test->runtime"/>
- <dependency name='org.eclipse.osgi' rev='${org.eclipse.osgi}' org='org.eclipse.osgi' conf='compile->runtime'/>
+ <dependency name='org.eclipse.osgi' rev='${org.eclipse.osgi}' org="org.eclipse.virgo.mirrored" conf='compile->runtime'/>
</dependencies>
</ivy-module>
diff --git a/test-apps/build.properties b/test-apps/build.properties
new file mode 100644
index 00000000..5fb81894
--- /dev/null
+++ b/test-apps/build.properties
@@ -0,0 +1,6 @@
+version=1.0.0
+release.type=integration
+ivy.cache.dir=${user.home}/virgo-build-cache/ivy-cache
+integration.repo.dir=${user.home}/virgo-build-cache/integration-repo
+project.organisation=org.eclipse.virgo.kernel.test-apps
+disable.bundlor=true \ No newline at end of file
diff --git a/test-apps/build.xml b/test-apps/build.xml
new file mode 100644
index 00000000..6f4c6eb1
--- /dev/null
+++ b/test-apps/build.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="test-apps">
+
+ <path id="bundles">
+ <pathelement location="activator-tccl/"/>
+ <pathelement location="bundle-activation-policy/build-par"/>
+ <pathelement location="deployer-edge-tests/clashing-exports-in-a-scope/build-par"/>
+ <pathelement location="manual-context/"/>
+ <pathelement location="plan-deployment/simple.bundle.one"/>
+ <pathelement location="plan-deployment/simple.bundle.two"/>
+ <pathelement location="plan-deployment/simple.bundle.three"/>
+ <pathelement location="quartz-scheduler/quartz.bundle.a"/>
+ <pathelement location="quartz-scheduler/quartz.bundle.b"/>
+ <pathelement location="quartz-scheduler/quartz.bundle.same1"/>
+ <pathelement location="quartz-scheduler/quartz.bundle.same2"/>
+ <pathelement location="redeploy-refresh/simple.bundle.bad"/>
+ <pathelement location="redeploy-refresh/simple.bundle.ok"/>
+ <pathelement location="refresh/refresh/build-par"/>
+ <pathelement location="refresh/refresh-import-bundle/build-par"/>
+ <pathelement location="service-publication-from-repo-bundles/consumer"/>
+ <pathelement location="service-publication-from-repo-bundles/publisher"/>
+ <pathelement location="service-scoping/build-par"/>
+ <pathelement location="service-scoping-engine-1265/build-par"/>
+ <pathelement location="service-scoping-platform-183/build-par"/>
+ <pathelement location="spring-2.5.6.A-sample/"/>
+ <pathelement location="synthetic-tccl/synthetic.tccl.global"/>
+ <pathelement location="synthetic-tccl/build-par"/>
+ </path>
+
+ <property file="${basedir}/build.properties"/>
+ <property file="${basedir}/../build.versions"/>
+ <import file="${basedir}/../virgo-build/multi-bundle/default.xml"/>
+
+</project>
diff --git a/test-apps/bundle-activation-policy/README.TXT b/test-apps/bundle-activation-policy/README.TXT
deleted file mode 100644
index 82aa9e9d..00000000
--- a/test-apps/bundle-activation-policy/README.TXT
+++ /dev/null
@@ -1,9 +0,0 @@
-How to build
-------------
-
-Run ant jar build-par
-
-Output
-------
-
-com.springsource.kernel.test/com.springsource.kernel.deployer.test/src/test/resources/bundle-activation-policy.par
diff --git a/test-apps/bundle-activation-policy/build-par/build.xml b/test-apps/bundle-activation-policy/build-par/build.xml
index 696de56f..45285953 100644
--- a/test-apps/bundle-activation-policy/build-par/build.xml
+++ b/test-apps/bundle-activation-policy/build-par/build.xml
@@ -6,9 +6,9 @@
<pathelement location="../bundle.activation.policy.module.a"/>
</path>
- <property file="${basedir}/../build.properties"/>
+ <property file="${basedir}/../../build.properties"/>
<property name="par.output.file" value="${basedir}/../../../org.eclipse.virgo.kernel.deployer.test/src/test/resources/bundle-activation-policy.par"/>
- <import file="${basedir}/../../../spring-build/par/default.xml"/>
+ <import file="${basedir}/../../../virgo-build/par/default.xml"/>
</project>
diff --git a/test-apps/bundle-activation-policy/build.properties b/test-apps/bundle-activation-policy/build.properties
deleted file mode 100644
index 0a1bca3f..00000000
--- a/test-apps/bundle-activation-policy/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-version=1.0.0
-release.type=integration
-bucket.basename=springsource.com
-ivy.cache.dir=${basedir}/../../ivy-cache
-integration.repo.dir=${basedir}/../../integration-repo
-disable.bundlor=true
diff --git a/test-apps/bundle-activation-policy/bundle.activation.policy.module.a/build.xml b/test-apps/bundle-activation-policy/bundle.activation.policy.module.a/build.xml
index 05d752bd..d41cf8bb 100644
--- a/test-apps/bundle-activation-policy/bundle.activation.policy.module.a/build.xml
+++ b/test-apps/bundle-activation-policy/bundle.activation.policy.module.a/build.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="bundle.activation.policy.module.a">
- <property file="${basedir}/../build.properties"/>
- <property file="${basedir}/../../build.versions"/>
+ <property file="${basedir}/../../build.properties"/>
+ <property file="${basedir}/../../../build.versions"/>
- <import file="${basedir}/../../../spring-build/standard/default.xml"/>
+ <import file="${basedir}/../../../virgo-build/standard/default.xml"/>
</project>
diff --git a/test-apps/bundle-activation-policy/bundle.activation.policy.module.a/ivy.xml b/test-apps/bundle-activation-policy/bundle.activation.policy.module.a/ivy.xml
index f92fa16c..9d96ed35 100644
--- a/test-apps/bundle-activation-policy/bundle.activation.policy.module.a/ivy.xml
+++ b/test-apps/bundle-activation-policy/bundle.activation.policy.module.a/ivy.xml
@@ -5,12 +5,12 @@
xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
version="1.3">
- <info organisation="bundle.activation.policy" module="${ant.project.name}">
+ <info organisation="${project.organisation}" module="${ant.project.name}">
<ivyauthor name="awilkinson"/>
</info>
<configurations>
- <include file="${spring.build.dir}/common/default-ivy-configurations.xml"/>
+ <include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
</configurations>
<publications>
@@ -20,7 +20,7 @@
<dependencies>
<dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit}" conf="test->runtime"/>
- <dependency org="bundle.activation.policy" name="bundle.activation.policy.module.b" rev="latest.integration" conf="compile->compile"/>
+ <dependency org="${project.organisation}" name="bundle.activation.policy.module.b" rev="latest.integration" conf="compile->compile"/>
</dependencies>
</ivy-module>
diff --git a/test-apps/bundle-activation-policy/bundle.activation.policy.module.b/build.xml b/test-apps/bundle-activation-policy/bundle.activation.policy.module.b/build.xml
index 9270bfb7..03aa7dd7 100644
--- a/test-apps/bundle-activation-policy/bundle.activation.policy.module.b/build.xml
+++ b/test-apps/bundle-activation-policy/bundle.activation.policy.module.b/build.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="bundle.activation.policy.module.b">
- <property file="${basedir}/../build.properties"/>
+ <property file="${basedir}/../../build.properties"/>
<property file="${basedir}/../../../build.versions"/>
- <import file="${basedir}/../../../spring-build/standard/default.xml"/>
+ <import file="${basedir}/../../../virgo-build/standard/default.xml"/>
</project>
diff --git a/test-apps/bundle-activation-policy/bundle.activation.policy.module.b/ivy.xml b/test-apps/bundle-activation-policy/bundle.activation.policy.module.b/ivy.xml
index c01c34bb..640e289c 100644
--- a/test-apps/bundle-activation-policy/bundle.activation.policy.module.b/ivy.xml
+++ b/test-apps/bundle-activation-policy/bundle.activation.policy.module.b/ivy.xml
@@ -5,12 +5,12 @@
xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
version="1.3">
- <info organisation="bundle.activation.policy" module="${ant.project.name}">
+ <info organisation="${project.organisation}" module="${ant.project.name}">
<ivyauthor name="awilkinson"/>
</info>
<configurations>
- <include file="${spring.build.dir}/common/default-ivy-configurations.xml"/>
+ <include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
</configurations>
<publications>
diff --git a/test-apps/bundle-update/class.load.after.update/README.TXT b/test-apps/bundle-update/class.load.after.update/README.TXT
deleted file mode 100644
index 66436ef4..00000000
--- a/test-apps/bundle-update/class.load.after.update/README.TXT
+++ /dev/null
@@ -1,11 +0,0 @@
-How to build
-------------
-
-ant jar
-
-Output
-------
-
-com.springsource.kernel.osgi/src/test/resources/but/but.C.jar
-com.springsource.kernel.osgi/src/test/resources/but/but.B.before.jar
-com.springsource.kernel.osgi/src/test/resources/but/but.B.after.jar
diff --git a/test-apps/bundle-update/class.load.after.update/build.properties b/test-apps/bundle-update/class.load.after.update/build.properties
deleted file mode 100644
index 1dcbd8ce..00000000
--- a/test-apps/bundle-update/class.load.after.update/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-version=1.0.0
-release.type=integration
-bucket.basename=springsource.com
-ivy.cache.dir=${basedir}/../../../ivy-cache
-integration.repo.dir=${basedir}/../../../integration-repo
-disable.bundlor=true
diff --git a/test-apps/bundle-update/class.load.after.update/build.xml b/test-apps/bundle-update/class.load.after.update/build.xml
deleted file mode 100644
index d4ad0f2e..00000000
--- a/test-apps/bundle-update/class.load.after.update/build.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="bundle-update" default="jar">
-
- <path id="bundles">
- <pathelement location="but.B.before"/>
- <pathelement location="but.B.after"/>
- <pathelement location="but.C"/>
- </path>
-
- <property name="virgo.kernel.dir" value="${basedir}/../../.."/>
-
- <import file="${virgo.kernel.dir}/spring-build/multi-bundle/default.xml"/>
-
- <target name="jar" depends="artifact-multi-bundle.jar">
- <copy todir="${virgo.kernel.dir}/org.eclipse.virgo.kernel.osgi/src/test/resources/but">
- <fileset dir="${basedir}/but.B.before/target/artifacts">
- <exclude name="**/ivy.xml"/>
- <exclude name="**/*-sources.jar"/>
- </fileset>
- <fileset dir="${basedir}/but.B.after/target/artifacts">
- <exclude name="**/ivy.xml"/>
- <exclude name="**/*-sources.jar"/>
- </fileset>
- <fileset dir="${basedir}/but.C/target/artifacts">
- <exclude name="**/ivy.xml"/>
- <exclude name="**/*-sources.jar"/>
- </fileset>
- </copy>
- </target>
-
-</project>
diff --git a/test-apps/bundle-update/class.load.after.update/but.B.after/.classpath b/test-apps/bundle-update/class.load.after.update/but.B.after/.classpath
deleted file mode 100644
index 14a424e3..00000000
--- a/test-apps/bundle-update/class.load.after.update/but.B.after/.classpath
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src/main/java/but"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="output" path="target"/>
-</classpath>
diff --git a/test-apps/bundle-update/class.load.after.update/but.B.after/.project b/test-apps/bundle-update/class.load.after.update/but.B.after/.project
deleted file mode 100644
index 8048deaf..00000000
--- a/test-apps/bundle-update/class.load.after.update/but.B.after/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>but.b.after</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/test-apps/bundle-update/class.load.after.update/but.B.after/build.xml b/test-apps/bundle-update/class.load.after.update/but.B.after/build.xml
deleted file mode 100644
index 3a2f3019..00000000
--- a/test-apps/bundle-update/class.load.after.update/but.B.after/build.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="but.B.after">
-
- <property file="${basedir}/../build.properties"/>
- <property file="${basedir}/../../../../build.versions"/>
-
- <import file="${basedir}/../../../../spring-build/standard/default.xml"/>
-
-</project>
diff --git a/test-apps/bundle-update/class.load.after.update/but.B.after/ivy.xml b/test-apps/bundle-update/class.load.after.update/but.B.after/ivy.xml
deleted file mode 100644
index 876655e1..00000000
--- a/test-apps/bundle-update/class.load.after.update/but.B.after/ivy.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
-<ivy-module
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
- version="1.3">
-
- <info organisation="cloning.tests" module="${ant.project.name}">
- <ivyauthor name="gnormington"/>
- </info>
-
- <configurations>
- <include file="${spring.build.dir}/common/default-ivy-configurations.xml"/>
- </configurations>
-
- <publications>
- <artifact name="${ant.project.name}"/>
- <artifact name="${ant.project.name}-sources" type="src" ext="jar"/>
- </publications>
-
- <dependencies>
- <dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit}" conf="test->runtime"/>
- </dependencies>
-
-</ivy-module>
diff --git a/test-apps/bundle-update/class.load.after.update/but.B.after/src/main/java/but/but/A.java b/test-apps/bundle-update/class.load.after.update/but.B.after/src/main/java/but/but/A.java
deleted file mode 100644
index c9d803d6..00000000
--- a/test-apps/bundle-update/class.load.after.update/but.B.after/src/main/java/but/but/A.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 VMware Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * VMware Inc. - initial contribution
- *******************************************************************************/
-
-package but;
-
-public class A implements I {
-
-}
diff --git a/test-apps/bundle-update/class.load.after.update/but.B.after/src/main/java/but/but/B.java b/test-apps/bundle-update/class.load.after.update/but.B.after/src/main/java/but/but/B.java
deleted file mode 100644
index 83d21bb1..00000000
--- a/test-apps/bundle-update/class.load.after.update/but.B.after/src/main/java/but/but/B.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 VMware Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * VMware Inc. - initial contribution
- *******************************************************************************/
-
-package but;
-
-public class B {
-
- static I i;
-
- static {
- i = new A();
- }
-
-}
diff --git a/test-apps/bundle-update/class.load.after.update/but.B.after/src/main/java/but/but/I.java b/test-apps/bundle-update/class.load.after.update/but.B.after/src/main/java/but/but/I.java
deleted file mode 100644
index 934f8d08..00000000
--- a/test-apps/bundle-update/class.load.after.update/but.B.after/src/main/java/but/but/I.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 VMware Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * VMware Inc. - initial contribution
- *******************************************************************************/
-
-package but;
-
-
-public interface I {
-
-}
diff --git a/test-apps/bundle-update/class.load.after.update/but.B.after/src/main/resources/META-INF/MANIFEST.MF b/test-apps/bundle-update/class.load.after.update/but.B.after/src/main/resources/META-INF/MANIFEST.MF
deleted file mode 100644
index f15c9ac4..00000000
--- a/test-apps/bundle-update/class.load.after.update/but.B.after/src/main/resources/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,6 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: but.B
-Bundle-Version: 1
-Export-Package: but
-
diff --git a/test-apps/bundle-update/class.load.after.update/but.B.before/.classpath b/test-apps/bundle-update/class.load.after.update/but.B.before/.classpath
deleted file mode 100644
index 14a424e3..00000000
--- a/test-apps/bundle-update/class.load.after.update/but.B.before/.classpath
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src/main/java/but"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="output" path="target"/>
-</classpath>
diff --git a/test-apps/bundle-update/class.load.after.update/but.B.before/.project b/test-apps/bundle-update/class.load.after.update/but.B.before/.project
deleted file mode 100644
index 64849bbd..00000000
--- a/test-apps/bundle-update/class.load.after.update/but.B.before/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>but.b.before</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/test-apps/bundle-update/class.load.after.update/but.B.before/build.xml b/test-apps/bundle-update/class.load.after.update/but.B.before/build.xml
deleted file mode 100644
index e0c831ef..00000000
--- a/test-apps/bundle-update/class.load.after.update/but.B.before/build.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="but.B.before">
-
- <property file="${basedir}/../build.properties"/>
- <property file="${basedir}/../../../../build.versions"/>
-
- <import file="${basedir}/../../../../spring-build/standard/default.xml"/>
-
-</project>
diff --git a/test-apps/bundle-update/class.load.after.update/but.B.before/ivy.xml b/test-apps/bundle-update/class.load.after.update/but.B.before/ivy.xml
deleted file mode 100644
index 876655e1..00000000
--- a/test-apps/bundle-update/class.load.after.update/but.B.before/ivy.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
-<ivy-module
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
- version="1.3">
-
- <info organisation="cloning.tests" module="${ant.project.name}">
- <ivyauthor name="gnormington"/>
- </info>
-
- <configurations>
- <include file="${spring.build.dir}/common/default-ivy-configurations.xml"/>
- </configurations>
-
- <publications>
- <artifact name="${ant.project.name}"/>
- <artifact name="${ant.project.name}-sources" type="src" ext="jar"/>
- </publications>
-
- <dependencies>
- <dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit}" conf="test->runtime"/>
- </dependencies>
-
-</ivy-module>
diff --git a/test-apps/bundle-update/class.load.after.update/but.B.before/src/main/java/but/but/A.java b/test-apps/bundle-update/class.load.after.update/but.B.before/src/main/java/but/but/A.java
deleted file mode 100644
index 080542cb..00000000
--- a/test-apps/bundle-update/class.load.after.update/but.B.before/src/main/java/but/but/A.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 VMware Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * VMware Inc. - initial contribution
- *******************************************************************************/
-
-package but;
-
-public class A {
-
-}
diff --git a/test-apps/bundle-update/class.load.after.update/but.B.before/src/main/java/but/but/B.java b/test-apps/bundle-update/class.load.after.update/but.B.before/src/main/java/but/but/B.java
deleted file mode 100644
index 25df2e16..00000000
--- a/test-apps/bundle-update/class.load.after.update/but.B.before/src/main/java/but/but/B.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 VMware Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * VMware Inc. - initial contribution
- *******************************************************************************/
-
-package but;
-
-public class B {
-
-}
diff --git a/test-apps/bundle-update/class.load.after.update/but.B.before/src/main/resources/META-INF/MANIFEST.MF b/test-apps/bundle-update/class.load.after.update/but.B.before/src/main/resources/META-INF/MANIFEST.MF
deleted file mode 100644
index f15c9ac4..00000000
--- a/test-apps/bundle-update/class.load.after.update/but.B.before/src/main/resources/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,6 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: but.B
-Bundle-Version: 1
-Export-Package: but
-
diff --git a/test-apps/bundle-update/class.load.after.update/but.C/.classpath b/test-apps/bundle-update/class.load.after.update/but.C/.classpath
deleted file mode 100644
index 31ccfcfd..00000000
--- a/test-apps/bundle-update/class.load.after.update/but.C/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry combineaccessrules="false" kind="src" path="/but.b.after"/>
- <classpathentry kind="var" path="KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.1.R37x_v20110808-1106/org.eclipse.osgi-3.7.1.R37x_v20110808-1106.jar" sourcepath="/KERNEL_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.1.R37x_v20110808-1106/org.eclipse.osgi-sources-3.7.1.R37x_v20110808-1106.jar"/>
- <classpathentry kind="output" path="target"/>
-</classpath>
diff --git a/test-apps/bundle-update/class.load.after.update/but.C/.project b/test-apps/bundle-update/class.load.after.update/but.C/.project
deleted file mode 100644
index 83eff1e1..00000000
--- a/test-apps/bundle-update/class.load.after.update/but.C/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>but.C</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/test-apps/bundle-update/class.load.after.update/but.C/build.xml b/test-apps/bundle-update/class.load.after.update/but.C/build.xml
deleted file mode 100644
index f505d46c..00000000
--- a/test-apps/bundle-update/class.load.after.update/but.C/build.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="but.C">
-
- <property file="${basedir}/../build.properties"/>
- <property file="${basedir}/../../../../build.versions"/>
-
- <import file="${basedir}/../../../../spring-build/standard/default.xml"/>
-
-</project>
diff --git a/test-apps/bundle-update/class.load.after.update/but.C/ivy.xml b/test-apps/bundle-update/class.load.after.update/but.C/ivy.xml
deleted file mode 100644
index b3e64f07..00000000
--- a/test-apps/bundle-update/class.load.after.update/but.C/ivy.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
-<ivy-module
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
- version="1.3">
-
- <info organisation="cloning.tests" module="${ant.project.name}">
- <ivyauthor name="gnormington"/>
- </info>
-
- <configurations>
- <include file="${spring.build.dir}/common/default-ivy-configurations.xml"/>
- </configurations>
-
- <publications>
- <artifact name="${ant.project.name}"/>
- <artifact name="${ant.project.name}-sources" type="src" ext="jar"/>
- </publications>
-
- <dependencies>
- <dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit}" conf="test->runtime"/>
- <dependency org="org.eclipse.osgi" name="org.eclipse.osgi" rev="${org.eclipse.osgi}" conf="compile->compile"/>
- </dependencies>
-
-</ivy-module>
diff --git a/test-apps/bundle-update/class.load.after.update/but.C/src/main/java/but/c/C.java b/test-apps/bundle-update/class.load.after.update/but.C/src/main/java/but/c/C.java
deleted file mode 100644
index 65d385b3..00000000
--- a/test-apps/bundle-update/class.load.after.update/but.C/src/main/java/but/c/C.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 VMware Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * VMware Inc. - initial contribution
- *******************************************************************************/
-
-package but.c;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.BundleEvent;
-import org.osgi.framework.SynchronousBundleListener;
-
-public class C implements BundleActivator, SynchronousBundleListener {
-
- public void start(BundleContext context) throws Exception {
-
- // Load the old version of A
- Class.forName("but.A");
-
- context.addBundleListener(this);
- }
-
- public void stop(BundleContext context) throws Exception {
- }
-
- public void bundleChanged(BundleEvent event) {
- if ("but.B".equals(event.getBundle().getSymbolicName()) && event.getType() == BundleEvent.UPDATED) {
- try {
- // Load B. If successful, this is the old version that is compatible with the old version of A.
- Class.forName("but.B");
- } catch (Exception e) {
- e.printStackTrace();
- // Prevent the JUnit test from passing if we get to here.
- System.exit(987);
- }
- }
-
- }
-
-}
diff --git a/test-apps/bundle-update/class.load.after.update/but.C/src/main/resources/META-INF/MANIFEST.MF b/test-apps/bundle-update/class.load.after.update/but.C/src/main/resources/META-INF/MANIFEST.MF
deleted file mode 100644
index e7d429ff..00000000
--- a/test-apps/bundle-update/class.load.after.update/but.C/src/main/resources/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,7 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: but.C
-Import-Package: but,org.osgi.framework
-Bundle-Activator: but.c.C
-
-
diff --git a/test-apps/deployer-edge-tests/clashing-exports-in-a-scope/README.TXT b/test-apps/deployer-edge-tests/clashing-exports-in-a-scope/README.TXT
deleted file mode 100644
index d3657df3..00000000
--- a/test-apps/deployer-edge-tests/clashing-exports-in-a-scope/README.TXT
+++ /dev/null
@@ -1,9 +0,0 @@
-How to build
-------------
-
-ant jar
-
-Output
-------
-
-com.springsource.kernel.deployer.test/src/test/resources/clashing.exports.in.a.scope.par
diff --git a/test-apps/deployer-edge-tests/clashing-exports-in-a-scope/build-par/build.xml b/test-apps/deployer-edge-tests/clashing-exports-in-a-scope/build-par/build.xml
index deab1607..1a42fc64 100644
--- a/test-apps/deployer-edge-tests/clashing-exports-in-a-scope/build-par/build.xml
+++ b/test-apps/deployer-edge-tests/clashing-exports-in-a-scope/build-par/build.xml
@@ -1,13 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="clashing.exports.in.a.scope">
+<project name="clashing-exports-in-a-scope-par">
<path id="bundles">
<pathelement location="../c1"/>
<pathelement location="../c2"/>
</path>
- <property file="${basedir}/../build.properties"/>
+ <property file="${basedir}/../../../build.properties"/>
+ <property name="par.output.dir" value="${basedir}/../../../../org.eclipse.virgo.kernel.deployer.test/src/test/resources"/>
+
+ <import file="${basedir}/../../../../virgo-build/par/default.xml"/>
- <import file="${basedir}/../../../../spring-build/par/default.xml"/>
</project>
diff --git a/test-apps/deployer-edge-tests/clashing-exports-in-a-scope/build.properties b/test-apps/deployer-edge-tests/clashing-exports-in-a-scope/build.properties
deleted file mode 100644
index 1dcbd8ce..00000000
--- a/test-apps/deployer-edge-tests/clashing-exports-in-a-scope/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-version=1.0.0
-release.type=integration
-bucket.basename=springsource.com
-ivy.cache.dir=${basedir}/../../../ivy-cache
-integration.repo.dir=${basedir}/../../../integration-repo
-disable.bundlor=true
diff --git a/test-apps/deployer-edge-tests/clashing-exports-in-a-scope/build.xml b/test-apps/deployer-edge-tests/clashing-exports-in-a-scope/build.xml
deleted file mode 100644
index 8505bea5..00000000
--- a/test-apps/deployer-edge-tests/clashing-exports-in-a-scope/build.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="clashing-exports-in-a-scope" default="jar">
-
- <path id="bundles">
- <pathelement location="build-par"/>
- </path>
-
- <property name="virgo.kernel.dir" value="${basedir}/../../.."/>
-
- <import file="${virgo.kernel.dir}/spring-build/multi-bundle/default.xml"/>
-
- <target name="jar" depends="artifact-multi-bundle.jar">
- <copy todir="${virgo.kernel.dir}/org.eclipse.virgo.kernel.deployer.test/src/test/resources">
- <fileset dir="${basedir}/build-par/target/artifacts"/>
- </copy>
- </target>
-
-</project>
diff --git a/test-apps/deployer-edge-tests/clashing-exports-in-a-scope/c1/build.xml b/test-apps/deployer-edge-tests/clashing-exports-in-a-scope/c1/build.xml
index 31cf3cd2..f216fd6d 100644
--- a/test-apps/deployer-edge-tests/clashing-exports-in-a-scope/c1/build.xml
+++ b/test-apps/deployer-edge-tests/clashing-exports-in-a-scope/c1/build.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="c1">
- <property file="${basedir}/../build.properties"/>
+ <property file="${basedir}/../../../build.properties"/>
<property file="${basedir}/../../../../build.versions"/>
- <import file="${basedir}/../../../../spring-build/standard/default.xml"/>
+ <import file="${basedir}/../../../../virgo-build/standard/default.xml"/>
</project>
diff --git a/test-apps/deployer-edge-tests/clashing-exports-in-a-scope/c1/ivy.xml b/test-apps/deployer-edge-tests/clashing-exports-in-a-scope/c1/ivy.xml
index ec9164b3..996e2542 100644
--- a/test-apps/deployer-edge-tests/clashing-exports-in-a-scope/c1/ivy.xml
+++ b/test-apps/deployer-edge-tests/clashing-exports-in-a-scope/c1/ivy.xml
@@ -5,12 +5,12 @@
xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
version="1.3">
- <info organisation="cloning.tests" module="${ant.project.name}">
+ <info organisation="${project.organisation}" module="${ant.project.name}">
<ivyauthor name="gnormington"/>
</info>
<configurations>
- <include file="${spring.build.dir}/common/default-ivy-configurations.xml"/>
+ <include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
</configurations>
<publications/>
diff --git a/test-apps/deployer-edge-tests/clashing-exports-in-a-scope/c1/src/main/java/.gitignore b/test-apps/deployer-edge-tests/clashing-exports-in-a-scope/c1/src/main/java/.gitignore
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/test-apps/deployer-edge-tests/clashing-exports-in-a-scope/c1/src/main/java/.gitignore
diff --git a/test-apps/deployer-edge-tests/clashing-exports-in-a-scope/c2/build.xml b/test-apps/deployer-edge-tests/clashing-exports-in-a-scope/c2/build.xml
index cc37ab7b..0c1b89c3 100644
--- a/test-apps/deployer-edge-tests/clashing-exports-in-a-scope/c2/build.xml
+++ b/test-apps/deployer-edge-tests/clashing-exports-in-a-scope/c2/build.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="c2">
- <property file="${basedir}/../build.properties"/>
+ <property file="${basedir}/../../../build.properties"/>
<property file="${basedir}/../../../../build.versions"/>
- <import file="${basedir}/../../../../spring-build/standard/default.xml"/>
+ <import file="${basedir}/../../../../virgo-build/standard/default.xml"/>
</project>
diff --git a/test-apps/deployer-edge-tests/clashing-exports-in-a-scope/c2/ivy.xml b/test-apps/deployer-edge-tests/clashing-exports-in-a-scope/c2/ivy.xml
index ec9164b3..996e2542 100644
--- a/test-apps/deployer-edge-tests/clashing-exports-in-a-scope/c2/ivy.xml
+++ b/test-apps/deployer-edge-tests/clashing-exports-in-a-scope/c2/ivy.xml
@@ -5,12 +5,12 @@
xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
version="1.3">
- <info organisation="cloning.tests" module="${ant.project.name}">
+ <info organisation="${project.organisation}" module="${ant.project.name}">
<ivyauthor name="gnormington"/>
</info>
<configurations>
- <include file="${spring.build.dir}/common/default-ivy-configurations.xml"/>
+ <include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
</configurations>
<publications/>
diff --git a/test-apps/deployer-edge-tests/clashing-exports-in-a-scope/c2/src/main/java/.gitignore b/test-apps/deployer-edge-tests/clashing-exports-in-a-scope/c2/src/main/java/.gitignore
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/test-apps/deployer-edge-tests/clashing-exports-in-a-scope/c2/src/main/java/.gitignore
diff --git a/test-apps/manual-context/build.properties b/test-apps/manual-context/build.properties
deleted file mode 100644
index 0a1bca3f..00000000
--- a/test-apps/manual-context/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-version=1.0.0
-release.type=integration
-bucket.basename=springsource.com
-ivy.cache.dir=${basedir}/../../ivy-cache
-integration.repo.dir=${basedir}/../../integration-repo
-disable.bundlor=true
diff --git a/test-apps/manual-context/build.xml b/test-apps/manual-context/build.xml
index 4e7ac92d..fa73aa36 100644
--- a/test-apps/manual-context/build.xml
+++ b/test-apps/manual-context/build.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="manual-context">
- <property file="${basedir}/build.properties"/>
+ <property file="${basedir}/../build.properties"/>
<property file="${basedir}/../../build.versions"/>
<property name="jar.output.file" value="${basedir}/../../org.eclipse.virgo.kernel.deployer.test/src/test/resources/manual-context.jar"/>
- <import file="${basedir}/../../spring-build/standard/default.xml"/>
+ <import file="${basedir}/../../virgo-build/standard/default.xml"/>
</project>
diff --git a/test-apps/manual-context/ivy.xml b/test-apps/manual-context/ivy.xml
index 0c41ab90..7613cffc 100644
--- a/test-apps/manual-context/ivy.xml
+++ b/test-apps/manual-context/ivy.xml
@@ -5,12 +5,12 @@
xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
version="1.3">
- <info organisation="scoping.service" module="${ant.project.name}">
+ <info organisation="${project.organisation}" module="${ant.project.name}">
<ivyauthor name="rharrop"/>
</info>
<configurations>
- <include file="${spring.build.dir}/common/default-ivy-configurations.xml"/>
+ <include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
</configurations>
<publications>
@@ -22,7 +22,7 @@
<dependency org="org.springframework" name="org.springframework.context" rev="${org.springframework}" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.context.support" rev="${org.springframework}" conf="compile->runtime"/>
<dependency org="org.springframework" name="org.springframework.core" rev="${org.springframework}" conf="compile->runtime"/>
- <dependency name='org.eclipse.osgi' rev='${org.eclipse.osgi}' org='org.eclipse.osgi' conf='compile->runtime'/>
+ <dependency name='org.eclipse.osgi' rev='${org.eclipse.osgi}' org="org.eclipse.virgo.mirrored" conf='compile->runtime'/>
</dependencies>
</ivy-module>
diff --git a/test-apps/plan-deployment/build.properties b/test-apps/plan-deployment/build.properties
deleted file mode 100644
index aa48e854..00000000
--- a/test-apps/plan-deployment/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-version=1.0.0
-release.type=integration
-bucket.basename=springsource.com
-ivy.cache.dir=${user.dir}/../../ivy-cache
-integration.repo.dir=${user.dir}/../../integration-repo
-disable.bundlor=true
diff --git a/test-apps/plan-deployment/simple.bundle.one/build.xml b/test-apps/plan-deployment/simple.bundle.one/build.xml
index c53d35b3..3539cff8 100644
--- a/test-apps/plan-deployment/simple.bundle.one/build.xml
+++ b/test-apps/plan-deployment/simple.bundle.one/build.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="simple.bundle.one">
- <property file="${basedir}/../build.properties"/>
+ <property file="${basedir}/../../build.properties"/>
<property file="${basedir}/../../../build.versions"/>
<property name="jar.output.file" value="${basedir}/../../../org.eclipse.virgo.kernel.deployer.test/src/test/resources/plan-deployment/simple.bundle.one.jar"/>
<import file="${basedir}/../../../virgo-build/standard/default.xml"/>
diff --git a/test-apps/plan-deployment/simple.bundle.one/ivy.xml b/test-apps/plan-deployment/simple.bundle.one/ivy.xml
index cc9959db..470d1c56 100644
--- a/test-apps/plan-deployment/simple.bundle.one/ivy.xml
+++ b/test-apps/plan-deployment/simple.bundle.one/ivy.xml
@@ -5,12 +5,12 @@
xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
version="1.3">
- <info organisation="plan-deployment" module="${ant.project.name}">
+ <info organisation="${project.organisation}" module="${ant.project.name}">
<ivyauthor name="gnormington"/>
</info>
<configurations>
- <include file="${spring.build.dir}/common/default-ivy-configurations.xml"/>
+ <include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
</configurations>
<publications>
diff --git a/test-apps/plan-deployment/simple.bundle.three/build.xml b/test-apps/plan-deployment/simple.bundle.three/build.xml
index b98daf5e..d2967fb9 100644
--- a/test-apps/plan-deployment/simple.bundle.three/build.xml
+++ b/test-apps/plan-deployment/simple.bundle.three/build.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="simple.bundle.three">
- <property file="${basedir}/../build.properties"/>
+ <property file="${basedir}/../../build.properties"/>
<property file="${basedir}/../../../build.versions"/>
<property name="jar.output.file" value="${basedir}/../../../org.eclipse.virgo.kernel.deployer.test/src/test/resources/plan-deployment-dag/simple.bundle.three.jar"/>
<import file="${basedir}/../../../virgo-build/standard/default.xml"/>
diff --git a/test-apps/plan-deployment/simple.bundle.three/ivy.xml b/test-apps/plan-deployment/simple.bundle.three/ivy.xml
index 584d2f45..470d1c56 100644
--- a/test-apps/plan-deployment/simple.bundle.three/ivy.xml
+++ b/test-apps/plan-deployment/simple.bundle.three/ivy.xml
@@ -5,7 +5,7 @@
xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
version="1.3">
- <info organisation="plan-deployment" module="${ant.project.name}">
+ <info organisation="${project.organisation}" module="${ant.project.name}">
<ivyauthor name="gnormington"/>
</info>
diff --git a/test-apps/plan-deployment/simple.bundle.two/build.xml b/test-apps/plan-deployment/simple.bundle.two/build.xml
index ea90c8fd..587a5fdb 100644
--- a/test-apps/plan-deployment/simple.bundle.two/build.xml
+++ b/test-apps/plan-deployment/simple.bundle.two/build.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="simple.bundle.two">
- <property file="${basedir}/../build.properties"/>
+ <property file="${basedir}/../../build.properties"/>
<property file="${basedir}/../../../build.versions"/>
<property name="jar.output.file" value="${basedir}/../../../org.eclipse.virgo.kernel.deployer.test/src/test/resources/plan-deployment/simple.bundle.two.jar"/>
- <import file="${basedir}/../../../spring-build/standard/default.xml"/>
+ <import file="${basedir}/../../../virgo-build/standard/default.xml"/>
</project>
diff --git a/test-apps/plan-deployment/simple.bundle.two/ivy.xml b/test-apps/plan-deployment/simple.bundle.two/ivy.xml
index cc9959db..470d1c56 100644
--- a/test-apps/plan-deployment/simple.bundle.two/ivy.xml
+++ b/test-apps/plan-deployment/simple.bundle.two/ivy.xml
@@ -5,12 +5,12 @@
xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
version="1.3">
- <info organisation="plan-deployment" module="${ant.project.name}">
+ <info organisation="${project.organisation}" module="${ant.project.name}">
<ivyauthor name="gnormington"/>
</info>
<configurations>
- <include file="${spring.build.dir}/common/default-ivy-configurations.xml"/>
+ <include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
</configurations>
<publications>
diff --git a/test-apps/quartz-scheduler/README.TXT b/test-apps/quartz-scheduler/README.TXT
deleted file mode 100644
index f303c824..00000000
--- a/test-apps/quartz-scheduler/README.TXT
+++ /dev/null
@@ -1,21 +0,0 @@
-How to build
-------------
-
-1. Run ant jar in quartz.bundle.a
- or
-2. Run ant jar in quartz.bundle.b
- or
-3. Run ant jar in quartz.bundle.same1
- or
-4. Run ant jar in quartz.bundle.same2
-
-Output
-------
-
-1. com.springsource.kernel.deployer.test/src/test/resources/quartz/quartz.bundle.a.jar
- or
-2. com.springsource.kernel.deployer.test/src/test/resources/quartz/quartz.bundle.b.jar
- or
-3. com.springsource.kernel.deployer.test/src/test/resources/quartz/quartz.bundle.same1.jar
- or
-4. com.springsource.kernel.deployer.test/src/test/resources/quartz/quartz.bundle.same2.jar \ No newline at end of file
diff --git a/test-apps/quartz-scheduler/build.properties b/test-apps/quartz-scheduler/build.properties
deleted file mode 100644
index 17e34032..00000000
--- a/test-apps/quartz-scheduler/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-version=1.0.0
-release.type=integration
-bucket.basename=springsource.com
-ivy.cache.dir=${basedir}/../../ivy-cache
-integration.repo.dir=${basedir}/../../integration-repo
-disable.bundlor=true
-ivy.settings.file=${basedir}/../../../ivysettings.xml
diff --git a/test-apps/quartz-scheduler/quartz.bundle.a/build.xml b/test-apps/quartz-scheduler/quartz.bundle.a/build.xml
index 5014ff7a..b2f96dea 100644
--- a/test-apps/quartz-scheduler/quartz.bundle.a/build.xml
+++ b/test-apps/quartz-scheduler/quartz.bundle.a/build.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="quartz.bundle.a">
- <property file="${basedir}/../build.properties"/>
+ <property file="${basedir}/../../build.properties"/>
<property file="${basedir}/../../../build.versions"/>
<property name="jar.output.file" value="${basedir}/../../../org.eclipse.virgo.kernel.deployer.test/src/test/resources/quartz/quartz.bundle.a.jar"/>
- <import file="${basedir}/../../../spring-build/standard/default.xml"/>
+ <import file="${basedir}/../../../virgo-build/standard/default.xml"/>
</project>
diff --git a/test-apps/quartz-scheduler/quartz.bundle.a/ivy.xml b/test-apps/quartz-scheduler/quartz.bundle.a/ivy.xml
index 9f19ac47..88b21577 100644
--- a/test-apps/quartz-scheduler/quartz.bundle.a/ivy.xml
+++ b/test-apps/quartz-scheduler/quartz.bundle.a/ivy.xml
@@ -5,7 +5,7 @@
xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
version="1.3">
- <info organisation="org.eclipse.virgo.server.test" module="${ant.project.name}">
+ <info organisation="${project.organisation}" module="${ant.project.name}">
<ivyauthor name="sbrannen"/>
</info>
@@ -18,7 +18,7 @@
<dependencies>
<dependency org="com.opensymphony.quartz" name="com.springsource.org.quartz" rev="${com.opensymphony.quartz}" conf="provided->compile"/>
- <dependency org="org.eclipse.osgi" name="org.eclipse.osgi" rev="${org.eclipse.osgi}" conf="provided->compile"/>
+ <dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.osgi" rev="${org.eclipse.osgi}" conf="provided->compile"/>
<dependency org="org.springframework" name="org.springframework.beans" rev="${org.springframework}" conf="provided->compile"/>
<dependency org="org.springframework" name="org.springframework.context" rev="${org.springframework}" conf="provided->compile"/>
<dependency org="org.springframework" name="org.springframework.context.support" rev="${org.springframework}" conf="provided->compile"/>
diff --git a/test-apps/quartz-scheduler/quartz.bundle.a/src/main/resources/META-INF/MANIFEST.MF b/test-apps/quartz-scheduler/quartz.bundle.a/src/main/resources/META-INF/MANIFEST.MF
index 88ab6bf7..b3b5f7c7 100644
--- a/test-apps/quartz-scheduler/quartz.bundle.a/src/main/resources/META-INF/MANIFEST.MF
+++ b/test-apps/quartz-scheduler/quartz.bundle.a/src/main/resources/META-INF/MANIFEST.MF
@@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2
Bundle-SymbolicName: quartz.bundle.a
Bundle-Version: 1.0.0
Import-Bundle: com.springsource.org.quartz;version="[1.6.0,1.6.0]"
-Import-Library: org.springframework.spring;version="[2.5.5,3.1.0)"
+Import-Library: org.springframework.spring;version="[2.5.5,4.0.0)"
Export-Package: quartz.bundle.a
diff --git a/test-apps/quartz-scheduler/quartz.bundle.b/build.xml b/test-apps/quartz-scheduler/quartz.bundle.b/build.xml
index 19011026..04c4a7b4 100644
--- a/test-apps/quartz-scheduler/quartz.bundle.b/build.xml
+++ b/test-apps/quartz-scheduler/quartz.bundle.b/build.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="quartz.bundle.b">
- <property file="${basedir}/../build.properties"/>
+ <property file="${basedir}/../../build.properties"/>
<property file="${basedir}/../../../build.versions"/>
<property name="jar.output.file" value="${basedir}/../../../org.eclipse.virgo.kernel.deployer.test/src/test/resources/quartz/quartz.bundle.b.jar"/>
- <import file="${basedir}/../../../spring-build/standard/default.xml"/>
+ <import file="${basedir}/../../../virgo-build/standard/default.xml"/>
</project>
diff --git a/test-apps/quartz-scheduler/quartz.bundle.b/ivy.xml b/test-apps/quartz-scheduler/quartz.bundle.b/ivy.xml
index 9f19ac47..88b21577 100644
--- a/test-apps/quartz-scheduler/quartz.bundle.b/ivy.xml
+++ b/test-apps/quartz-scheduler/quartz.bundle.b/ivy.xml
@@ -5,7 +5,7 @@
xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
version="1.3">
- <info organisation="org.eclipse.virgo.server.test" module="${ant.project.name}">
+ <info organisation="${project.organisation}" module="${ant.project.name}">
<ivyauthor name="sbrannen"/>
</info>
@@ -18,7 +18,7 @@
<dependencies>
<dependency org="com.opensymphony.quartz" name="com.springsource.org.quartz" rev="${com.opensymphony.quartz}" conf="provided->compile"/>
- <dependency org="org.eclipse.osgi" name="org.eclipse.osgi" rev="${org.eclipse.osgi}" conf="provided->compile"/>
+ <dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.osgi" rev="${org.eclipse.osgi}" conf="provided->compile"/>
<dependency org="org.springframework" name="org.springframework.beans" rev="${org.springframework}" conf="provided->compile"/>
<dependency org="org.springframework" name="org.springframework.context" rev="${org.springframework}" conf="provided->compile"/>
<dependency org="org.springframework" name="org.springframework.context.support" rev="${org.springframework}" conf="provided->compile"/>
diff --git a/test-apps/quartz-scheduler/quartz.bundle.b/src/main/resources/META-INF/MANIFEST.MF b/test-apps/quartz-scheduler/quartz.bundle.b/src/main/resources/META-INF/MANIFEST.MF
index 8c8c16ea..f6e5c600 100644
--- a/test-apps/quartz-scheduler/quartz.bundle.b/src/main/resources/META-INF/MANIFEST.MF
+++ b/test-apps/quartz-scheduler/quartz.bundle.b/src/main/resources/META-INF/MANIFEST.MF
@@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2
Bundle-SymbolicName: quartz.bundle.b
Bundle-Version: 1.0.0
Import-Bundle: com.springsource.org.quartz;version="[1.6.0,1.6.0]"
-Import-Library: org.springframework.spring;version="[2.5.5,3.1.0)"
+Import-Library: org.springframework.spring;version="[2.5.5,4.0.0)"
Export-Package: quartz.bundle.b
diff --git a/test-apps/quartz-scheduler/quartz.bundle.same1/build.xml b/test-apps/quartz-scheduler/quartz.bundle.same1/build.xml
index 8cf604b8..93411a9b 100644
--- a/test-apps/quartz-scheduler/quartz.bundle.same1/build.xml
+++ b/test-apps/quartz-scheduler/quartz.bundle.same1/build.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="quartz.bundle.same1">
- <property file="${basedir}/../build.properties"/>
+ <property file="${basedir}/../../build.properties"/>
<property file="${basedir}/../../../build.versions"/>
<property name="jar.output.file" value="${basedir}/../../../org.eclipse.virgo.kernel.deployer.test/src/test/resources/quartz/quartz.bundle.same1.jar"/>
- <import file="${basedir}/../../../spring-build/standard/default.xml"/>
+ <import file="${basedir}/../../../virgo-build/standard/default.xml"/>
</project>
diff --git a/test-apps/quartz-scheduler/quartz.bundle.same1/ivy.xml b/test-apps/quartz-scheduler/quartz.bundle.same1/ivy.xml
index 9f19ac47..88b21577 100644
--- a/test-apps/quartz-scheduler/quartz.bundle.same1/ivy.xml
+++ b/test-apps/quartz-scheduler/quartz.bundle.same1/ivy.xml
@@ -5,7 +5,7 @@
xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
version="1.3">
- <info organisation="org.eclipse.virgo.server.test" module="${ant.project.name}">
+ <info organisation="${project.organisation}" module="${ant.project.name}">
<ivyauthor name="sbrannen"/>
</info>
@@ -18,7 +18,7 @@
<dependencies>
<dependency org="com.opensymphony.quartz" name="com.springsource.org.quartz" rev="${com.opensymphony.quartz}" conf="provided->compile"/>
- <dependency org="org.eclipse.osgi" name="org.eclipse.osgi" rev="${org.eclipse.osgi}" conf="provided->compile"/>
+ <dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.osgi" rev="${org.eclipse.osgi}" conf="provided->compile"/>
<dependency org="org.springframework" name="org.springframework.beans" rev="${org.springframework}" conf="provided->compile"/>
<dependency org="org.springframework" name="org.springframework.context" rev="${org.springframework}" conf="provided->compile"/>
<dependency org="org.springframework" name="org.springframework.context.support" rev="${org.springframework}" conf="provided->compile"/>
diff --git a/test-apps/quartz-scheduler/quartz.bundle.same1/src/main/resources/META-INF/MANIFEST.MF b/test-apps/quartz-scheduler/quartz.bundle.same1/src/main/resources/META-INF/MANIFEST.MF
index a7f5d990..66218ca9 100644
--- a/test-apps/quartz-scheduler/quartz.bundle.same1/src/main/resources/META-INF/MANIFEST.MF
+++ b/test-apps/quartz-scheduler/quartz.bundle.same1/src/main/resources/META-INF/MANIFEST.MF
@@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2
Bundle-SymbolicName: quartz.bundle.same1
Bundle-Version: 1.0.0
Import-Bundle: com.springsource.org.quartz;version="[1.6.0,1.6.0]"
-Import-Library: org.springframework.spring;version="[2.5.5,3.1.0)"
+Import-Library: org.springframework.spring;version="[2.5.5,4.0.0)"
Export-Package: quartz.bundle.same1
diff --git a/test-apps/quartz-scheduler/quartz.bundle.same2/build.xml b/test-apps/quartz-scheduler/quartz.bundle.same2/build.xml
index d87cd82e..9c3b4dd4 100644
--- a/test-apps/quartz-scheduler/quartz.bundle.same2/build.xml
+++ b/test-apps/quartz-scheduler/quartz.bundle.same2/build.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="quartz.bundle.same2">
- <property file="${basedir}/../build.properties"/>
+ <property file="${basedir}/../../build.properties"/>
<property file="${basedir}/../../../build.versions"/>
<property name="jar.output.file" value="${basedir}/../../../org.eclipse.virgo.kernel.deployer.test/src/test/resources/quartz/quartz.bundle.same2.jar"/>
- <import file="${basedir}/../../../spring-build/standard/default.xml"/>
+ <import file="${basedir}/../../../virgo-build/standard/default.xml"/>
</project>
diff --git a/test-apps/quartz-scheduler/quartz.bundle.same2/ivy.xml b/test-apps/quartz-scheduler/quartz.bundle.same2/ivy.xml
index 9f19ac47..88b21577 100644
--- a/test-apps/quartz-scheduler/quartz.bundle.same2/ivy.xml
+++ b/test-apps/quartz-scheduler/quartz.bundle.same2/ivy.xml
@@ -5,7 +5,7 @@
xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
version="1.3">
- <info organisation="org.eclipse.virgo.server.test" module="${ant.project.name}">
+ <info organisation="${project.organisation}" module="${ant.project.name}">
<ivyauthor name="sbrannen"/>
</info>
@@ -18,7 +18,7 @@
<dependencies>
<dependency org="com.opensymphony.quartz" name="com.springsource.org.quartz" rev="${com.opensymphony.quartz}" conf="provided->compile"/>
- <dependency org="org.eclipse.osgi" name="org.eclipse.osgi" rev="${org.eclipse.osgi}" conf="provided->compile"/>
+ <dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.osgi" rev="${org.eclipse.osgi}" conf="provided->compile"/>
<dependency org="org.springframework" name="org.springframework.beans" rev="${org.springframework}" conf="provided->compile"/>
<dependency org="org.springframework" name="org.springframework.context" rev="${org.springframework}" conf="provided->compile"/>
<dependency org="org.springframework" name="org.springframework.context.support" rev="${org.springframework}" conf="provided->compile"/>
diff --git a/test-apps/quartz-scheduler/quartz.bundle.same2/src/main/resources/META-INF/MANIFEST.MF b/test-apps/quartz-scheduler/quartz.bundle.same2/src/main/resources/META-INF/MANIFEST.MF
index fbca1d02..0a668786 100644
--- a/test-apps/quartz-scheduler/quartz.bundle.same2/src/main/resources/META-INF/MANIFEST.MF
+++ b/test-apps/quartz-scheduler/quartz.bundle.same2/src/main/resources/META-INF/MANIFEST.MF
@@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2
Bundle-SymbolicName: quartz.bundle.same2
Bundle-Version: 1.0.0
Import-Bundle: com.springsource.org.quartz;version="[1.6.0,1.6.0]"
-Import-Library: org.springframework.spring;version="[2.5.5,3.1.0)"
+Import-Library: org.springframework.spring;version="[2.5.5,4.0.0)"
Export-Package: quartz.bundle.same2
diff --git a/test-apps/redeploy-refresh/README.TXT b/test-apps/redeploy-refresh/README.TXT
deleted file mode 100644
index 693878f2..00000000
--- a/test-apps/redeploy-refresh/README.TXT
+++ /dev/null
@@ -1,11 +0,0 @@
-How to build
-------------
-
-1. Run ant jar simple.bundle.bad
-2. Run ant jar simple.bundle.ok
-
-Output
-------
-
-1. com.springsource.kernel.deployer.test/src/test/resources/redeploy-refresh/bad/simple.module.jar
-2. com.springsource.kernel.deployer.test/src/test/resources/redeploy-refresh/good/simple.module.jar
diff --git a/test-apps/redeploy-refresh/build.properties b/test-apps/redeploy-refresh/build.properties
deleted file mode 100644
index aa48e854..00000000
--- a/test-apps/redeploy-refresh/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-version=1.0.0
-release.type=integration
-bucket.basename=springsource.com
-ivy.cache.dir=${user.dir}/../../ivy-cache
-integration.repo.dir=${user.dir}/../../integration-repo
-disable.bundlor=true
diff --git a/test-apps/redeploy-refresh/simple.bundle.bad/build.xml b/test-apps/redeploy-refresh/simple.bundle.bad/build.xml
index 554e4dd6..0b565533 100644
--- a/test-apps/redeploy-refresh/simple.bundle.bad/build.xml
+++ b/test-apps/redeploy-refresh/simple.bundle.bad/build.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="simple.module">
+<project name="simple.module.bad">
- <property file="${basedir}/../build.properties"/>
+ <property file="${basedir}/../../build.properties"/>
<property file="${basedir}/../../../build.versions"/>
<property name="jar.output.file" value="${basedir}/../../../org.eclipse.virgo.kernel.deployer.test/src/test/resources/redeploy-refresh/bad/simple.module.jar"/>
- <import file="${basedir}/../../../spring-build/standard/default.xml"/>
+ <import file="${basedir}/../../../virgo-build/standard/default.xml"/>
</project>
diff --git a/test-apps/redeploy-refresh/simple.bundle.bad/ivy.xml b/test-apps/redeploy-refresh/simple.bundle.bad/ivy.xml
index a03ffb82..470d1c56 100644
--- a/test-apps/redeploy-refresh/simple.bundle.bad/ivy.xml
+++ b/test-apps/redeploy-refresh/simple.bundle.bad/ivy.xml
@@ -5,12 +5,12 @@
xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
version="1.3">
- <info organisation="simple.module" module="${ant.project.name}">
+ <info organisation="${project.organisation}" module="${ant.project.name}">
<ivyauthor name="gnormington"/>
</info>
<configurations>
- <include file="${spring.build.dir}/common/default-ivy-configurations.xml"/>
+ <include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
</configurations>
<publications>
diff --git a/test-apps/redeploy-refresh/simple.bundle.bad/src/main/java/.gitignore b/test-apps/redeploy-refresh/simple.bundle.bad/src/main/java/.gitignore
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/test-apps/redeploy-refresh/simple.bundle.bad/src/main/java/.gitignore
diff --git a/test-apps/redeploy-refresh/simple.bundle.ok/build.xml b/test-apps/redeploy-refresh/simple.bundle.ok/build.xml
index f3ce5108..a9bf9e7d 100644
--- a/test-apps/redeploy-refresh/simple.bundle.ok/build.xml
+++ b/test-apps/redeploy-refresh/simple.bundle.ok/build.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="simple.module">
+<project name="simple.module.good">
- <property file="${basedir}/../build.properties"/>
+ <property file="${basedir}/../../build.properties"/>
<property file="${basedir}/../../../build.versions"/>
<property name="jar.output.file" value="${basedir}/../../../org.eclipse.virgo.kernel.deployer.test/src/test/resources/redeploy-refresh/good/simple.module.jar"/>
- <import file="${basedir}/../../../spring-build/standard/default.xml"/>
+ <import file="${basedir}/../../../virgo-build/standard/default.xml"/>
</project>
diff --git a/test-apps/redeploy-refresh/simple.bundle.ok/ivy.xml b/test-apps/redeploy-refresh/simple.bundle.ok/ivy.xml
index a03ffb82..470d1c56 100644
--- a/test-apps/redeploy-refresh/simple.bundle.ok/ivy.xml
+++ b/test-apps/redeploy-refresh/simple.bundle.ok/ivy.xml
@@ -5,12 +5,12 @@
xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
version="1.3">
- <info organisation="simple.module" module="${ant.project.name}">
+ <info organisation="${project.organisation}" module="${ant.project.name}">
<ivyauthor name="gnormington"/>
</info>
<configurations>
- <include file="${spring.build.dir}/common/default-ivy-configurations.xml"/>
+ <include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
</configurations>
<publications>
diff --git a/test-apps/refresh/README.TXT b/test-apps/refresh/README.TXT
deleted file mode 100644
index b1e81531..00000000
--- a/test-apps/refresh/README.TXT
+++ /dev/null
@@ -1,13 +0,0 @@
-How to build
-------------
-
-1. Run ant jar in refresh-import-bundle/build-par
- or
-2. Run ant jar in refresh/build-par
-
-Output
-------
-
-1. com.springsource.kernel.deployer.test/src/test/resources/refresh-import-bundle.jar
- or
-2. com.springsource.kernel.deployer.test/src/test/resources/refresh.par \ No newline at end of file
diff --git a/test-apps/refresh/refresh-import-bundle/build-par/build.xml b/test-apps/refresh/refresh-import-bundle/build-par/build.xml
index 1b44e4aa..dc66b526 100644
--- a/test-apps/refresh/refresh-import-bundle/build-par/build.xml
+++ b/test-apps/refresh/refresh-import-bundle/build-par/build.xml
@@ -1,14 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="RefreshTest-Import-Bundle">
- <property name="bundle.version" value="1.0.0"/>
-
<path id="bundles">
<pathelement location="../exporter"/>
<pathelement location="../importer"/>
</path>
- <property file="${basedir}/../build.properties"/>
+ <property file="${basedir}/../../../build.properties"/>
<property name="par.output.file" value="${basedir}/../../../../org.eclipse.virgo.kernel.deployer.test/src/test/resources/refresh-import-bundle.par"/>
<import file="${basedir}/../../../../virgo-build/par/default.xml"/>
diff --git a/test-apps/refresh/refresh-import-bundle/build.properties b/test-apps/refresh/refresh-import-bundle/build.properties
deleted file mode 100644
index 091fce38..00000000
--- a/test-apps/refresh/refresh-import-bundle/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-version=1.0.0
-release.type=integration
-bucket.basename=springsource.com
-ivy.cache.dir=${basedir}/../../../../ivy-cache
-integration.repo.dir=${basedir}/../../../../integration-repo
-disable.bundlor=true
diff --git a/test-apps/refresh/refresh-import-bundle/exporter/build.xml b/test-apps/refresh/refresh-import-bundle/exporter/build.xml
index 9b7d583a..b17100d1 100644
--- a/test-apps/refresh/refresh-import-bundle/exporter/build.xml
+++ b/test-apps/refresh/refresh-import-bundle/exporter/build.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="RefreshExporter">
+<project name="RefreshBundleExporter">
- <property file="${basedir}/../build.properties"/>
+ <property file="${basedir}/../../../build.properties"/>
<import file="${basedir}/../../../../virgo-build/standard/default.xml"/>
</project>
diff --git a/test-apps/refresh/refresh-import-bundle/exporter/ivy.xml b/test-apps/refresh/refresh-import-bundle/exporter/ivy.xml
index 1518ce51..ae75255a 100644
--- a/test-apps/refresh/refresh-import-bundle/exporter/ivy.xml
+++ b/test-apps/refresh/refresh-import-bundle/exporter/ivy.xml
@@ -1,11 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
<ivy-module
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
- version="1.3">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd" version="1.3">
- <info organisation="refresh-import-bundle" module="${ant.project.name}">
+ <info organisation="${project.organisation}" module="${ant.project.name}">
<ivyauthor name="robharrop"/>
</info>
diff --git a/test-apps/refresh/refresh-import-bundle/importer/build.xml b/test-apps/refresh/refresh-import-bundle/importer/build.xml
index 7710e811..bce235b2 100644
--- a/test-apps/refresh/refresh-import-bundle/importer/build.xml
+++ b/test-apps/refresh/refresh-import-bundle/importer/build.xml
@@ -1,10 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="RefreshImporter">
+<project name="RefreshBundleImporter">
- <property name="bundle.version" value="1.0.0"/>
-
- <property file="${basedir}/../build.properties"/>
-
+ <property file="${basedir}/../../../build.properties"/>
<import file="${basedir}/../../../../virgo-build/standard/default.xml"/>
</project>
diff --git a/test-apps/refresh/refresh-import-bundle/importer/ivy.xml b/test-apps/refresh/refresh-import-bundle/importer/ivy.xml
index 8844fbec..30ce576b 100644
--- a/test-apps/refresh/refresh-import-bundle/importer/ivy.xml
+++ b/test-apps/refresh/refresh-import-bundle/importer/ivy.xml
@@ -5,7 +5,7 @@
xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
version="1.3">
- <info organisation="refresh-import-bundle" module="${ant.project.name}">
+ <info organisation="${project.organisation}" module="${ant.project.name}">
<ivyauthor name="robharrop"/>
</info>
diff --git a/test-apps/refresh/refresh/build-par/build.xml b/test-apps/refresh/refresh/build-par/build.xml
index 82160100..3b7e50ec 100644
--- a/test-apps/refresh/refresh/build-par/build.xml
+++ b/test-apps/refresh/refresh/build-par/build.xml
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="RefreshTest">
- <import file="${basedir}/../../../../virgo-build/multi-bundle/default.xml"/>
-
<path id="bundles">
<pathelement location="../exporter"/>
<pathelement location="../exporter2"/>
@@ -10,8 +8,11 @@
<pathelement location="../importer"/>
</path>
+ <property file="${basedir}/../../../build.properties"/>
+ <property file="${basedir}/../../../../build.versions"/>
<property name="par.expanded.dir" value="${basedir}/target/par-expanded"/>
-
+ <import file="${basedir}/../../../../virgo-build/par/default.xml"/>
+
<target name="jar">
<all-bundles target="jar"/>
diff --git a/test-apps/refresh/refresh/build.properties b/test-apps/refresh/refresh/build.properties
deleted file mode 100644
index 10f7f235..00000000
--- a/test-apps/refresh/refresh/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-version=1.0.0
-release.type=integration
-bucket.basename=springsource.com
-ivy.cache.dir=${basedir}/../../../ivy-cache
-integration.repo.dir=${basedir}/../../../../integration-repo
-disable.bundlor=true
diff --git a/test-apps/refresh/refresh/exporter/build.xml b/test-apps/refresh/refresh/exporter/build.xml
index 646d895e..dcb90cfc 100644
--- a/test-apps/refresh/refresh/exporter/build.xml
+++ b/test-apps/refresh/refresh/exporter/build.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="RefreshExporter">
- <property file="${basedir}/../build.properties"/>
- <property file="${basedir}/../../../build.versions"/>
+ <property file="${basedir}/../../../build.properties"/>
+ <property file="${basedir}/../../../../build.versions"/>
<import file="${basedir}/../../../../virgo-build/standard/default.xml"/>
diff --git a/test-apps/refresh/refresh/exporter/ivy.xml b/test-apps/refresh/refresh/exporter/ivy.xml
index 7fc2d939..5729da04 100644
--- a/test-apps/refresh/refresh/exporter/ivy.xml
+++ b/test-apps/refresh/refresh/exporter/ivy.xml
@@ -5,7 +5,7 @@
xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
version="1.3">
- <info organisation="refresh" module="${ant.project.name}">
+ <info organisation="${project.organisation}" module="${ant.project.name}">
<ivyauthor name="robharrop"/>
</info>
diff --git a/test-apps/refresh/refresh/exporter2/build.xml b/test-apps/refresh/refresh/exporter2/build.xml
index e03189bf..501fa856 100644
--- a/test-apps/refresh/refresh/exporter2/build.xml
+++ b/test-apps/refresh/refresh/exporter2/build.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="RefreshExporterv2">
- <property file="${basedir}/../build.properties"/>
- <property file="${basedir}/../../../build.versions"/>
+ <property file="${basedir}/../../../build.properties"/>
+ <property file="${basedir}/../../../../build.versions"/>
<import file="${basedir}/../../../../virgo-build/standard/default.xml"/>
diff --git a/test-apps/refresh/refresh/exporter2/ivy.xml b/test-apps/refresh/refresh/exporter2/ivy.xml
index 7fc2d939..5729da04 100644
--- a/test-apps/refresh/refresh/exporter2/ivy.xml
+++ b/test-apps/refresh/refresh/exporter2/ivy.xml
@@ -5,7 +5,7 @@
xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
version="1.3">
- <info organisation="refresh" module="${ant.project.name}">
+ <info organisation="${project.organisation}" module="${ant.project.name}">
<ivyauthor name="robharrop"/>
</info>
diff --git a/test-apps/refresh/refresh/exporter3/build.xml b/test-apps/refresh/refresh/exporter3/build.xml
index 54b2b456..e70557a8 100644
--- a/test-apps/refresh/refresh/exporter3/build.xml
+++ b/test-apps/refresh/refresh/exporter3/build.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="RefreshExporterv3">
- <property file="${basedir}/../build.properties"/>
- <property file="${basedir}/../../../build.versions"/>
+ <property file="${basedir}/../../../build.properties"/>
+ <property file="${basedir}/../../../../build.versions"/>
<import file="${basedir}/../../../../virgo-build/standard/default.xml"/>
diff --git a/test-apps/refresh/refresh/exporter3/ivy.xml b/test-apps/refresh/refresh/exporter3/ivy.xml
index 7fc2d939..5729da04 100644
--- a/test-apps/refresh/refresh/exporter3/ivy.xml
+++ b/test-apps/refresh/refresh/exporter3/ivy.xml
@@ -5,7 +5,7 @@
xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
version="1.3">
- <info organisation="refresh" module="${ant.project.name}">
+ <info organisation="${project.organisation}" module="${ant.project.name}">
<ivyauthor name="robharrop"/>
</info>
diff --git a/test-apps/refresh/refresh/importer/build.xml b/test-apps/refresh/refresh/importer/build.xml
index cc1120b9..872141f7 100644
--- a/test-apps/refresh/refresh/importer/build.xml
+++ b/test-apps/refresh/refresh/importer/build.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="RefreshImporter">
- <property file="${basedir}/../build.properties"/>
+ <property file="${basedir}/../../../build.properties"/>
<property file="${basedir}/../../../../build.versions"/>
<import file="${basedir}/../../../../virgo-build/standard/default.xml"/>
diff --git a/test-apps/refresh/refresh/importer/ivy.xml b/test-apps/refresh/refresh/importer/ivy.xml
index d3915115..8be79133 100644
--- a/test-apps/refresh/refresh/importer/ivy.xml
+++ b/test-apps/refresh/refresh/importer/ivy.xml
@@ -5,7 +5,7 @@
xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
version="1.3">
- <info organisation="refresh" module="${ant.project.name}">
+ <info organisation="${project.organisation}" module="${ant.project.name}">
<ivyauthor name="robharrop"/>
</info>
@@ -17,7 +17,7 @@
</publications>
<dependencies>
- <dependency org="org.eclipse.osgi" name="org.eclipse.osgi" rev="${org.eclipse.osgi}" conf="provided->compile"/>
+ <dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.osgi" rev="${org.eclipse.osgi}" conf="provided->compile"/>
<dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel.osgi" rev="latest.integration" conf="provided->compile"/>
<dependency org="org.eclipse.virgo.kernel" name="org.eclipse.virgo.kernel.deployer.test" rev="latest.integration" conf="provided->compile"/>
</dependencies>
diff --git a/test-apps/service-publication-from-repo-bundles/README.TXT b/test-apps/service-publication-from-repo-bundles/README.TXT
deleted file mode 100644
index 000ccf9d..00000000
--- a/test-apps/service-publication-from-repo-bundles/README.TXT
+++ /dev/null
@@ -1,13 +0,0 @@
-How to build
-------------
-
-1. Run ant jar in consumer
- or
-2. Run ant jar in publisher
-
-Output
-------
-
-1. com.springsource.kernel.deployer/test/src/test/resources/service-publication-from-repo/consumer.jar
- or
-2. com.springsource.kernel.deployer/test/src/test/resources/service-publication-from-repo/publisher.jar \ No newline at end of file
diff --git a/test-apps/service-publication-from-repo-bundles/build.properties b/test-apps/service-publication-from-repo-bundles/build.properties
deleted file mode 100644
index 0a1bca3f..00000000
--- a/test-apps/service-publication-from-repo-bundles/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-version=1.0.0
-release.type=integration
-bucket.basename=springsource.com
-ivy.cache.dir=${basedir}/../../ivy-cache
-integration.repo.dir=${basedir}/../../integration-repo
-disable.bundlor=true
diff --git a/test-apps/service-publication-from-repo-bundles/consumer/build.xml b/test-apps/service-publication-from-repo-bundles/consumer/build.xml
index 44b4b153..510459ff 100644
--- a/test-apps/service-publication-from-repo-bundles/consumer/build.xml
+++ b/test-apps/service-publication-from-repo-bundles/consumer/build.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="consumer">
- <property file="${basedir}/../build.properties"/>
+ <property file="${basedir}/../../build.properties"/>
<property file="${basedir}/../../../build.versions"/>
<property name="jar.output.file" value="${basedir}/../../../org.eclipse.virgo.kernel.deployer.test/src/test/resources/service-publication-from-repo/consumer.jar"/>
- <import file="${basedir}/../../../spring-build/standard/default.xml"/>
+ <import file="${basedir}/../../../virgo-build/standard/default.xml"/>
</project>
diff --git a/test-apps/service-publication-from-repo-bundles/consumer/ivy.xml b/test-apps/service-publication-from-repo-bundles/consumer/ivy.xml
index 11bbbc04..187290f2 100644
--- a/test-apps/service-publication-from-repo-bundles/consumer/ivy.xml
+++ b/test-apps/service-publication-from-repo-bundles/consumer/ivy.xml
@@ -5,12 +5,12 @@
xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
version="1.3">
- <info organisation="service.publication.from.repo" module="${ant.project.name}">
+ <info organisation="${project.organisation}" module="${ant.project.name}">
<ivyauthor name="awilkinson"/>
</info>
<configurations>
- <include file="${spring.build.dir}/common/default-ivy-configurations.xml"/>
+ <include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
</configurations>
<publications>
diff --git a/test-apps/service-publication-from-repo-bundles/consumer/src/main/java/.gitignore b/test-apps/service-publication-from-repo-bundles/consumer/src/main/java/.gitignore
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/test-apps/service-publication-from-repo-bundles/consumer/src/main/java/.gitignore
diff --git a/test-apps/service-publication-from-repo-bundles/publisher/build.xml b/test-apps/service-publication-from-repo-bundles/publisher/build.xml
index cb225c7b..c031c799 100644
--- a/test-apps/service-publication-from-repo-bundles/publisher/build.xml
+++ b/test-apps/service-publication-from-repo-bundles/publisher/build.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="publisher">
- <property file="${basedir}/../build.properties"/>
+ <property file="${basedir}/../../build.properties"/>
<property file="${basedir}/../../../build.versions"/>
<property name="jar.output.file" value="${basedir}/../../../org.eclipse.virgo.kernel.deployer.test/src/test/resources/service-publication-from-repo/publisher.jar"/>
- <import file="${basedir}/../../../spring-build/standard/default.xml"/>
+ <import file="${basedir}/../../../virgo-build/standard/default.xml"/>
</project>
diff --git a/test-apps/service-publication-from-repo-bundles/publisher/ivy.xml b/test-apps/service-publication-from-repo-bundles/publisher/ivy.xml
index 11bbbc04..187290f2 100644
--- a/test-apps/service-publication-from-repo-bundles/publisher/ivy.xml
+++ b/test-apps/service-publication-from-repo-bundles/publisher/ivy.xml
@@ -5,12 +5,12 @@
xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
version="1.3">
- <info organisation="service.publication.from.repo" module="${ant.project.name}">
+ <info organisation="${project.organisation}" module="${ant.project.name}">
<ivyauthor name="awilkinson"/>
</info>
<configurations>
- <include file="${spring.build.dir}/common/default-ivy-configurations.xml"/>
+ <include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
</configurations>
<publications>
diff --git a/test-apps/service-publication-from-repo-bundles/publisher/src/main/java/.gitignore b/test-apps/service-publication-from-repo-bundles/publisher/src/main/java/.gitignore
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/test-apps/service-publication-from-repo-bundles/publisher/src/main/java/.gitignore
diff --git a/test-apps/service-scoping-engine-1265/README.TXT b/test-apps/service-scoping-engine-1265/README.TXT
deleted file mode 100644
index 52b7ac7a..00000000
--- a/test-apps/service-scoping-engine-1265/README.TXT
+++ /dev/null
@@ -1,9 +0,0 @@
-How to build
-------------
-
-Run ant jar in build-par
-
-Output
-------
-
-com.springsource.kernel.deployer.test/src/test/resources/service-scoping/service-scoping-engine-1265.par \ No newline at end of file
diff --git a/test-apps/service-scoping-engine-1265/build-par/build.xml b/test-apps/service-scoping-engine-1265/build-par/build.xml
index 3bf238dc..cb39d0fd 100644
--- a/test-apps/service-scoping-engine-1265/build-par/build.xml
+++ b/test-apps/service-scoping-engine-1265/build-par/build.xml
@@ -6,8 +6,8 @@
<pathelement location="../dependent"/>
</path>
- <property file="${basedir}/../build.properties"/>
+ <property file="${basedir}/../../build.properties"/>
<property name="par.output.file" value="${basedir}/../../../org.eclipse.virgo.kernel.deployer.test/src/test/resources/service-scoping/service-scoping-engine-1265.par"/>
- <import file="${basedir}/../../../spring-build/par/default.xml"/>
+ <import file="${basedir}/../../../virgo-build/par/default.xml"/>
</project>
diff --git a/test-apps/service-scoping-engine-1265/build.properties b/test-apps/service-scoping-engine-1265/build.properties
deleted file mode 100644
index 0a1bca3f..00000000
--- a/test-apps/service-scoping-engine-1265/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-version=1.0.0
-release.type=integration
-bucket.basename=springsource.com
-ivy.cache.dir=${basedir}/../../ivy-cache
-integration.repo.dir=${basedir}/../../integration-repo
-disable.bundlor=true
diff --git a/test-apps/service-scoping-engine-1265/dependent/build.xml b/test-apps/service-scoping-engine-1265/dependent/build.xml
index 216d6243..b653e9d3 100644
--- a/test-apps/service-scoping-engine-1265/dependent/build.xml
+++ b/test-apps/service-scoping-engine-1265/dependent/build.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="scoping.service.dependent">
- <property file="${basedir}/../build.properties"/>
+ <property file="${basedir}/../../build.properties"/>
<property file="${basedir}/../../../build.versions"/>
- <import file="${basedir}/../../../spring-build/standard/default.xml"/>
+ <import file="${basedir}/../../../virgo-build/standard/default.xml"/>
</project>
diff --git a/test-apps/service-scoping-engine-1265/dependent/ivy.xml b/test-apps/service-scoping-engine-1265/dependent/ivy.xml
index c1c1f7b3..730d2af1 100644
--- a/test-apps/service-scoping-engine-1265/dependent/ivy.xml
+++ b/test-apps/service-scoping-engine-1265/dependent/ivy.xml
@@ -5,12 +5,12 @@
xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
version="1.3">
- <info organisation="scoping.service" module="${ant.project.name}">
+ <info organisation="${project.organisation}" module="${ant.project.name}">
<ivyauthor name="rharrop"/>
</info>
<configurations>
- <include file="${spring.build.dir}/common/default-ivy-configurations.xml"/>
+ <include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
</configurations>
<publications>
diff --git a/test-apps/service-scoping-engine-1265/dependent/src/main/java/.gitignore b/test-apps/service-scoping-engine-1265/dependent/src/main/java/.gitignore
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/test-apps/service-scoping-engine-1265/dependent/src/main/java/.gitignore
diff --git a/test-apps/service-scoping-engine-1265/master/build.xml b/test-apps/service-scoping-engine-1265/master/build.xml
index b3d919e7..022b67b6 100644
--- a/test-apps/service-scoping-engine-1265/master/build.xml
+++ b/test-apps/service-scoping-engine-1265/master/build.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="scoping.service.master">
- <property file="${basedir}/../build.properties"/>
+ <property file="${basedir}/../../build.properties"/>
<property file="${basedir}/../../../build.versions"/>
- <import file="${basedir}/../../../spring-build/standard/default.xml"/>
+ <import file="${basedir}/../../../virgo-build/standard/default.xml"/>
</project>
diff --git a/test-apps/service-scoping-engine-1265/master/ivy.xml b/test-apps/service-scoping-engine-1265/master/ivy.xml
index c1c1f7b3..730d2af1 100644
--- a/test-apps/service-scoping-engine-1265/master/ivy.xml
+++ b/test-apps/service-scoping-engine-1265/master/ivy.xml
@@ -5,12 +5,12 @@
xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
version="1.3">
- <info organisation="scoping.service" module="${ant.project.name}">
+ <info organisation="${project.organisation}" module="${ant.project.name}">
<ivyauthor name="rharrop"/>
</info>
<configurations>
- <include file="${spring.build.dir}/common/default-ivy-configurations.xml"/>
+ <include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
</configurations>
<publications>
diff --git a/test-apps/service-scoping-engine-1265/master/src/main/java/.gitignore b/test-apps/service-scoping-engine-1265/master/src/main/java/.gitignore
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/test-apps/service-scoping-engine-1265/master/src/main/java/.gitignore
diff --git a/test-apps/service-scoping-platform-183/README.TXT b/test-apps/service-scoping-platform-183/README.TXT
deleted file mode 100644
index 30c7a08c..00000000
--- a/test-apps/service-scoping-platform-183/README.TXT
+++ /dev/null
@@ -1,9 +0,0 @@
-How to build
-------------
-
-Run ant jar in build-par
-
-Output
-------
-
-com.springsource.kernel.deployer.test/src/test/resources/service-scoping/service-scoping-platform-183.par
diff --git a/test-apps/service-scoping-platform-183/build-par/build.xml b/test-apps/service-scoping-platform-183/build-par/build.xml
index 1302b10d..0177dc5b 100644
--- a/test-apps/service-scoping-platform-183/build-par/build.xml
+++ b/test-apps/service-scoping-platform-183/build-par/build.xml
@@ -6,8 +6,8 @@
<pathelement location="../scoping.service.module.b"/>
</path>
- <property file="${basedir}/../build.properties"/>
+ <property file="${basedir}/../../build.properties"/>
<property name="par.output.file" value="${basedir}/../../../org.eclipse.virgo.kernel.deployer.test/src/test/resources/service-scoping/service-scoping-platform-183.par"/>
- <import file="${basedir}/../../../spring-build/par/default.xml"/>
+ <import file="${basedir}/../../../virgo-build/par/default.xml"/>
</project>
diff --git a/test-apps/service-scoping-platform-183/build.properties b/test-apps/service-scoping-platform-183/build.properties
deleted file mode 100644
index aa48e854..00000000
--- a/test-apps/service-scoping-platform-183/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-version=1.0.0
-release.type=integration
-bucket.basename=springsource.com
-ivy.cache.dir=${user.dir}/../../ivy-cache
-integration.repo.dir=${user.dir}/../../integration-repo
-disable.bundlor=true
diff --git a/test-apps/service-scoping-platform-183/scoping.service.module.a/build.xml b/test-apps/service-scoping-platform-183/scoping.service.module.a/build.xml
index eb1852a4..0ec21f32 100644
--- a/test-apps/service-scoping-platform-183/scoping.service.module.a/build.xml
+++ b/test-apps/service-scoping-platform-183/scoping.service.module.a/build.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="scoping.service.module.a">
+<project name="scoping.service.183.module.a">
- <property file="${basedir}/../build.properties"/>
+ <property file="${basedir}/../../build.properties"/>
<property file="${basedir}/../../../build.versions"/>
- <import file="${basedir}/../../../spring-build/standard/default.xml"/>
+ <import file="${basedir}/../../../virgo-build/standard/default.xml"/>
</project>
diff --git a/test-apps/service-scoping-platform-183/scoping.service.module.a/ivy.xml b/test-apps/service-scoping-platform-183/scoping.service.module.a/ivy.xml
index c1c1f7b3..730d2af1 100644
--- a/test-apps/service-scoping-platform-183/scoping.service.module.a/ivy.xml
+++ b/test-apps/service-scoping-platform-183/scoping.service.module.a/ivy.xml
@@ -5,12 +5,12 @@
xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
version="1.3">
- <info organisation="scoping.service" module="${ant.project.name}">
+ <info organisation="${project.organisation}" module="${ant.project.name}">
<ivyauthor name="rharrop"/>
</info>
<configurations>
- <include file="${spring.build.dir}/common/default-ivy-configurations.xml"/>
+ <include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
</configurations>
<publications>
diff --git a/test-apps/service-scoping-platform-183/scoping.service.module.b/build.xml b/test-apps/service-scoping-platform-183/scoping.service.module.b/build.xml
index 69ce7e4d..3398fc34 100644
--- a/test-apps/service-scoping-platform-183/scoping.service.module.b/build.xml
+++ b/test-apps/service-scoping-platform-183/scoping.service.module.b/build.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="scoping.service.module.b">
+<project name="scoping.service.183.module.b">
- <property file="${basedir}/../build.properties"/>
+ <property file="${basedir}/../../build.properties"/>
<property file="${basedir}/../../../build.versions"/>
- <import file="${basedir}/../../../spring-build/standard/default.xml"/>
+ <import file="${basedir}/../../../virgo-build/standard/default.xml"/>
</project>
diff --git a/test-apps/service-scoping-platform-183/scoping.service.module.b/ivy.xml b/test-apps/service-scoping-platform-183/scoping.service.module.b/ivy.xml
index c1c1f7b3..730d2af1 100644
--- a/test-apps/service-scoping-platform-183/scoping.service.module.b/ivy.xml
+++ b/test-apps/service-scoping-platform-183/scoping.service.module.b/ivy.xml
@@ -5,12 +5,12 @@
xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
version="1.3">
- <info organisation="scoping.service" module="${ant.project.name}">
+ <info organisation="${project.organisation}" module="${ant.project.name}">
<ivyauthor name="rharrop"/>
</info>
<configurations>
- <include file="${spring.build.dir}/common/default-ivy-configurations.xml"/>
+ <include file="${virgo.build.dir}/common/default-ivy-configurations.xml"/>
</configurations>
<publications>
diff --git a/test-apps/service-scoping-platform-183/scoping.service.module.b/src/main/java/.gitignore b/test-apps/service-scoping-platform-183/scoping.service.module.b/src/main/java/.gitignore
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/test-apps/service-scoping-platform-183/scoping.service.module.b/src/main/java/.gitignore
diff --git a/test-apps/service-scoping/README.TXT b/test-apps/service-scoping/README.TXT
deleted file mode 100644
index c20786d8..00000000
--- a/test-apps/service-scoping/README.TXT
+++ /dev/null
@@ -1,13 +0,0 @@
-How to build
-------------
-
-1. Run ant jar in build-par
- or
-2. Run ant jar in scoping.service.global
-
-Output
-------
-
-1. com.springsource.kernel.deployer.test/src/test/resources/service-scoping/service-scoping.par
- or
-2. com.springsource.kernel.deployer.test/src/test/resources/service-scoping/scoping.service.global.jar
diff --git a/test-apps/service-scoping/build-par/build.xml b/test-apps/service-scoping/build-par/build.xml
index d3cd9fab..d143d9a7 100644
--- a/test-apps/service-scoping/build-par/build.xml
+++ b/test-apps/service-scoping/build-par/build.xml
@@ -6,7 +6,7 @@
<pathelement location="../scoping.service.module.b"/>
</path>
- <property file="${basedir}/../build.properties"/>
+ <property file="${basedir}/../../build.properties"/>
<property name="par.output.file" value="${basedir}/../../../org.eclipse.virgo.kernel.deployer.test/src/test/resources/service-scoping/service-scoping.par"/>
<import file="${basedir}/../../../virgo-build/par/default.xml"/>
diff --git a/test-apps/service-scoping/build.properties b/test-apps/service-scoping/build.properties
deleted file mode 100644
index 0a1bca3f..00000000
--- a/test-apps/service-scoping/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-version=1.0.0
-release.type=integration
-bucket.basename=springsource.com
-ivy.cache.dir=${basedir}/../../ivy-cache
-integration.repo.dir=${basedir}/../../integration-repo
-disable.bundlor=true
diff --git a/test-apps/service-scoping/scoping.service.global/build.xml b/test-apps/service-scoping/scoping.service.global/build.xml
index ae5ca5cb..b5825155 100644
--- a/test-apps/service-scoping/scoping.service.global/build.xml
+++ b/test-apps/service-scoping/scoping.service.global/build.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="scoping.service.global">
- <property file="${basedir}/../build.properties"/>
+ <property file="${basedir}/../../build.properties"/>
<property file="${basedir}/../../../build.versions"/>
<property name="jar.output.file" value="${basedir}/../../../org.eclipse.virgo.kernel.deployer.test/src/test/resources/service-scoping/scoping.service.global.jar"/>
<import file="${basedir}/../../../virgo-build/standard/default.xml"/>
diff --git a/test-apps/service-scoping/scoping.service.global/ivy.xml b/test-apps/service-scoping/scoping.service.global/ivy.xml
index 82fa0501..9fa026eb 100644
--- a/test-apps/service-scoping/scoping.service.global/ivy.xml
+++ b/test-apps/service-scoping/scoping.service.global/ivy.xml
@@ -5,7 +5,7 @@
xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
version="1.3">
- <info organisation="scoping.service" module="${ant.project.name}">
+ <info organisation="${project.organisation}" module="${ant.project.name}">
<ivyauthor name="rharrop"/>
</info>
diff --git a/test-apps/service-scoping/scoping.service.module.a/build.xml b/test-apps/service-scoping/scoping.service.module.a/build.xml
index fd6264ca..7dabaef5 100644
--- a/test-apps/service-scoping/scoping.service.module.a/build.xml
+++ b/test-apps/service-scoping/scoping.service.module.a/build.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="scoping.service.module.a">
- <property file="${basedir}/../build.properties"/>
+ <property file="${basedir}/../../build.properties"/>
<property file="${basedir}/../../../build.versions"/>
<import file="${basedir}/../../../virgo-build/standard/default.xml"/>
diff --git a/test-apps/service-scoping/scoping.service.module.a/ivy.xml b/test-apps/service-scoping/scoping.service.module.a/ivy.xml
index 5353aa8f..f2f65ea1 100644
--- a/test-apps/service-scoping/scoping.service.module.a/ivy.xml
+++ b/test-apps/service-scoping/scoping.service.module.a/ivy.xml
@@ -5,7 +5,7 @@
xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
version="1.3">
- <info organisation="scoping.service" module="${ant.project.name}">
+ <info organisation="${project.organisation}" module="${ant.project.name}">
<ivyauthor name="rharrop"/>
</info>
diff --git a/test-apps/service-scoping/scoping.service.module.b/build.xml b/test-apps/service-scoping/scoping.service.module.b/build.xml
index c294f95b..56e4fe80 100644
--- a/test-apps/service-scoping/scoping.service.module.b/build.xml
+++ b/test-apps/service-scoping/scoping.service.module.b/build.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="scoping.service.module.b">
- <property file="${basedir}/../build.properties"/>
+ <property file="${basedir}/../../build.properties"/>
<property file="${basedir}/../../../build.versions"/>
<import file="${basedir}/../../../virgo-build/standard/default.xml"/>
diff --git a/test-apps/service-scoping/scoping.service.module.b/ivy.xml b/test-apps/service-scoping/scoping.service.module.b/ivy.xml
index 913ee02a..b0a0106d 100644
--- a/test-apps/service-scoping/scoping.service.module.b/ivy.xml
+++ b/test-apps/service-scoping/scoping.service.module.b/ivy.xml
@@ -5,7 +5,7 @@
xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
version="1.3">
- <info organisation="scoping.service" module="${ant.project.name}">
+ <info organisation="${project.organisation}" module="${ant.project.name}">
<ivyauthor name="rharrop"/>
</info>
@@ -20,7 +20,7 @@
<dependencies>
<dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit}" conf="test->runtime"/>
- <dependency org="org.eclipse.osgi" name="org.eclipse.osgi" rev="${org.eclipse.osgi}" conf="provided->runtime"/>
+ <dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.osgi" rev="${org.eclipse.osgi}" conf="provided->runtime"/>
</dependencies>
</ivy-module>
diff --git a/test-apps/spring-2.5.6.A-sample/build.properties b/test-apps/spring-2.5.6.A-sample/build.properties
deleted file mode 100644
index 0a1bca3f..00000000
--- a/test-apps/spring-2.5.6.A-sample/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-version=1.0.0
-release.type=integration
-bucket.basename=springsource.com
-ivy.cache.dir=${basedir}/../../ivy-cache
-integration.repo.dir=${basedir}/../../integration-repo
-disable.bundlor=true
diff --git a/test-apps/spring-2.5.6.A-sample/build.xml b/test-apps/spring-2.5.6.A-sample/build.xml
index 36cfd819..f1e0cba8 100644
--- a/test-apps/spring-2.5.6.A-sample/build.xml
+++ b/test-apps/spring-2.5.6.A-sample/build.xml
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="spring.256A.sample">
- <property file="${basedir}/build.properties"/>
+
+ <property file="${basedir}/../build.properties"/>
<property file="${basedir}/../../build.versions"/>
<property name="jar.output.file" value="${basedir}/../../org.eclipse.virgo.kernel.deployer.test/src/test/resources/spring.256A.sample.jar"/>
- <import file="${basedir}/../../spring-build/standard/default.xml"/>
+ <import file="${basedir}/../../virgo-build/standard/default.xml"/>
+
</project>
diff --git a/test-apps/spring-2.5.6.A-sample/ivy.xml b/test-apps/spring-2.5.6.A-sample/ivy.xml
index de4b63aa..ba94f72b 100644
--- a/test-apps/spring-2.5.6.A-sample/ivy.xml
+++ b/test-apps/spring-2.5.6.A-sample/ivy.xml
@@ -4,7 +4,7 @@
xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
version="1.3">
- <info organisation="org.eclipse.virgo.server.test" module="${ant.project.name}">
+ <info organisation="${project.organisation}" module="${ant.project.name}">
<ivyauthor name="rmadala" />
</info>
diff --git a/test-apps/synthetic-tccl/README.TXT b/test-apps/synthetic-tccl/README.TXT
deleted file mode 100644
index 3753d408..00000000
--- a/test-apps/synthetic-tccl/README.TXT
+++ /dev/null
@@ -1,13 +0,0 @@
-How to build
-------------
-
-Perform the following steps in this order:
-1. Run ant clean clean-integration jar in synthetic.tccl.global
-2. Run ant clean jar in build-par
-
-Output
-------
-
-1. org.eclipse.virgo.kernel.deployer.test/src/test/resources/synthetic-tccl/synthetic.tccl.global.jar
-2. org.eclilpse.virgo.kernel.deployer.test/src/test/resources/synthetic-tccl/synthetic-tccl.par
-
diff --git a/test-apps/synthetic-tccl/build-par/build.xml b/test-apps/synthetic-tccl/build-par/build.xml
index 650dc8ba..c4c521ae 100644
--- a/test-apps/synthetic-tccl/build-par/build.xml
+++ b/test-apps/synthetic-tccl/build-par/build.xml
@@ -6,7 +6,7 @@
<pathelement location="../synthetic.tccl.bundle.b"/>
</path>
- <property file="${basedir}/../build.properties"/>
+ <property file="${basedir}/../../build.properties"/>
<property name="par.output.dir" value="${basedir}/../../../org.eclipse.virgo.kernel.deployer.test/src/test/resources/synthetic-tccl"/>
<import file="${basedir}/../../../virgo-build/par/default.xml"/>
diff --git a/test-apps/synthetic-tccl/build.properties b/test-apps/synthetic-tccl/build.properties
deleted file mode 100644
index f1e7e81f..00000000
--- a/test-apps/synthetic-tccl/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-version=1.0.0
-release.type=integration
-ivy.cache.dir=${basedir}/../../ivy-cache
-integration.repo.dir=${basedir}/../../integration-repo
-disable.bundlor=true
diff --git a/test-apps/synthetic-tccl/synthetic.tccl.bundle.a/build.xml b/test-apps/synthetic-tccl/synthetic.tccl.bundle.a/build.xml
index 62e8672b..65788469 100644
--- a/test-apps/synthetic-tccl/synthetic.tccl.bundle.a/build.xml
+++ b/test-apps/synthetic-tccl/synthetic.tccl.bundle.a/build.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="synthetic.tccl.bundle.a">
- <property file="${basedir}/../build.properties"/>
+ <property file="${basedir}/../../build.properties"/>
<property file="${basedir}/../../../build.versions"/>
<import file="${basedir}/../../../virgo-build/standard/default.xml"/>
diff --git a/test-apps/synthetic-tccl/synthetic.tccl.bundle.a/ivy.xml b/test-apps/synthetic-tccl/synthetic.tccl.bundle.a/ivy.xml
index cf4424fb..fe83cf41 100644
--- a/test-apps/synthetic-tccl/synthetic.tccl.bundle.a/ivy.xml
+++ b/test-apps/synthetic-tccl/synthetic.tccl.bundle.a/ivy.xml
@@ -5,7 +5,7 @@
xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
version="1.3">
- <info organisation="org.eclipse.virgo.synthetic.tccl" module="${ant.project.name}">
+ <info organisation="${project.organisation}" module="${ant.project.name}">
<ivyauthor name="gnormington"/>
</info>
diff --git a/test-apps/synthetic-tccl/synthetic.tccl.bundle.b/build.xml b/test-apps/synthetic-tccl/synthetic.tccl.bundle.b/build.xml
index 5e1533a4..d2c5835e 100644
--- a/test-apps/synthetic-tccl/synthetic.tccl.bundle.b/build.xml
+++ b/test-apps/synthetic-tccl/synthetic.tccl.bundle.b/build.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="synthetic.tccl.bundle.b">
- <property file="${basedir}/../build.properties"/>
+ <property file="${basedir}/../../build.properties"/>
<property file="${basedir}/../../../build.versions"/>
<import file="${basedir}/../../../virgo-build/standard/default.xml"/>
diff --git a/test-apps/synthetic-tccl/synthetic.tccl.bundle.b/ivy.xml b/test-apps/synthetic-tccl/synthetic.tccl.bundle.b/ivy.xml
index 405236c6..a632bad5 100644
--- a/test-apps/synthetic-tccl/synthetic.tccl.bundle.b/ivy.xml
+++ b/test-apps/synthetic-tccl/synthetic.tccl.bundle.b/ivy.xml
@@ -5,7 +5,7 @@
xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
version="1.3">
- <info organisation="org.eclipse.virgo.synthetic.tccl" module="${ant.project.name}">
+ <info organisation="${project.organisation}" module="${ant.project.name}">
<ivyauthor name="gnormington"/>
</info>
@@ -19,9 +19,9 @@
</publications>
<dependencies>
- <dependency org="org.eclipse.virgo.synthetic.tccl" name="synthetic.tccl.global" rev="latest.integration" conf="provided->runtime" />
+ <dependency org="${project.organisation}" name="synthetic.tccl.global" rev="latest.integration" conf="provided->runtime" />
<dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit}" conf="test->runtime"/>
- <dependency org="org.eclipse.osgi" name="org.eclipse.osgi" rev="${org.eclipse.osgi}" conf="provided->runtime"/>
+ <dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.osgi" rev="${org.eclipse.osgi}" conf="provided->runtime"/>
</dependencies>
</ivy-module>
diff --git a/test-apps/synthetic-tccl/synthetic.tccl.global/build.xml b/test-apps/synthetic-tccl/synthetic.tccl.global/build.xml
index 18aeffb1..ee3da18e 100644
--- a/test-apps/synthetic-tccl/synthetic.tccl.global/build.xml
+++ b/test-apps/synthetic-tccl/synthetic.tccl.global/build.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="synthetic.tccl.global">
- <property file="${basedir}/../build.properties"/>
+ <property file="${basedir}/../../build.properties"/>
<property file="${basedir}/../../../build.versions"/>
<property name="jar.output.dir" value="${basedir}/../../../org.eclipse.virgo.kernel.deployer.test/src/test/resources/synthetic-tccl"/>
<import file="${basedir}/../../../virgo-build/standard/default.xml"/>
diff --git a/test-apps/synthetic-tccl/synthetic.tccl.global/ivy.xml b/test-apps/synthetic-tccl/synthetic.tccl.global/ivy.xml
index cf4424fb..fe83cf41 100644
--- a/test-apps/synthetic-tccl/synthetic.tccl.global/ivy.xml
+++ b/test-apps/synthetic-tccl/synthetic.tccl.global/ivy.xml
@@ -5,7 +5,7 @@
xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
version="1.3">
- <info organisation="org.eclipse.virgo.synthetic.tccl" module="${ant.project.name}">
+ <info organisation="${project.organisation}" module="${ant.project.name}">
<ivyauthor name="gnormington"/>
</info>

Back to the top