463462 - Switches to Gradle build
diff --git a/.gitignore b/.gitignore
index 7566305..3fbb103 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,10 +3,11 @@
target
integration-repo
ivy-cache
-derby.log
.ant-targets-build.xml
-com.cenqua.clover.core.prefs
-*.class
-build-nano/p2/*
-*/bin/*
user-ivy.properties
+bin/
+build/
+.settings/
+.project
+.classpath
+
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..c347bec
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,103 @@
+project(':nano:org.eclipse.virgo.nano.core') {
+ dependencies {
+ testCompile group: 'org.easymock', name: 'easymock', version: easymockVersion
+ testCompile project(':test:org.eclipse.virgo.test.stubs')
+ testCompile project(':medic:org.eclipse.virgo.medic.test')
+
+ compile group: "org.eclipse.virgo.mirrored", name: "org.slf4j.api", version: slf4jVersion, configuration: "compile", ext: "jar"
+
+ compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi", version: equinoxVersion, configuration: "compile", ext: "jar"
+ compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi.services", version: osgiServicesVersion, configuration: "compile", ext: "jar"
+ compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.region", version: equinoxRegionVersion, configuration: "compile", ext: "jar"
+
+ compile project(':util:org.eclipse.virgo.util.common')
+ compile project(':util:org.eclipse.virgo.util.io')
+ compile project(':util:org.eclipse.virgo.util.osgi')
+ compile project(':medic:org.eclipse.virgo.medic')
+ }
+}
+
+project(':nano:org.eclipse.virgo.nano.deployer') {
+ dependencies {
+ testCompile group: 'org.easymock', name: 'easymock', version: easymockVersion
+ testCompile project(':medic:org.eclipse.virgo.medic.test')
+
+ compile group: "org.eclipse.virgo.mirrored", name: "org.slf4j.api", version: slf4jVersion, configuration: "compile", ext: "jar"
+
+ compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi", version: equinoxVersion, configuration: "compile", ext: "jar"
+ compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi.services", version: osgiServicesVersion, configuration: "compile", ext: "jar"
+ compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.simpleconfigurator", version: equinoxSimpleConfiguratorVersion, configuration: "compile", ext: "jar"
+ compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.simpleconfigurator.manipulator", version: equinoxSimpleConfiguratorManipulatorVersion, configuration: "compile", ext: "jar"
+
+ compile project(':util:org.eclipse.virgo.util.io')
+ compile project(':util:org.eclipse.virgo.util.osgi.manifest')
+ compile project(':medic:org.eclipse.virgo.medic')
+ compile project(':nano:org.eclipse.virgo.nano.core')
+ compile project(':nano:org.eclipse.virgo.nano.deployer.api')
+ compile project(':nano:org.eclipse.virgo.nano.deployer.hot')
+ }
+}
+
+project(':nano:org.eclipse.virgo.nano.deployer.api') {
+ dependencies {
+ compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi", version: equinoxVersion, configuration: "compile", ext: "jar"
+
+ compile project(':util:org.eclipse.virgo.util.io')
+ compile project(':medic:org.eclipse.virgo.medic')
+ compile project(':nano:org.eclipse.virgo.nano.core')
+ }
+}
+
+project(':nano:org.eclipse.virgo.nano.deployer.hot') {
+ dependencies {
+ testCompile group: 'org.easymock', name: 'easymock', version: easymockVersion
+ testCompile project(':medic:org.eclipse.virgo.medic.test')
+
+ compile group: "org.eclipse.virgo.mirrored", name: "org.slf4j.api", version: slf4jVersion, configuration: "compile", ext: "jar"
+
+ compile project(':util:org.eclipse.virgo.util.io')
+ compile project(':medic:org.eclipse.virgo.medic')
+ compile project(':nano:org.eclipse.virgo.nano.core')
+ compile project(':nano:org.eclipse.virgo.nano.deployer.api')
+ }
+}
+
+project(':nano:org.eclipse.virgo.nano.management') {
+ dependencies {
+ compile group: "org.eclipse.virgo.mirrored", name: "org.slf4j.api", version: slf4jVersion, configuration: "compile", ext: "jar"
+
+ compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi", version: equinoxVersion, configuration: "compile", ext: "jar"
+ compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi.services", version: osgiServicesVersion, configuration: "compile", ext: "jar"
+
+ compile project(':nano:org.eclipse.virgo.nano.deployer.api')
+ }
+}
+
+project(':nano:org.eclipse.virgo.nano.management.controller') {
+ dependencies {
+ compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi", version: equinoxVersion, configuration: "compile", ext: "jar"
+
+ compile project(':nano:org.eclipse.virgo.nano.core')
+ compile project(':nano:org.eclipse.virgo.nano.deployer.api')
+ compile project(':nano:org.eclipse.virgo.nano.management')
+ }
+}
+
+project(':nano:org.eclipse.virgo.nano.services.concurrent') {
+ dependencies {
+ compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi", version: equinoxVersion, configuration: "compile", ext: "jar"
+ compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi.services", version: osgiServicesVersion, configuration: "compile", ext: "jar"
+ compile project(':util:org.eclipse.virgo.util.math')
+ compile project(':medic:org.eclipse.virgo.medic')
+ }
+}
+
+project(':nano:org.eclipse.virgo.nano.services.ds') {
+ dependencies {
+ compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi", version: equinoxVersion, configuration: "compile", ext: "jar"
+ compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi.services", version: osgiServicesVersion, configuration: "compile", ext: "jar"
+ compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.ds", version: equinoxDsVersion, configuration: "compile", ext: "jar"
+ compile project(':medic:org.eclipse.virgo.medic')
+ }
+}
+
diff --git a/org.eclipse.virgo.nano.core/src/test/java/test/AssertingService.java b/org.eclipse.virgo.nano.core/src/main/java/internal/AssertingService.java
similarity index 90%
rename from org.eclipse.virgo.nano.core/src/test/java/test/AssertingService.java
rename to org.eclipse.virgo.nano.core/src/main/java/internal/AssertingService.java
index d0c3b8e..24f170f 100644
--- a/org.eclipse.virgo.nano.core/src/test/java/test/AssertingService.java
+++ b/org.eclipse.virgo.nano.core/src/main/java/internal/AssertingService.java
@@ -9,39 +9,31 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package test;
+package internal;
import org.eclipse.virgo.nano.serviceability.NonNull;
-
-/**
- */
+// FIXME Bug 463462 - Move back to test source folder when we know how to weave test classes
public class AssertingService {
-
+
public AssertingService() {
-
}
public AssertingService( @NonNull String a) {
-
}
public AssertingService(String a, @NonNull Integer b) {
-
}
public AssertingService(String a, Integer b, @NonNull Double c) {
-
}
public void test(@NonNull String a) {
}
public void test(@NonNull String a, @NonNull Integer b) {
-
}
public void test(String a, Integer b, @NonNull Double d) {
-
}
}
diff --git a/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/nano/config/internal/ConfigurationAdminDumpContributorTests.java b/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/nano/config/internal/ConfigurationAdminDumpContributorTests.java
index b166429..2170d8f 100644
--- a/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/nano/config/internal/ConfigurationAdminDumpContributorTests.java
+++ b/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/nano/config/internal/ConfigurationAdminDumpContributorTests.java
@@ -49,14 +49,14 @@
private static final String NORMAL_OUTPUT_FILE_NAME = "configurationAdmin.properties";
private static final String DC_NAME = "configurationAdmin";
- private final File testDumpOutputDir = new File(new File("target"), "ConfigurationAdminDumpTests");
+ private final File testDumpOutputDir = new File(new File("build"), "ConfigurationAdminDumpTests");
private File testDumpOutputFile;
@Before
public void setupTestDir() {
deleteRecursively(this.testDumpOutputDir);
this.testDumpOutputDir.mkdir();
- this.testDumpOutputFile = new File(new File("target"), TEST_OUTPUT_FILE_NAME);
+ this.testDumpOutputFile = new File(new File("build"), TEST_OUTPUT_FILE_NAME);
}
@After
diff --git a/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/nano/config/internal/KernelConfigurationPropertiesSourceTests.java b/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/nano/config/internal/KernelConfigurationPropertiesSourceTests.java
index 1020e43..772d6d2 100644
--- a/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/nano/config/internal/KernelConfigurationPropertiesSourceTests.java
+++ b/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/nano/config/internal/KernelConfigurationPropertiesSourceTests.java
@@ -28,7 +28,7 @@
@Test
public void testGetProperties() {
StubBundleContext context = new StubBundleContext();
- context.addProperty(KernelConfiguration.PROPERTY_KERNEL_HOME, "target/home");
+ context.addProperty(KernelConfiguration.PROPERTY_KERNEL_HOME, "build/home");
KernelConfiguration configuration = new KernelConfiguration(context);
diff --git a/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/nano/config/internal/KernelConfigurationTests.java b/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/nano/config/internal/KernelConfigurationTests.java
index 5c7fb06..cb7aa46 100644
--- a/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/nano/config/internal/KernelConfigurationTests.java
+++ b/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/nano/config/internal/KernelConfigurationTests.java
@@ -28,10 +28,10 @@
@Test
public void testCreateMinimalKernelConfiguration() {
StubBundleContext context = new StubBundleContext();
- context.addProperty(KernelConfiguration.PROPERTY_KERNEL_HOME, "target");
+ context.addProperty(KernelConfiguration.PROPERTY_KERNEL_HOME, "build");
KernelConfiguration configuration = new KernelConfiguration(context);
- assertEquals(new File("target"), configuration.getHomeDirectory());
+ assertEquals(new File("build"), configuration.getHomeDirectory());
assertNotNull(configuration.getWorkDirectory());
assertNotNull(configuration.getConfigDirectories());
assertEquals(1, configuration.getConfigDirectories().length);
@@ -42,13 +42,13 @@
@Test
public void testCustomConfiguration() {
StubBundleContext context = new StubBundleContext();
- context.addProperty(KernelConfiguration.PROPERTY_KERNEL_HOME, "target");
+ context.addProperty(KernelConfiguration.PROPERTY_KERNEL_HOME, "build");
context.addProperty(KernelConfiguration.PROPERTY_KERNEL_DOMAIN, "my.domain");
context.addProperty(KernelConfiguration.PROPERTY_KERNEL_CONFIG, "foo,bar");
context.addProperty(KernelConfiguration.PROPERTY_KERNEL_STARTUP_WAIT_LIMIT, "60");
KernelConfiguration configuration = new KernelConfiguration(context);
- assertEquals(new File("target"), configuration.getHomeDirectory());
+ assertEquals(new File("build"), configuration.getHomeDirectory());
assertNotNull(configuration.getWorkDirectory());
assertNotNull(configuration.getConfigDirectories());
assertEquals(2, configuration.getConfigDirectories().length);
diff --git a/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/nano/core/internal/StartupTrackerTests.java b/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/nano/core/internal/StartupTrackerTests.java
index 99e3985..7c6b089 100644
--- a/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/nano/core/internal/StartupTrackerTests.java
+++ b/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/nano/core/internal/StartupTrackerTests.java
@@ -54,7 +54,7 @@
public void setup() {
this.bundleContext.addInstalledBundle(bundle);
- this.bundleContext.addProperty("org.eclipse.virgo.kernel.home", "target");
+ this.bundleContext.addProperty("org.eclipse.virgo.kernel.home", "build");
this.bundleContext.addProperty("org.eclipse.virgo.kernel.domain", "the-domain");
this.bundleContext.addFilter(new ObjectClassFilter("org.springframework.context.ApplicationContext"));
this.bundleContext.registerService(EventAdmin.class.getName(), this.eventAdmin, null);
diff --git a/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/nano/serviceability/dump/internal/ResolutionStateDumperTests.java b/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/nano/serviceability/dump/internal/ResolutionStateDumperTests.java
index 59a0c6c..0a2c554 100644
--- a/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/nano/serviceability/dump/internal/ResolutionStateDumperTests.java
+++ b/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/nano/serviceability/dump/internal/ResolutionStateDumperTests.java
@@ -43,7 +43,7 @@
ResolutionStateDumper dumper = new ResolutionStateDumper(new StubSystemStateAccessor(state), writer);
- File outputFile = new File("./target/dump.zip");
+ File outputFile = new File("./build/dump.zip");
if (outputFile.exists()) {
assertTrue(outputFile.delete());
}
@@ -52,13 +52,13 @@
assertTrue(outputFile.exists());
- PathReference unzipLocation = new PathReference("target/dump");
+ PathReference unzipLocation = new PathReference("build/dump");
if (unzipLocation.exists()) {
assertTrue(unzipLocation.delete(true));
}
ZipUtils.unzipTo(new PathReference(outputFile), unzipLocation);
- File stateFile = new File("target/dump/state/state");
+ File stateFile = new File("build/dump/state/state");
assertTrue(stateFile.exists());
assertEquals(10, stateFile.length());
diff --git a/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/nano/serviceability/enforcement/NonNullAssertionEnforcerTests.java b/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/nano/serviceability/enforcement/NonNullAssertionEnforcerTests.java
index 8863290..d9475e1 100644
--- a/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/nano/serviceability/enforcement/NonNullAssertionEnforcerTests.java
+++ b/org.eclipse.virgo.nano.core/src/test/java/org/eclipse/virgo/nano/serviceability/enforcement/NonNullAssertionEnforcerTests.java
@@ -11,18 +11,16 @@
package org.eclipse.virgo.nano.serviceability.enforcement;
+import internal.AssertingService;
+
import java.util.Map;
import org.junit.Before;
import org.junit.Test;
-
-
import org.eclipse.virgo.nano.serviceability.Assert;
import org.eclipse.virgo.nano.serviceability.dump.DumpCoordinator;
import org.eclipse.virgo.medic.dump.DumpGenerator;
-import test.AssertingService;
-
public class NonNullAssertionEnforcerTests {
@Before
diff --git a/org.eclipse.virgo.nano.core/template.mf b/org.eclipse.virgo.nano.core/template.mf
index 967d197..d5a6ef7 100644
--- a/org.eclipse.virgo.nano.core/template.mf
+++ b/org.eclipse.virgo.nano.core/template.mf
@@ -5,15 +5,15 @@
Bundle-Version: ${version}
Service-Component: OSGI-INF/org.eclipse.virgo.nano.config.xml,OSGI-INF/org.eclipse.virgo.nano.core.xml,OSGI-INF/org.eclipse.virgo.nano.server.readiness.tracker.xml
Import-Template:
- org.eclipse.virgo.util.*;version="${org.eclipse.virgo.util:[=.=.=, =.+1)}",
- org.eclipse.virgo.medic.*;version="${org.eclipse.virgo.medic:[=.=.=, =.+1)}",
- org.slf4j.*;version="${org.slf4j.api:[=.=.=, +1)}",
- org.aspectj.*;version="${org.aspectj:[=.=.=.=, +1)}",
+ org.eclipse.virgo.util.*;version="${version:[=.=.=, =.+1)}",
+ org.eclipse.virgo.medic.*;version="${version:[=.=.=, =.+1)}",
+ org.slf4j.*;version="${slf4jVersion:[=.=.=, +1)}",
+ org.aspectj.*;version="${orgAspectjVersion:[=.=.=.=, +1)}",
javax.management.*;version="0",
javax.xml.parsers;version="0",
org.osgi.*;version="0",
org.eclipse.osgi.*;version="0",
- org.eclipse.equinox.region.*;version="${org.eclipse.equinox.region:[=.=.=, =.+1)}",
+ org.eclipse.equinox.region.*;version="${equinoxRegionVersion:[=.=.=, =.+1)}",
org.w3c.dom;version="0",
org.xml.sax;version="0"
Excluded-Exports:
diff --git a/org.eclipse.virgo.nano.deployer.api/template.mf b/org.eclipse.virgo.nano.deployer.api/template.mf
index 59a6622..41bc7b0 100644
--- a/org.eclipse.virgo.nano.deployer.api/template.mf
+++ b/org.eclipse.virgo.nano.deployer.api/template.mf
@@ -5,8 +5,8 @@
Bundle-Version: ${version}
Import-Template:
org.eclipse.virgo.nano.*;version="${version:[=.=.=, =.+1)}",
- org.eclipse.virgo.util.*;version="${org.eclipse.virgo.util:[=.=.=, =.+1)}",
- org.eclipse.virgo.medic.*;version="${org.eclipse.virgo.medic:[=.=.=, =.+1)}",
+ org.eclipse.virgo.util.*;version="${version:[=.=.=, =.+1)}",
+ org.eclipse.virgo.medic.*;version="${version:[=.=.=, =.+1)}",
org.osgi.framework.*;version="0",
javax.management.*;version="0",
javax.xml.*;version="0",
diff --git a/org.eclipse.virgo.nano.deployer.hot/template.mf b/org.eclipse.virgo.nano.deployer.hot/template.mf
index d659f00..1425b2e 100644
--- a/org.eclipse.virgo.nano.deployer.hot/template.mf
+++ b/org.eclipse.virgo.nano.deployer.hot/template.mf
@@ -3,8 +3,8 @@
Bundle-Name: Virgo Hot Deployer
Bundle-Version: ${version}
Bundle-SymbolicName: org.eclipse.virgo.nano.deployer.hot
-Import-Template: org.eclipse.virgo.util.*;version="${org.eclipse.virgo.util:[=.=.=, =.+1)}",
- org.eclipse.virgo.medic.*;version="${org.eclipse.virgo.medic:[=.=.=, =.+1)}",
+Import-Template: org.eclipse.virgo.util.*;version="${version:[=.=.=, =.+1)}",
+ org.eclipse.virgo.medic.*;version="${version:[=.=.=, =.+1)}",
org.eclipse.virgo.nano.*;version="${version:[=.=.=, =.+1)}",
org.slf4j.*;version="0"
Excluded-Exports:
diff --git a/org.eclipse.virgo.nano.deployer/src/test/java/org/eclipse/virgo/nano/deployer/hot/HotDeployerTests.java b/org.eclipse.virgo.nano.deployer/src/test/java/org/eclipse/virgo/nano/deployer/hot/HotDeployerTests.java
index 8349562..74abde2 100644
--- a/org.eclipse.virgo.nano.deployer/src/test/java/org/eclipse/virgo/nano/deployer/hot/HotDeployerTests.java
+++ b/org.eclipse.virgo.nano.deployer/src/test/java/org/eclipse/virgo/nano/deployer/hot/HotDeployerTests.java
@@ -36,7 +36,7 @@
*/
public class HotDeployerTests {
- private static final PathReference PICKUP_DIR = new PathReference("target/pickup");
+ private static final PathReference PICKUP_DIR = new PathReference("build/pickup");
private ApplicationDeployer deployer;
@@ -78,7 +78,7 @@
replay(this.deployer);
DeployerConfiguration deployerConfiguration = createMock(DeployerConfiguration.class);
- expect(deployerConfiguration.getDeploymentPickupDirectory()).andReturn(new PathReference("target/pickup"));
+ expect(deployerConfiguration.getDeploymentPickupDirectory()).andReturn(new PathReference("build/pickup"));
expect(deployerConfiguration.getScanIntervalMillis()).andReturn(1000);
replay(deployerConfiguration);
diff --git a/org.eclipse.virgo.nano.deployer/src/test/java/org/eclipse/virgo/nano/deployer/util/StatusFileModificatorTest.java b/org.eclipse.virgo.nano.deployer/src/test/java/org/eclipse/virgo/nano/deployer/util/StatusFileModificatorTest.java
index 960d809..3da4226 100644
--- a/org.eclipse.virgo.nano.deployer/src/test/java/org/eclipse/virgo/nano/deployer/util/StatusFileModificatorTest.java
+++ b/org.eclipse.virgo.nano.deployer/src/test/java/org/eclipse/virgo/nano/deployer/util/StatusFileModificatorTest.java
@@ -22,9 +22,9 @@
public class StatusFileModificatorTest {
- private static final PathReference PICKUP_DIR = new PathReference("target/pickup");
+ private static final PathReference PICKUP_DIR = new PathReference("build/pickup");
- private static final PathReference STATE_DIR = new PathReference("target/pickup/.state");
+ private static final PathReference STATE_DIR = new PathReference("build/pickup/.state");
private static final String[] dummyStatusFiles = { "src/test/resources/test/testapp1.deploy.ok", "src/test/resources/test/testapp1.undeploy.ok",
"src/test/resources/test/testapp1.deploy.error", "src/test/resources/test/testapp1.undeploy.error",
diff --git a/org.eclipse.virgo.nano.deployer/template.mf b/org.eclipse.virgo.nano.deployer/template.mf
index e94b120..aed3ecd 100644
--- a/org.eclipse.virgo.nano.deployer/template.mf
+++ b/org.eclipse.virgo.nano.deployer/template.mf
@@ -6,8 +6,8 @@
Service-Component: OSGI-INF/org.eclipse.virgo.nano.deployer.xml
Import-Template:
org.eclipse.virgo.nano.*;version="${version:[=.=.=, =.+1)}",
- org.eclipse.virgo.util.*;version="${org.eclipse.virgo.util:[=.=.=, =.+1)}",
- org.eclipse.virgo.medic.*;version="${org.eclipse.virgo.medic:[=.=.=, =.+1)}",
+ org.eclipse.virgo.util.*;version="${version:[=.=.=, =.+1)}",
+ org.eclipse.virgo.medic.*;version="${version:[=.=.=, =.+1)}",
org.osgi.framework.*;version="0",
org.osgi.service.*;version="0",
javax.management.*;version="0",
diff --git a/org.eclipse.virgo.nano.management/template.mf b/org.eclipse.virgo.nano.management/template.mf
index dc5dd02..46d7f4b 100644
--- a/org.eclipse.virgo.nano.management/template.mf
+++ b/org.eclipse.virgo.nano.management/template.mf
@@ -4,9 +4,9 @@
Bundle-SymbolicName: org.eclipse.virgo.nano.management
Bundle-Version: ${version}
Service-Component: OSGI-INF/org.eclipse.virgo.nano.management.deployer.xml,OSGI-INF/org.eclipse.virgo.nano.management.recovery.xml
-Import-Template: org.eclipse.virgo.medic.*;version="${org.eclipse.virgo.medic:[=.=.=, +1)}",
+Import-Template: org.eclipse.virgo.medic.*;version="${version:[=.=.=, +1)}",
org.eclipse.virgo.nano.*;version="${version:[=.=.=, +1)}",
- org.eclipse.virgo.util.*;version="${org.eclipse.virgo.util:[=.=.=, +1)}",
+ org.eclipse.virgo.util.*;version="${version:[=.=.=, +1)}",
org.slf4j;version="0",
org.osgi.service.*;version="0",
javax.management.*;version="0"
diff --git a/org.eclipse.virgo.nano.services.concurrent/template.mf b/org.eclipse.virgo.nano.services.concurrent/template.mf
index 988f01e..099b3f9 100644
--- a/org.eclipse.virgo.nano.services.concurrent/template.mf
+++ b/org.eclipse.virgo.nano.services.concurrent/template.mf
@@ -7,9 +7,9 @@
Excluded-Exports:
*.internal.*
Import-Template:
- org.eclipse.virgo.util.*;version="${org.eclipse.virgo.util:[=.=.=, =.+1)}",
- org.eclipse.virgo.medic.*;version="${org.eclipse.virgo.medic:[=.=.=, =.+1)}";resolution:=optional,
- org.aspectj.*;version="${org.aspectj:[=.=.=.=, +1)}",
- org.slf4j.*;version="${org.slf4j.api:[=.=.=, +1)}",
+ org.eclipse.virgo.util.*;version="${version:[=.=.=, =.+1)}",
+ org.eclipse.virgo.medic.*;version="${version:[=.=.=, =.+1)}";resolution:=optional,
+ org.aspectj.*;version="${orgAspectjVersion:[=.=.=.=, +1)}",
+ org.slf4j.*;version="${slf4jVersion:[=.=.=, +1)}",
org.osgi.framework.*;version="0",
org.osgi.service.component.*;version="0"
diff --git a/org.eclipse.virgo.nano.services.ds/template.mf b/org.eclipse.virgo.nano.services.ds/template.mf
index bad3172..ac2d678 100644
--- a/org.eclipse.virgo.nano.services.ds/template.mf
+++ b/org.eclipse.virgo.nano.services.ds/template.mf
@@ -7,7 +7,7 @@
Excluded-Exports:
*.internal.*
Import-Template:
- org.eclipse.virgo.medic.*;version="${org.eclipse.virgo.medic:[=.=.=, =.+1)}";resolution:=optional,
+ org.eclipse.virgo.medic.*;version="${version:[=.=.=, =.+1)}";resolution:=optional,
org.osgi.service.component;version="0",
org.osgi.framework;version="0",
org.apache.felix.scr;version="0"
