Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlyn Normington2012-01-20 14:35:29 +0000
committerGlyn Normington2012-01-20 14:35:29 +0000
commit6e512f02fff75c3306a0717619c3cbf93cc4cdab (patch)
tree1c8c75d8d71bb2201ba3f955a104fba9cb249fbb /org.eclipse.virgo.kernel.deployer.test/src/test
parent50c796f35e6c34a4175455f0ad156ac3bee0e0b5 (diff)
parent893696e6c29b3fc741315bad61793d43b8e43eca (diff)
downloadorg.eclipse.virgo.kernel-6e512f02fff75c3306a0717619c3cbf93cc4cdab.tar.gz
org.eclipse.virgo.kernel-6e512f02fff75c3306a0717619c3cbf93cc4cdab.tar.xz
org.eclipse.virgo.kernel-6e512f02fff75c3306a0717619c3cbf93cc4cdab.zip
Merge branch '364571-introduce-nano' into 358441-generalise-installartifact-tree-to-a-dag
Diffstat (limited to 'org.eclipse.virgo.kernel.deployer.test/src/test')
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/PlanUriIntegrationTests.java166
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/RefreshTests.java30
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/java-profile/java6-server.profile207
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/no.heap.dump.test.config.properties6
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/spring256.test.config.properties6
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/test.config.properties6
6 files changed, 390 insertions, 31 deletions
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/PlanUriIntegrationTests.java b/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/PlanUriIntegrationTests.java
new file mode 100644
index 00000000..51553577
--- /dev/null
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/PlanUriIntegrationTests.java
@@ -0,0 +1,166 @@
+/*******************************************************************************
+ * 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 org.eclipse.virgo.kernel.deployer.test;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.Writer;
+
+import org.eclipse.virgo.kernel.deployer.core.DeploymentException;
+import org.eclipse.virgo.kernel.deployer.core.DeploymentIdentity;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.osgi.framework.Version;
+
+/**
+ * These tests cover the use of URIs in plans.
+ */
+public class PlanUriIntegrationTests extends AbstractDeployerIntegrationTest {
+
+ private static final String PLAN_TYPE = "plan";
+
+ private static final String TEST_RESOURCES_DIRECTORY = "src/test/resources/plan-deployment/";
+
+ private static final String GENERATED_PLAN_DIRECTORY = "target/PlanUriIntegrationTests/";
+
+ private static final String PLAN_EXTENSION = ".plan";
+
+ private static final String XML_HEADER = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
+
+ private static final String NAMESPACES = " xmlns=\"http://www.eclipse.org/virgo/schema/plan\" \n xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" \n xsi:schemaLocation=\" http://www.eclipse.org/virgo/schema/plan http://www.eclipse.org/virgo/schema/plan/eclipse-virgo-plan.xsd\"";
+
+ @BeforeClass
+ public static void setUpClass() throws Exception {
+ File generatedPlanDirectory = new File(GENERATED_PLAN_DIRECTORY);
+ generatedPlanDirectory.mkdirs();
+ }
+
+ @Test
+ public void testUriInPlan() throws IOException, DeploymentException, InterruptedException {
+ TestArtifactInfo planInfo = createPlanFile("uriplan", Version.emptyVersion, false, false,
+ new File(TEST_RESOURCES_DIRECTORY + "global.jar").toURI().toString());
+ testPlan(planInfo);
+ }
+
+ @Test
+ public void testBundleAndConfigUrisInPlan() throws IOException, DeploymentException, InterruptedException {
+ TestArtifactInfo planInfo = createPlanFile("uriplan", Version.emptyVersion, false, false, new File(TEST_RESOURCES_DIRECTORY
+ + "com.foo.bar.properties").toURI().toString(), new File(TEST_RESOURCES_DIRECTORY + "global.jar").toURI().toString());
+ testPlan(planInfo);
+ }
+
+ @Test(expected = DeploymentException.class)
+ public void testNonFileUriInPlan() throws IOException, DeploymentException, InterruptedException {
+ TestArtifactInfo planInfo = createPlanFile("uriplan", Version.emptyVersion, false, false, "http://www.eclipse.org");
+ testPlan(planInfo);
+ }
+
+ @Test(expected = DeploymentException.class)
+ public void testRelativeUriInPlan() throws IOException, DeploymentException, InterruptedException {
+ TestArtifactInfo planInfo = createPlanFile("uriplan", Version.emptyVersion, false, false, "file:" + TEST_RESOURCES_DIRECTORY + "global.jar");
+ testPlan(planInfo);
+ }
+
+ private void testPlan(TestArtifactInfo plan) throws DeploymentException {
+ DeploymentIdentity parentId = deploy(plan);
+ this.deployer.undeploy(parentId);
+ }
+
+ private DeploymentIdentity deploy(TestArtifactInfo i) throws DeploymentException {
+ DeploymentIdentity identity = this.deployer.deploy(i.getFile().toURI());
+ Assert.assertEquals(i.getType(), identity.getType());
+ Assert.assertEquals(i.getName(), identity.getSymbolicName());
+ Assert.assertEquals(i.getVersion(), new Version(identity.getVersion()));
+ return identity;
+ }
+
+ public static TestArtifactInfo createPlanFile(String planName, Version planVersion, boolean scoped, boolean atomic, String... uris)
+ throws IOException {
+ StringBuffer planContent = new StringBuffer(1024);
+ planContent.append(XML_HEADER);
+ planContent.append("<plan name=\"" + planName + "\" version=\"" + planVersion + "\" scoped=\"" + new Boolean(scoped) + "\" atomic=\""
+ + new Boolean(atomic) + "\" \n" + NAMESPACES + ">\n");
+
+ for (String uri : uris) {
+ planContent.append(" <artifact uri=\"" + uri + "\"/>\n");
+ }
+
+ planContent.append("</plan>");
+
+ TestArtifactInfo info = new TestArtifactInfo(PLAN_TYPE, planName, planVersion);
+
+ String fileName = planName + "-" + planVersion + PLAN_EXTENSION;
+ File planFile = new File(GENERATED_PLAN_DIRECTORY + fileName);
+ Writer writer = new FileWriter(planFile);
+ try {
+ writer.write(planContent.toString());
+ } finally {
+ writer.close();
+ }
+
+ info.setFile(planFile);
+
+ return info;
+ }
+
+ private static class TestArtifactInfo {
+
+ private final String type;
+
+ private final String name;
+
+ private final Version version;
+
+ private File file;
+
+ public TestArtifactInfo(String type, String name, Version version) {
+ this.type = type;
+ this.name = name;
+ this.version = version;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public Version getVersion() {
+ return version;
+ }
+
+ public void setFile(File file) {
+ this.file = file;
+ }
+
+ public File getFile() {
+ if (this.file == null) {
+ throw new IllegalStateException("TestArtifactInfo file not set");
+ }
+ return file;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public String toString() {
+ return name;
+ }
+
+ }
+
+}
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 4188f98e..4806476b 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
@@ -16,12 +16,14 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
import java.io.IOException;
import java.util.Set;
+import org.eclipse.virgo.kernel.deployer.core.ApplicationDeployer;
+import org.eclipse.virgo.kernel.deployer.core.DeploymentException;
+import org.eclipse.virgo.kernel.deployer.core.DeploymentIdentity;
+import org.eclipse.virgo.util.io.JarUtils;
+import org.eclipse.virgo.util.io.PathReference;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -29,12 +31,6 @@ import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
-import org.eclipse.virgo.kernel.deployer.core.ApplicationDeployer;
-import org.eclipse.virgo.kernel.deployer.core.DeploymentException;
-import org.eclipse.virgo.kernel.deployer.core.DeploymentIdentity;
-import org.eclipse.virgo.util.io.JarUtils;
-import org.eclipse.virgo.util.io.PathReference;
-
/**
* Test refreshing individual modules of a deployed application.
* <p />
@@ -46,8 +42,6 @@ public class RefreshTests extends AbstractDeployerIntegrationTest {
private static final String REFRESH_EXPORTER_VERSION = "1.0.0.BUILD-20100310081114";
- private static final File LOG_FILE = new File("target/serviceability/eventlog/eventlog.log");
-
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";
@@ -62,18 +56,6 @@ public class RefreshTests extends AbstractDeployerIntegrationTest {
private PathReference parImportBundle;
- private int existingLines;
-
- public void countExistingLogLines() throws IOException {
- BufferedReader reader = new BufferedReader(new FileReader(LOG_FILE));
- String line = reader.readLine();
- existingLines = 0;
- while (line != null) {
- existingLines++;
- line = reader.readLine();
- }
- }
-
@Before
public void setUp() throws Exception {
PathReference pr = new PathReference("./target/org.eclipse.virgo.kernel");
@@ -90,8 +72,6 @@ public class RefreshTests extends AbstractDeployerIntegrationTest {
JarUtils.unpackTo(par, explodedPar);
parImportBundle = new PathReference("src/test/resources/refresh-import-bundle.par");
-
- countExistingLogLines();
}
@After
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/java-profile/java6-server.profile b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/java-profile/java6-server.profile
new file mode 100644
index 00000000..72c7529e
--- /dev/null
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/java-profile/java6-server.profile
@@ -0,0 +1,207 @@
+org.osgi.framework.system.packages = \
+ javax.accessibility,\
+ javax.activation,\
+ javax.activation;version="1.1.1",\
+ javax.activity,\
+ javax.annotation,\
+ javax.annotation;version="1.0.0",\
+ javax.annotation.processing,\
+ javax.crypto,\
+ javax.crypto.interfaces,\
+ javax.crypto.spec,\
+ javax.imageio,\
+ javax.imageio.event,\
+ javax.imageio.metadata,\
+ javax.imageio.plugins.bmp,\
+ javax.imageio.plugins.jpeg,\
+ javax.imageio.spi,\
+ javax.imageio.stream,\
+ javax.jws,\
+ javax.jws;version="2.0",\
+ javax.jws.soap,\
+ javax.jws.soap;version="2.0",\
+ javax.lang.model,\
+ javax.lang.model.element,\
+ javax.lang.model.type,\
+ javax.lang.model.util,\
+ javax.management,\
+ javax.management.loading,\
+ javax.management.modelmbean,\
+ javax.management.monitor,\
+ javax.management.openmbean,\
+ javax.management.relation,\
+ javax.management.remote,\
+ javax.management.remote.rmi,\
+ javax.management.timer,\
+ javax.naming,\
+ javax.naming.directory,\
+ javax.naming.event,\
+ javax.naming.ldap,\
+ javax.naming.spi,\
+ javax.net,\
+ javax.net.ssl,\
+ javax.print,\
+ javax.print.attribute,\
+ javax.print.attribute.standard,\
+ javax.print.event,\
+ javax.rmi,\
+ javax.rmi.CORBA,\
+ javax.rmi.ssl,\
+ javax.script,\
+ javax.script;version="1.1",\
+ javax.security.auth,\
+ javax.security.auth.callback,\
+ javax.security.auth.kerberos,\
+ javax.security.auth.login,\
+ javax.security.auth.spi,\
+ javax.security.auth.x500,\
+ javax.security.cert,\
+ javax.security.sasl,\
+ javax.sound.midi,\
+ javax.sound.midi.spi,\
+ javax.sound.sampled,\
+ javax.sound.sampled.spi,\
+ javax.sql,\
+ javax.sql.rowset,\
+ javax.sql.rowset.serial,\
+ javax.sql.rowset.spi,\
+ javax.swing,\
+ javax.swing.border,\
+ javax.swing.colorchooser,\
+ javax.swing.event,\
+ javax.swing.filechooser,\
+ javax.swing.plaf,\
+ javax.swing.plaf.basic,\
+ javax.swing.plaf.metal,\
+ javax.swing.plaf.multi,\
+ javax.swing.plaf.synth,\
+ javax.swing.table,\
+ javax.swing.text,\
+ javax.swing.text.html,\
+ javax.swing.text.html.parser,\
+ javax.swing.text.rtf,\
+ javax.swing.tree,\
+ javax.swing.undo,\
+ javax.tools,\
+ javax.transaction,\
+ javax.transaction;version="1.0.1",\
+ javax.transaction;version="1.1.0",\
+ javax.transaction.xa,\
+ javax.transaction.xa;version="1.0.1",\
+ javax.transaction.xa;version="1.1.0",\
+ javax.xml,\
+ javax.xml;version="1.0.1",\
+ javax.xml.bind,\
+ javax.xml.bind;version="2.0",\
+ javax.xml.bind.annotation,\
+ javax.xml.bind.annotation;version="2.0",\
+ javax.xml.bind.annotation.adapters,\
+ javax.xml.bind.annotation.adapters;version="2.0",\
+ javax.xml.bind.attachment,\
+ javax.xml.bind.attachment;version="2.0",\
+ javax.xml.bind.helpers,\
+ javax.xml.bind.helpers;version="2.0",\
+ javax.xml.bind.util,\
+ javax.xml.bind.util;version="2.0",\
+ javax.xml.crypto,\
+ javax.xml.crypto;version="1.0",\
+ javax.xml.crypto.dom,\
+ javax.xml.crypto.dom;version="1.0",\
+ javax.xml.crypto.dsig,\
+ javax.xml.crypto.dsig;version="1.0",\
+ javax.xml.crypto.dsig.dom,\
+ javax.xml.crypto.dsig.dom;version="1.0",\
+ javax.xml.crypto.dsig.keyinfo,\
+ javax.xml.crypto.dsig.keyinfo;version="1.0",\
+ javax.xml.crypto.dsig.spec,\
+ javax.xml.crypto.dsig.spec;version="1.0",\
+ javax.xml.datatype,\
+ javax.xml.namespace,\
+ javax.xml.parsers,\
+ javax.xml.soap,\
+ javax.xml.soap;version="1.3.0",\
+ javax.xml.stream,\
+ javax.xml.stream;version="1.0.1",\
+ javax.xml.stream.events,\
+ javax.xml.stream.events;version="1.0.1",\
+ javax.xml.stream.util,\
+ javax.xml.stream.util;version="1.0.1",\
+ javax.xml.transform,\
+ javax.xml.transform.dom,\
+ javax.xml.transform.sax,\
+ javax.xml.transform.stax,\
+ javax.xml.transform.stream,\
+ javax.xml.validation,\
+ javax.xml.ws,\
+ javax.xml.ws;version="2.1.1",\
+ javax.xml.ws.handler,\
+ javax.xml.ws.handler;version="2.1.1",\
+ javax.xml.ws.handler.soap,\
+ javax.xml.ws.handler.soap;version="2.1.1",\
+ javax.xml.ws.http,\
+ javax.xml.ws.http;version="2.1.1",\
+ javax.xml.ws.soap,\
+ javax.xml.ws.soap;version="2.1.1",\
+ javax.xml.ws.spi,\
+ javax.xml.ws.spi;version="2.1.1",\
+ javax.xml.xpath,\
+ org.ietf.jgss,\
+ org.omg.CORBA,\
+ org.omg.CORBA_2_3,\
+ org.omg.CORBA_2_3.portable,\
+ org.omg.CORBA.DynAnyPackage,\
+ org.omg.CORBA.ORBPackage,\
+ org.omg.CORBA.portable,\
+ org.omg.CORBA.TypeCodePackage,\
+ org.omg.CosNaming,\
+ org.omg.CosNaming.NamingContextExtPackage,\
+ org.omg.CosNaming.NamingContextPackage,\
+ org.omg.Dynamic,\
+ org.omg.DynamicAny,\
+ org.omg.DynamicAny.DynAnyFactoryPackage,\
+ org.omg.DynamicAny.DynAnyPackage,\
+ org.omg.IOP,\
+ org.omg.IOP.CodecFactoryPackage,\
+ org.omg.IOP.CodecPackage,\
+ org.omg.Messaging,\
+ org.omg.PortableInterceptor,\
+ org.omg.PortableInterceptor.ORBInitInfoPackage,\
+ org.omg.PortableServer,\
+ org.omg.PortableServer.CurrentPackage,\
+ org.omg.PortableServer.POAManagerPackage,\
+ org.omg.PortableServer.POAPackage,\
+ org.omg.PortableServer.portable,\
+ org.omg.PortableServer.ServantLocatorPackage,\
+ org.omg.SendingContext,\
+ org.omg.stub.java.rmi,\
+ org.w3c.dom,\
+ org.w3c.dom.bootstrap,\
+ org.w3c.dom.css,\
+ org.w3c.dom.events,\
+ org.w3c.dom.html,\
+ org.w3c.dom.ls,\
+ org.w3c.dom.ranges,\
+ org.w3c.dom.stylesheets,\
+ org.w3c.dom.traversal,\
+ org.w3c.dom.views ,\
+ org.xml.sax,\
+ org.xml.sax.ext,\
+ org.xml.sax.helpers
+org.osgi.framework.bootdelegation = \
+ org.eclipse.virgo.osgi.extensions.*,\
+ org.eclipse.virgo.osgi.launcher.*,\
+ org.eclipse.virgo.kernel.authentication,\
+ com.sun.*,\
+ javax.xml.*,\
+ org.apache.xerces.jaxp.*,\
+ org.w3c.*,\
+ org.xml.*,\
+ sun.*
+org.osgi.framework.executionenvironment = \
+ OSGi/Minimum-1.0,\
+ OSGi/Minimum-1.1,\
+ J2SE-1.3,\
+ J2SE-1.4,\
+ J2SE-1.5,\
+ JavaSE-1.6
+osgi.java.profile.name = Virgo-Kernel-Java6
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/no.heap.dump.test.config.properties b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/no.heap.dump.test.config.properties
index b8d2827e..78f1aa19 100644
--- a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/no.heap.dump.test.config.properties
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/no.heap.dump.test.config.properties
@@ -31,7 +31,9 @@ launcher.bundles =\
file:../ivy-cache/repository/org.springframework/org.springframework.beans/3.0.5.RELEASE/org.springframework.beans-3.0.5.RELEASE.jar,\
file:../ivy-cache/repository/org.springframework/org.springframework.core/3.0.5.RELEASE/org.springframework.core-3.0.5.RELEASE.jar,\
file:../ivy-cache/repository/org.springframework/org.springframework.context/3.0.5.RELEASE/org.springframework.context-3.0.5.RELEASE.jar,\
- file:../org.eclipse.virgo.kernel.core/target/classes@start,\
+ file:../ivy-cache/repository/org.eclipse.virgo.nano/org.eclipse.virgo.kernel.core/${org.eclipse.virgo.nano}/org.eclipse.virgo.kernel.core-${org.eclipse.virgo.nano}.jar@start,\
+ file:../ivy-cache/repository/org.eclipse.virgo.nano/org.eclipse.virgo.deployer.api/${org.eclipse.virgo.nano}/org.eclipse.virgo.deployer.api-${org.eclipse.virgo.nano}.jar,\
+ file:../ivy-cache/repository/org.eclipse.virgo.nano/org.eclipse.virgo.deployer.hot/${org.eclipse.virgo.nano}/org.eclipse.virgo.deployer.hot-${org.eclipse.virgo.nano}.jar,\
file:../org.eclipse.virgo.kernel.agent.dm/target/classes@start,\
file:../ivy-cache/repository/org.springframework.osgi/org.springframework.osgi.core/1.2.1/org.springframework.osgi.core-1.2.1.jar,\
file:../ivy-cache/repository/org.springframework.osgi/org.springframework.osgi.extender/1.2.1/org.springframework.osgi.extender-1.2.1.jar@start,\
@@ -65,7 +67,7 @@ gosh.args=--nointeractive
org.apache.felix.eventadmin.Timeout=0
-osgi.java.profile=file:../build-kernel/lib/java6-server.profile
+osgi.java.profile=file:src/test/resources/META-INF/java-profile/java6-server.profile
osgi.java.profile.bootdelegation=override
osgi.hook.configurators.include=org.eclipse.virgo.osgi.extensions.equinox.hooks.ExtensionsHookConfigurator
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/spring256.test.config.properties b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/spring256.test.config.properties
index 5ad55be0..108323b5 100644
--- a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/spring256.test.config.properties
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/spring256.test.config.properties
@@ -31,7 +31,9 @@ launcher.bundles =\
file:../ivy-cache/repository/org.springframework/org.springframework.beans/3.0.5.RELEASE/org.springframework.beans-3.0.5.RELEASE.jar,\
file:../ivy-cache/repository/org.springframework/org.springframework.core/3.0.5.RELEASE/org.springframework.core-3.0.5.RELEASE.jar,\
file:../ivy-cache/repository/org.springframework/org.springframework.context/3.0.5.RELEASE/org.springframework.context-3.0.5.RELEASE.jar,\
- file:../org.eclipse.virgo.kernel.core/target/classes@start,\
+ file:../ivy-cache/repository/org.eclipse.virgo.nano/org.eclipse.virgo.kernel.core/${org.eclipse.virgo.nano}/org.eclipse.virgo.kernel.core-${org.eclipse.virgo.nano}.jar@start,\
+ file:../ivy-cache/repository/org.eclipse.virgo.nano/org.eclipse.virgo.deployer.api/${org.eclipse.virgo.nano}/org.eclipse.virgo.deployer.api-${org.eclipse.virgo.nano}.jar,\
+ file:../ivy-cache/repository/org.eclipse.virgo.nano/org.eclipse.virgo.deployer.hot/${org.eclipse.virgo.nano}/org.eclipse.virgo.deployer.hot-${org.eclipse.virgo.nano}.jar,\
file:../org.eclipse.virgo.kernel.agent.dm/target/classes@start,\
file:../ivy-cache/repository/org.springframework.osgi/org.springframework.osgi.core/1.2.1/org.springframework.osgi.core-1.2.1.jar,\
file:../ivy-cache/repository/org.springframework.osgi/org.springframework.osgi.extender/1.2.1/org.springframework.osgi.extender-1.2.1.jar@start,\
@@ -65,7 +67,7 @@ gosh.args=--nointeractive
org.apache.felix.eventadmin.Timeout=0
-osgi.java.profile=file:../build-kernel/lib/java6-server.profile
+osgi.java.profile=file:src/test/resources/META-INF/java-profile/java6-server.profile
osgi.java.profile.bootdelegation=override
osgi.hook.configurators.include=org.eclipse.virgo.osgi.extensions.equinox.hooks.ExtensionsHookConfigurator
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/test.config.properties b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/test.config.properties
index 7b996a73..18094a19 100644
--- a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/test.config.properties
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/META-INF/test.config.properties
@@ -31,7 +31,9 @@ launcher.bundles =\
file:../ivy-cache/repository/org.springframework/org.springframework.beans/3.0.5.RELEASE/org.springframework.beans-3.0.5.RELEASE.jar,\
file:../ivy-cache/repository/org.springframework/org.springframework.core/3.0.5.RELEASE/org.springframework.core-3.0.5.RELEASE.jar,\
file:../ivy-cache/repository/org.springframework/org.springframework.context/3.0.5.RELEASE/org.springframework.context-3.0.5.RELEASE.jar,\
- file:../org.eclipse.virgo.kernel.core/target/classes@start,\
+ file:../ivy-cache/repository/org.eclipse.virgo.nano/org.eclipse.virgo.kernel.core/${org.eclipse.virgo.nano}/org.eclipse.virgo.kernel.core-${org.eclipse.virgo.nano}.jar@start,\
+ file:../ivy-cache/repository/org.eclipse.virgo.nano/org.eclipse.virgo.deployer.api/${org.eclipse.virgo.nano}/org.eclipse.virgo.deployer.api-${org.eclipse.virgo.nano}.jar,\
+ file:../ivy-cache/repository/org.eclipse.virgo.nano/org.eclipse.virgo.deployer.hot/${org.eclipse.virgo.nano}/org.eclipse.virgo.deployer.hot-${org.eclipse.virgo.nano}.jar,\
file:../org.eclipse.virgo.kernel.agent.dm/target/classes@start,\
file:../ivy-cache/repository/org.springframework.osgi/org.springframework.osgi.core/1.2.1/org.springframework.osgi.core-1.2.1.jar,\
file:../ivy-cache/repository/org.springframework.osgi/org.springframework.osgi.extender/1.2.1/org.springframework.osgi.extender-1.2.1.jar@start,\
@@ -63,7 +65,7 @@ osgi.console.ssh.useDefaultSecureStorage=true
osgi.console.useConfigAdmin=true
gosh.args=--nointeractive
-osgi.java.profile=file:../build-kernel/lib/java6-server.profile
+osgi.java.profile=file:src/test/resources/META-INF/java-profile/java6-server.profile
osgi.java.profile.bootdelegation=override
osgi.hook.configurators.include=org.eclipse.virgo.osgi.extensions.equinox.hooks.ExtensionsHookConfigurator

Back to the top