Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBorislav Kapukaranov2012-05-27 22:42:22 -0400
committerBorislav Kapukaranov2012-05-27 22:42:22 -0400
commit8454fd3acc152a039ad767a27846673d98035f73 (patch)
tree02d44aea8229421907f874815a81ab56dc3aa5f1
parent2ac3850ae509d9149cfeb24bf0cc1fd6e3cfb191 (diff)
downloadorg.eclipse.virgo.medic-8454fd3acc152a039ad767a27846673d98035f73.tar.gz
org.eclipse.virgo.medic-8454fd3acc152a039ad767a27846673d98035f73.tar.xz
org.eclipse.virgo.medic-8454fd3acc152a039ad767a27846673d98035f73.zip
Revert "380764 - Upgrades to latest Equinox and Orbit bundles"
-rw-r--r--build.versions14
-rw-r--r--org.eclipse.virgo.medic.core/.classpath14
-rw-r--r--org.eclipse.virgo.medic.core/ivy.xml17
-rwxr-xr-xorg.eclipse.virgo.medic.core/src/main/java/org/eclipse/virgo/medic/impl/LogController.java12
-rw-r--r--org.eclipse.virgo.medic.core/src/main/java/org/eclipse/virgo/medic/impl/config/ConfigurationAdminConfigurationProvider.java12
-rw-r--r--org.eclipse.virgo.medic.core/src/main/java/org/eclipse/virgo/medic/impl/config/ConfigurationProvider.java2
-rw-r--r--org.eclipse.virgo.medic.core/src/main/java/org/eclipse/virgo/medic/management/FileSystemDumpInspector.java4
-rw-r--r--org.eclipse.virgo.medic.core/src/test/java/org/eclipse/virgo/medic/dump/impl/StandardDumpGeneratorTests.java6
-rw-r--r--org.eclipse.virgo.medic.core/src/test/java/org/eclipse/virgo/medic/eventlog/impl/logback/LogBackEventLoggerTests.java8
-rwxr-xr-xorg.eclipse.virgo.medic.core/src/test/java/org/eclipse/virgo/medic/impl/LogControllerTests.java12
-rw-r--r--org.eclipse.virgo.medic.core/src/test/java/org/eclipse/virgo/medic/impl/config/ConfigurationAdminConfigurationProviderTests.java22
-rw-r--r--org.eclipse.virgo.medic.core/src/test/java/org/eclipse/virgo/medic/management/FileSystemDumpInspectorTests.java4
-rw-r--r--org.eclipse.virgo.medic.core/template.mf5
-rw-r--r--org.eclipse.virgo.medic.integrationtest/.classpath12
-rw-r--r--org.eclipse.virgo.medic.integrationtest/build.xml2
-rw-r--r--org.eclipse.virgo.medic.integrationtest/ivy.xml17
-rw-r--r--org.eclipse.virgo.medic.integrationtest/src/test/resources/META-INF/test.config.properties28
-rw-r--r--org.eclipse.virgo.medic.logbackclassicfragment/template.mf2
-rw-r--r--org.eclipse.virgo.medic.logbackcorefragment/template.mf2
-rw-r--r--org.eclipse.virgo.medic.testfragment/.classpath4
-rw-r--r--org.eclipse.virgo.medic.testfragment/ivy.xml4
-rw-r--r--org.eclipse.virgo.medic.testfragment/template.mf2
-rw-r--r--org.eclipse.virgo.medic/.classpath4
-rw-r--r--org.eclipse.virgo.medic/ivy.xml4
-rw-r--r--org.eclipse.virgo.medic/template.mf2
25 files changed, 103 insertions, 112 deletions
diff --git a/build.versions b/build.versions
index 05d94d8..e325929 100644
--- a/build.versions
+++ b/build.versions
@@ -1,14 +1,10 @@
# Compile
-ch.qos.logback.classic=1.0.0.v20111214-2030
-ch.qos.logback.core=1.0.0.v20111214-2030
-ch.qos.logback.slf4j=1.0.0.v20120123-1500
-org.slf4j.api=1.6.1.v20100831-0715
-org.slf4j.jul=1.6.1.v20100831-0715
+ch.qos.logback=0.9.28
org.slf4j=1.6.1
-org.eclipse.osgi=3.8.0.v20120508-2119
-org.eclipse.osgi.services=3.3.0.v20120307-2102
-org.eclipse.equinox.log=1.2.200.v20111010-1614
-org.eclipse.equinox.cm=1.0.400.v20120319-2029
+org.eclipse.osgi=3.7.1.R37x_v20110808-1106
+org.eclipse.osgi.services=3.3.0.v20110513
+org.eclipse.equinox.log=1.0.0
+org.eclipse.equinox.cm=1.0.300.v20101204
org.aspectj=1.6.12.RELEASE
# Test
diff --git a/org.eclipse.virgo.medic.core/.classpath b/org.eclipse.virgo.medic.core/.classpath
index 2b540ed..949488d 100644
--- a/org.eclipse.virgo.medic.core/.classpath
+++ b/org.eclipse.virgo.medic.core/.classpath
@@ -25,20 +25,20 @@
</attributes>
</classpathentry>
<classpathentry kind="var" path="MEDIC_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/MEDIC_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/>
+ <classpathentry kind="var" path="MEDIC_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="/MEDIC_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="MEDIC_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/MEDIC_IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.medic"/>
<classpathentry kind="var" path="MEDIC_IVY_CACHE/org.eclipse.virgo.teststubs/org.eclipse.virgo.teststubs.osgi/3.5.0.M04/org.eclipse.virgo.teststubs.osgi-3.5.0.M04.jar" sourcepath="/MEDIC_IVY_CACHE/org.eclipse.virgo.teststubs/org.eclipse.virgo.teststubs.osgi/3.5.0.M04/org.eclipse.virgo.teststubs.osgi-sources-3.5.0.M04.jar"/>
<classpathentry kind="var" path="MEDIC_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.12.RELEASE/com.springsource.org.aspectj.runtime-1.6.12.RELEASE.jar" sourcepath="/MEDIC_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.12.RELEASE/com.springsource.org.aspectj.runtime-sources-1.6.12.RELEASE.jar"/>
+ <classpathentry kind="var" path="MEDIC_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-1.6.1.jar" sourcepath="/MEDIC_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-sources-1.6.1.jar"/>
+ <classpathentry kind="var" path="MEDIC_IVY_CACHE/ch.qos.logback/com.springsource.ch.qos.logback.classic/0.9.28/com.springsource.ch.qos.logback.classic-0.9.28.jar" sourcepath="/MEDIC_IVY_CACHE/ch.qos.logback/com.springsource.ch.qos.logback.classic/0.9.24/com.springsource.ch.qos.logback.classic-sources-0.9.24.jar"/>
+ <classpathentry kind="var" path="MEDIC_IVY_CACHE/ch.qos.logback/com.springsource.ch.qos.logback.core/0.9.28/com.springsource.ch.qos.logback.core-0.9.28.jar" sourcepath="/MEDIC_IVY_CACHE/ch.qos.logback/com.springsource.ch.qos.logback.core/0.9.24/com.springsource.ch.qos.logback.core-sources-0.9.24.jar"/>
<classpathentry kind="var" path="MEDIC_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.5.0.M04/org.eclipse.virgo.util.osgi-3.5.0.M04.jar" sourcepath="/MEDIC_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.5.0.M04/org.eclipse.virgo.util.osgi-sources-3.5.0.M04.jar"/>
<classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
+ <classpathentry kind="var" path="MEDIC_IVY_CACHE/org.eclipse.osgi/org.eclipse.equinox.cm/1.0.300.v20101204/org.eclipse.equinox.cm-1.0.300.v20101204.jar" sourcepath="/MEDIC_IVY_CACHE/org.eclipse.osgi/org.eclipse.equinox.cm/1.0.300.v20101204/org.eclipse.equinox.cm-sources-1.0.300.v20101204.jar"/>
+ <classpathentry kind="var" path="MEDIC_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi.services/3.3.0.v20110513/org.eclipse.osgi.services-3.3.0.v20110513.jar" sourcepath="/MEDIC_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi.services/3.3.0.v20110513/org.eclipse.osgi.services-sources-3.3.0.v20110513.jar"/>
<classpathentry kind="var" path="MEDIC_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.5.0.M04/org.eclipse.virgo.util.io-3.5.0.M04.jar" sourcepath="/MEDIC_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.5.0.M04/org.eclipse.virgo.util.io-sources-3.5.0.M04.jar"/>
- <classpathentry kind="var" path="MEDIC_IVY_CACHE/org.eclipse.virgo.mirrored/ch.qos.logback.classic/1.0.0.v20111214-2030/ch.qos.logback.classic-1.0.0.v20111214-2030.jar"/>
- <classpathentry kind="var" path="MEDIC_IVY_CACHE/org.eclipse.virgo.mirrored/ch.qos.logback.core/1.0.0.v20111214-2030/ch.qos.logback.core-1.0.0.v20111214-2030.jar"/>
- <classpathentry kind="var" path="MEDIC_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.equinox.cm/1.0.400.v20120319-2029/org.eclipse.equinox.cm-1.0.400.v20120319-2029.jar"/>
- <classpathentry kind="var" path="MEDIC_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="MEDIC_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.8.0.v20120508-2119/org.eclipse.osgi-3.8.0.v20120508-2119.jar"/>
- <classpathentry kind="var" path="MEDIC_IVY_CACHE/org.eclipse.virgo.mirrored/org.slf4j.api/1.6.1.v20100831-0715/org.slf4j.api-1.6.1.v20100831-0715.jar"/>
- <classpathentry kind="var" path="MEDIC_IVY_CACHE/org.eclipse.virgo.mirrored/org.slf4j.jul/1.6.1.v20100831-0715/org.slf4j.jul-1.6.1.v20100831-0715.jar"/>
+ <classpathentry kind="var" path="MEDIC_IVY_CACHE/org.slf4j/com.springsource.slf4j.bridge/1.6.1/com.springsource.slf4j.bridge-1.6.1.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/org.eclipse.virgo.medic.core/ivy.xml b/org.eclipse.virgo.medic.core/ivy.xml
index 72696b4..d09c56e 100644
--- a/org.eclipse.virgo.medic.core/ivy.xml
+++ b/org.eclipse.virgo.medic.core/ivy.xml
@@ -19,24 +19,23 @@
<dependencies>
<dependency org="org.eclipse.virgo.medic" name="org.eclipse.virgo.medic" rev="latest.integration" conf="compile->compile"/>
- <dependency org="org.eclipse.virgo.mirrored" name="org.slf4j.api" rev="${org.slf4j.api}" conf="compile->runtime"/>
- <dependency org="org.eclipse.virgo.mirrored" name="org.slf4j.jul" rev="${org.slf4j.jul}" conf="compile->runtime"/>
+ <dependency org="org.slf4j" name="com.springsource.slf4j.api" rev="${org.slf4j}" conf="compile->runtime"/>
+ <dependency org="org.slf4j" name="com.springsource.slf4j.bridge" rev="${org.slf4j}" conf="compile->runtime"/>
<dependency org="org.eclipse.virgo.util" name="org.eclipse.virgo.util.osgi" rev="${org.eclipse.virgo.util}" conf="compile->runtime"/>
<dependency org="org.eclipse.virgo.util" name="org.eclipse.virgo.util.io" rev="${org.eclipse.virgo.util}" conf="compile->runtime"/>
- <dependency org="org.eclipse.virgo.mirrored" name="ch.qos.logback.classic" rev="${ch.qos.logback.classic}" conf="compile->runtime"/>
- <dependency org="org.eclipse.virgo.mirrored" name="ch.qos.logback.core" rev="${ch.qos.logback.core}" conf="compile->runtime"/>
- <dependency org="org.eclipse.virgo.mirrored" name="ch.qos.logback.slf4j" rev="${ch.qos.logback.slf4j}" conf="compile->runtime"/>
- <dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.osgi" rev="${org.eclipse.osgi}" conf="provided->runtime"/>
+ <dependency org="ch.qos.logback" name="com.springsource.ch.qos.logback.classic" rev="${ch.qos.logback}" conf="compile->runtime"/>
+ <dependency org="ch.qos.logback" name="com.springsource.ch.qos.logback.core" rev="${ch.qos.logback}" conf="compile->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.services" rev="${org.eclipse.osgi.services}" conf="optional->runtime"/>
- <dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.equinox.cm" rev="${org.eclipse.equinox.cm}" conf="optional->runtime"/>
+ <dependency org="org.eclipse.osgi" name="org.eclipse.osgi.services" rev="${org.eclipse.osgi.services}" conf="optional->runtime"/>
+ <dependency org="org.eclipse.osgi" name="org.eclipse.equinox.cm" rev="${org.eclipse.equinox.cm}" conf="optional->runtime"/>
<dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit}" conf="test->runtime"/>
<dependency org="org.easymock" name="com.springsource.org.easymock" rev="${org.easymock}" conf="test->runtime"/>
<dependency org="org.eclipse.virgo.teststubs" name="org.eclipse.virgo.teststubs.osgi" rev="${org.eclipse.virgo.teststubs}" conf="test->runtime"/>
<!-- Allow Equinox to be upgraded point-wise before rippling -->
- <override org="org.eclipse.virgo.mirrored" module="org.eclipse.osgi" rev="${org.eclipse.osgi}"/>
+ <override org="org.eclipse.osgi" module="org.eclipse.osgi" rev="${org.eclipse.osgi}"/>
</dependencies>
</ivy-module>
diff --git a/org.eclipse.virgo.medic.core/src/main/java/org/eclipse/virgo/medic/impl/LogController.java b/org.eclipse.virgo.medic.core/src/main/java/org/eclipse/virgo/medic/impl/LogController.java
index dc9f2c5..2da167d 100755
--- a/org.eclipse.virgo.medic.core/src/main/java/org/eclipse/virgo/medic/impl/LogController.java
+++ b/org.eclipse.virgo.medic.core/src/main/java/org/eclipse/virgo/medic/impl/LogController.java
@@ -145,7 +145,7 @@ public class LogController implements ConfigurationChangeListener {
}
public void logStart() throws ConfigurationPublicationFailedException {
- Dictionary<String, Object> configuration = configurationProvider.getConfiguration();
+ Dictionary<String, String> configuration = configurationProvider.getConfiguration();
SLF4JBridgeHandler.install();
@@ -273,12 +273,12 @@ public class LogController implements ConfigurationChangeListener {
@Override
public void configurationChanged(ConfigurationProvider provider) {
- Dictionary<String, Object> configuration = configurationProvider.getConfiguration();
+ Dictionary<String, String> configuration = configurationProvider.getConfiguration();
updateLogConfiguration(configuration);
}
- private synchronized void updateLogConfiguration(Dictionary<String, Object> configuration) {
- if (Boolean.valueOf((String)configuration.get(ConfigurationProvider.KEY_LOG_WRAP_SYSOUT))) {
+ private synchronized void updateLogConfiguration(Dictionary<String, String> configuration) {
+ if (Boolean.valueOf(configuration.get(ConfigurationProvider.KEY_LOG_WRAP_SYSOUT))) {
delegatingSysOutRegistration = publishDelegatingPrintStream(delegatingSysOut, LOGGER_NAME_SYSOUT_DELEGATE);
sysOutRegistration = publishPrintStream(this.sysOut, LOGGER_NAME_SYSOUT);
@@ -295,7 +295,7 @@ public class LogController implements ConfigurationChangeListener {
System.setOut((PrintStream)delegatingSysOut);
}
- if (Boolean.valueOf((String)configuration.get(ConfigurationProvider.KEY_LOG_WRAP_SYSERR))) {
+ if (Boolean.valueOf(configuration.get(ConfigurationProvider.KEY_LOG_WRAP_SYSERR))) {
delegatingSysErrRegistration = publishDelegatingPrintStream(delegatingSysErr, LOGGER_NAME_SYSERR_DELEGATE);
sysErrRegistration = publishPrintStream(this.sysErr, LOGGER_NAME_SYSERR);
@@ -312,7 +312,7 @@ public class LogController implements ConfigurationChangeListener {
System.setErr((PrintStream)delegatingSysErr);
}
- if (Boolean.valueOf((String)configuration.get(ConfigurationProvider.KEY_ENABLE_JUL_CONSOLE_HANDLER))) {
+ if (Boolean.valueOf(configuration.get(ConfigurationProvider.KEY_ENABLE_JUL_CONSOLE_HANDLER))) {
enableJulConsoleLogger();
} else {
disableJulConsoleHandler();
diff --git a/org.eclipse.virgo.medic.core/src/main/java/org/eclipse/virgo/medic/impl/config/ConfigurationAdminConfigurationProvider.java b/org.eclipse.virgo.medic.core/src/main/java/org/eclipse/virgo/medic/impl/config/ConfigurationAdminConfigurationProvider.java
index f0bea79..0817199 100644
--- a/org.eclipse.virgo.medic.core/src/main/java/org/eclipse/virgo/medic/impl/config/ConfigurationAdminConfigurationProvider.java
+++ b/org.eclipse.virgo.medic.core/src/main/java/org/eclipse/virgo/medic/impl/config/ConfigurationAdminConfigurationProvider.java
@@ -27,11 +27,11 @@ public final class ConfigurationAdminConfigurationProvider implements Configurat
private static final String CONFIG_ADMIN_PID = "org.eclipse.virgo.medic";
- private static final Dictionary<String, Object> DEFAULT_CONFIG = createDefaultConfiguration();
+ private static final Dictionary<String, String> DEFAULT_CONFIG = createDefaultConfiguration();
private final BundleContext bundleContext;
- private volatile Dictionary<String, Object> configuration = DEFAULT_CONFIG;
+ private volatile Dictionary<String,String> configuration = DEFAULT_CONFIG;
private HashSet<ConfigurationChangeListener> listeners;
@@ -41,7 +41,7 @@ public final class ConfigurationAdminConfigurationProvider implements Configurat
initialisePropertiesFromConfigurationAdmin();
}
- public Dictionary<String, Object> getConfiguration() {
+ public Dictionary<String, String> getConfiguration() {
return this.configuration;
}
@@ -63,7 +63,7 @@ public final class ConfigurationAdminConfigurationProvider implements Configurat
Configuration configuration = configurationAdmin.getConfiguration(CONFIG_ADMIN_PID, null);
@SuppressWarnings("unchecked")
- Dictionary<String, Object> properties = configuration.getProperties();
+ Dictionary<String,String> properties = configuration.getProperties();
if (properties == null) {
properties = DEFAULT_CONFIG;
@@ -81,8 +81,8 @@ public final class ConfigurationAdminConfigurationProvider implements Configurat
notifyListeners();
}
- private static Dictionary<String, Object> createDefaultConfiguration() {
- Dictionary<String, Object> configuration = new Hashtable<String, Object>();
+ private static Dictionary<String, String> createDefaultConfiguration() {
+ Dictionary<String, String> configuration = new Hashtable<String, String>();
configuration.put(KEY_DUMP_ROOT_DIRECTORY, ".");
configuration.put(KEY_LOG_WRAP_SYSOUT, Boolean.toString(Boolean.TRUE));
configuration.put(KEY_LOG_WRAP_SYSERR, Boolean.toString(Boolean.TRUE));
diff --git a/org.eclipse.virgo.medic.core/src/main/java/org/eclipse/virgo/medic/impl/config/ConfigurationProvider.java b/org.eclipse.virgo.medic.core/src/main/java/org/eclipse/virgo/medic/impl/config/ConfigurationProvider.java
index 19e37d5..ce61df0 100644
--- a/org.eclipse.virgo.medic.core/src/main/java/org/eclipse/virgo/medic/impl/config/ConfigurationProvider.java
+++ b/org.eclipse.virgo.medic.core/src/main/java/org/eclipse/virgo/medic/impl/config/ConfigurationProvider.java
@@ -29,7 +29,7 @@ public interface ConfigurationProvider {
public static final String KEY_ENABLE_JUL_CONSOLE_HANDLER = "log.jul.consoleHandler";
- Dictionary<String, Object> getConfiguration();
+ Dictionary<String, String> getConfiguration();
/**
* Adds listener that will be notified when the configuration changes
diff --git a/org.eclipse.virgo.medic.core/src/main/java/org/eclipse/virgo/medic/management/FileSystemDumpInspector.java b/org.eclipse.virgo.medic.core/src/main/java/org/eclipse/virgo/medic/management/FileSystemDumpInspector.java
index d86e1a3..ad1174c 100644
--- a/org.eclipse.virgo.medic.core/src/main/java/org/eclipse/virgo/medic/management/FileSystemDumpInspector.java
+++ b/org.eclipse.virgo.medic.core/src/main/java/org/eclipse/virgo/medic/management/FileSystemDumpInspector.java
@@ -52,7 +52,7 @@ public class FileSystemDumpInspector implements DumpInspector {
@Override
public String getConfiguredDumpDirectory() {
- return (String)configurationProvider.getConfiguration().get(ConfigurationProvider.KEY_DUMP_ROOT_DIRECTORY);
+ return configurationProvider.getConfiguration().get(ConfigurationProvider.KEY_DUMP_ROOT_DIRECTORY);
}
@Override
@@ -145,7 +145,7 @@ public class FileSystemDumpInspector implements DumpInspector {
}
private File getDumpDirectory(){
- String dumpDirectory = (String)configurationProvider.getConfiguration().get(ConfigurationProvider.KEY_DUMP_ROOT_DIRECTORY);
+ String dumpDirectory = configurationProvider.getConfiguration().get(ConfigurationProvider.KEY_DUMP_ROOT_DIRECTORY);
File dumpDir = new File(dumpDirectory);
if(dumpDir.exists() && dumpDir.isDirectory()){
return dumpDir;
diff --git a/org.eclipse.virgo.medic.core/src/test/java/org/eclipse/virgo/medic/dump/impl/StandardDumpGeneratorTests.java b/org.eclipse.virgo.medic.core/src/test/java/org/eclipse/virgo/medic/dump/impl/StandardDumpGeneratorTests.java
index 51d0896..eb2b05c 100644
--- a/org.eclipse.virgo.medic.core/src/test/java/org/eclipse/virgo/medic/dump/impl/StandardDumpGeneratorTests.java
+++ b/org.eclipse.virgo.medic.core/src/test/java/org/eclipse/virgo/medic/dump/impl/StandardDumpGeneratorTests.java
@@ -69,7 +69,7 @@ public class StandardDumpGeneratorTests {
expect(accessor.getDumpContributors()).andReturn(Arrays.asList(dumpContributor1, dumpContributor2, dumpContributor3));
ConfigurationProvider configurationProvider = createMock(ConfigurationProvider.class);
- Dictionary<String, Object> configuration = new Hashtable<String, Object>();
+ Dictionary<String, String> configuration = new Hashtable<String, String>();
configuration.put(ConfigurationProvider.KEY_DUMP_ROOT_DIRECTORY, "target");
expect(configurationProvider.getConfiguration()).andReturn(configuration).anyTimes();
@@ -93,7 +93,7 @@ public class StandardDumpGeneratorTests {
expect(dumpContributor1.getName()).andReturn("dc1").times(2);
ConfigurationProvider configurationProvider = createMock(ConfigurationProvider.class);
- Dictionary<String, Object> configuration = new Hashtable<String, Object>();
+ Dictionary<String, String> configuration = new Hashtable<String, String>();
configuration.put("dump.root.directory", "target");
configuration.put("dump.exclusions.foo", "dc1");
expect(configurationProvider.getConfiguration()).andReturn(configuration).anyTimes();
@@ -121,7 +121,7 @@ public class StandardDumpGeneratorTests {
expect(dumpContributor2.getName()).andReturn("dc2").times(2);
ConfigurationProvider configurationProvider = createMock(ConfigurationProvider.class);
- Dictionary<String, Object> configuration = new Hashtable<String, Object>();
+ Dictionary<String, String> configuration = new Hashtable<String, String>();
configuration.put("dump.root.directory", "target");
configuration.put("dump.exclusions.foo", "dc1, dc2");
expect(configurationProvider.getConfiguration()).andReturn(configuration).anyTimes();
diff --git a/org.eclipse.virgo.medic.core/src/test/java/org/eclipse/virgo/medic/eventlog/impl/logback/LogBackEventLoggerTests.java b/org.eclipse.virgo.medic.core/src/test/java/org/eclipse/virgo/medic/eventlog/impl/logback/LogBackEventLoggerTests.java
index a6a75ea..64f27a7 100644
--- a/org.eclipse.virgo.medic.core/src/test/java/org/eclipse/virgo/medic/eventlog/impl/logback/LogBackEventLoggerTests.java
+++ b/org.eclipse.virgo.medic.core/src/test/java/org/eclipse/virgo/medic/eventlog/impl/logback/LogBackEventLoggerTests.java
@@ -75,17 +75,17 @@ public class LogBackEventLoggerTests {
loggingEvent = defaultEvents.get(0);
assertEquals(ch.qos.logback.classic.Level.ERROR, loggingEvent.getLevel());
assertEquals("the english message true 63", loggingEvent.getMessage());
-// assertEquals("UT0001E", loggingEvent.getMDCPropertyMap().get("medic.eventCode"));
+ assertEquals("UT0001E", loggingEvent.getMDCPropertyMap().get("medic.eventCode"));
loggingEvent = defaultEvents.get(1);
assertEquals(ch.qos.logback.classic.Level.WARN, loggingEvent.getLevel());
assertEquals("the english message true 63", loggingEvent.getMessage());
-// assertEquals("UT0002W", loggingEvent.getMDCPropertyMap().get("medic.eventCode"));
+ assertEquals("UT0002W", loggingEvent.getMDCPropertyMap().get("medic.eventCode"));
loggingEvent = defaultEvents.get(2);
assertEquals(ch.qos.logback.classic.Level.INFO, loggingEvent.getLevel());
assertEquals("the english message true 63", loggingEvent.getMessage());
-// assertEquals("UT0003I", loggingEvent.getMDCPropertyMap().get("medic.eventCode"));
+ assertEquals("UT0003I", loggingEvent.getMDCPropertyMap().get("medic.eventCode"));
}
@Test
@@ -109,7 +109,7 @@ public class LogBackEventLoggerTests {
assertEquals(ch.qos.logback.classic.Level.WARN, loggingEvent.getLevel());
assertEquals("A message with the key 'UT0001' was not found. The inserts for the message were '[apple, orange, 345]'",
loggingEvent.getMessage());
-// assertEquals("ME0001W", loggingEvent.getMDCPropertyMap().get("medic.eventCode"));
+ assertEquals("ME0001W", loggingEvent.getMDCPropertyMap().get("medic.eventCode"));
List<LoggingEvent> localizedEvents = LocalizedOutputAppender.getAndResetLoggingEvents();
assertEquals(1, localizedEvents.size());
diff --git a/org.eclipse.virgo.medic.core/src/test/java/org/eclipse/virgo/medic/impl/LogControllerTests.java b/org.eclipse.virgo.medic.core/src/test/java/org/eclipse/virgo/medic/impl/LogControllerTests.java
index 59e24fe..d9c2758 100755
--- a/org.eclipse.virgo.medic.core/src/test/java/org/eclipse/virgo/medic/impl/LogControllerTests.java
+++ b/org.eclipse.virgo.medic.core/src/test/java/org/eclipse/virgo/medic/impl/LogControllerTests.java
@@ -53,7 +53,7 @@ public class LogControllerTests {
ConfigurationAdmin configurationAdmin = createMock(ConfigurationAdmin.class);
Configuration configuration = createMock(Configuration.class);
- Dictionary<String, Object> properties = new Hashtable<String, Object>();
+ Dictionary<String, String> properties = new Hashtable<String, String>();
properties.put(ConfigurationProvider.KEY_LOG_WRAP_SYSERR, "true");
properties.put(ConfigurationProvider.KEY_LOG_WRAP_SYSOUT, "true");
createConfigurationMocks(configurationAdmin, configuration, properties, 1);
@@ -82,7 +82,7 @@ public class LogControllerTests {
ConfigurationAdmin configurationAdmin = createMock(ConfigurationAdmin.class);
Configuration configuration = createMock(Configuration.class);
- Dictionary<String, Object> properties = new Hashtable<String, Object>();
+ Dictionary<String, String> properties = new Hashtable<String, String>();
properties.put(ConfigurationProvider.KEY_LOG_WRAP_SYSERR, "false");
properties.put(ConfigurationProvider.KEY_LOG_WRAP_SYSOUT, "false");
createConfigurationMocks(configurationAdmin, configuration, properties, 1);
@@ -108,7 +108,7 @@ public class LogControllerTests {
ConfigurationAdmin configurationAdmin = createMock(ConfigurationAdmin.class);
Configuration configuration = createMock(Configuration.class);
- Dictionary<String, Object> properties = new Hashtable<String, Object>();
+ Dictionary<String, String> properties = new Hashtable<String, String>();
properties.put(ConfigurationProvider.KEY_LOG_WRAP_SYSERR, "true");
properties.put(ConfigurationProvider.KEY_LOG_WRAP_SYSOUT, "true");
createConfigurationMocks(configurationAdmin, configuration, properties, 1);
@@ -138,7 +138,7 @@ public class LogControllerTests {
ConfigurationAdmin configurationAdmin = createMock(ConfigurationAdmin.class);
Configuration configuration = createMock(Configuration.class);
- Dictionary<String, Object> properties = new Hashtable<String, Object>();
+ Dictionary<String, String> properties = new Hashtable<String, String>();
properties.put(ConfigurationProvider.KEY_ENABLE_JUL_CONSOLE_HANDLER, "true");
createConfigurationMocks(configurationAdmin, configuration, properties, 1);
@@ -159,7 +159,7 @@ public class LogControllerTests {
ConfigurationAdmin configurationAdmin = createMock(ConfigurationAdmin.class);
Configuration configuration = createMock(Configuration.class);
- Dictionary<String, Object> properties = new Hashtable<String, Object>();
+ Dictionary<String, String> properties = new Hashtable<String, String>();
properties.put(ConfigurationProvider.KEY_ENABLE_JUL_CONSOLE_HANDLER, "false");
createConfigurationMocks(configurationAdmin, configuration, properties, 1);
@@ -201,7 +201,7 @@ public class LogControllerTests {
return foundMatch;
}
- private ServiceRegistration<?> createConfigurationMocks(ConfigurationAdmin configurationAdmin, Configuration configuration, Dictionary<String, Object> properties, int times) throws IOException {
+ private ServiceRegistration<?> createConfigurationMocks(ConfigurationAdmin configurationAdmin, Configuration configuration, Dictionary<String, String> properties, int times) throws IOException {
ServiceRegistration<?> serviceRegistration = this.bundleContext.registerService(ConfigurationAdmin.class.getName(), configurationAdmin, null);
expect(configurationAdmin.getConfiguration("org.eclipse.virgo.medic", null)).andReturn(configuration).times(times);
diff --git a/org.eclipse.virgo.medic.core/src/test/java/org/eclipse/virgo/medic/impl/config/ConfigurationAdminConfigurationProviderTests.java b/org.eclipse.virgo.medic.core/src/test/java/org/eclipse/virgo/medic/impl/config/ConfigurationAdminConfigurationProviderTests.java
index 6928585..969b9d5 100644
--- a/org.eclipse.virgo.medic.core/src/test/java/org/eclipse/virgo/medic/impl/config/ConfigurationAdminConfigurationProviderTests.java
+++ b/org.eclipse.virgo.medic.core/src/test/java/org/eclipse/virgo/medic/impl/config/ConfigurationAdminConfigurationProviderTests.java
@@ -36,7 +36,7 @@ public class ConfigurationAdminConfigurationProviderTests implements Configurati
@Test
public void getConfigurationWithoutConfigurationAdmin() {
ConfigurationProvider configurationProvider = new ConfigurationAdminConfigurationProvider(bundleContext);
- Dictionary<String, Object> configuration = configurationProvider.getConfiguration();
+ Dictionary<String, String> configuration = configurationProvider.getConfiguration();
assertNotNull(configuration);
assertEquals(".", configuration.get(ConfigurationProvider.KEY_DUMP_ROOT_DIRECTORY));
}
@@ -54,7 +54,7 @@ public class ConfigurationAdminConfigurationProviderTests implements Configurati
ConfigurationProvider configurationProvider = new ConfigurationAdminConfigurationProvider(bundleContext);
- Dictionary<String, Object> configDictionary = configurationProvider.getConfiguration();
+ Dictionary<String, String> configDictionary = configurationProvider.getConfiguration();
assertNotNull(configDictionary);
assertEquals(".", configDictionary.get(ConfigurationProvider.KEY_DUMP_ROOT_DIRECTORY));
@@ -66,13 +66,13 @@ public class ConfigurationAdminConfigurationProviderTests implements Configurati
ConfigurationAdmin configurationAdmin = createMock(ConfigurationAdmin.class);
Configuration configuration = createMock(Configuration.class);
- Dictionary<String, Object> properties = new Hashtable<String, Object>();
+ Dictionary<String, String> properties = new Hashtable<String, String>();
properties.put(ConfigurationProvider.KEY_DUMP_ROOT_DIRECTORY, "target");
properties.put("a.b.c", "d.e.f");
createConfigurationMocks(configurationAdmin, configuration, properties, 1);
ConfigurationProvider configurationProvider = new ConfigurationAdminConfigurationProvider(bundleContext);
- Dictionary<String, Object> configDictionary = configurationProvider.getConfiguration();
+ Dictionary<String, String> configDictionary = configurationProvider.getConfiguration();
assertNotNull(configDictionary);
assertEquals("target", configDictionary.get(ConfigurationProvider.KEY_DUMP_ROOT_DIRECTORY));
assertEquals("d.e.f", configDictionary.get("a.b.c"));
@@ -85,10 +85,10 @@ public class ConfigurationAdminConfigurationProviderTests implements Configurati
ConfigurationAdmin configurationAdmin = createMock(ConfigurationAdmin.class);
Configuration configuration = createMock(Configuration.class);
- Dictionary<String, Object> properties = new Hashtable<String, Object>();
+ Dictionary<String, String> properties = new Hashtable<String, String>();
properties.put(ConfigurationProvider.KEY_DUMP_ROOT_DIRECTORY, "target");
properties.put("a.b.c", "d.e.f");
- ServiceRegistration<ConfigurationAdmin> serviceRegistration = createConfigurationMocks(configurationAdmin, configuration, properties, 5);
+ ServiceRegistration<?> serviceRegistration = createConfigurationMocks(configurationAdmin, configuration, properties, 5);
ConfigurationAdminConfigurationProvider configurationProvider = new ConfigurationAdminConfigurationProvider(bundleContext);
ConfigurationEvent event = new ConfigurationEvent(serviceRegistration.getReference(), ConfigurationEvent.CM_UPDATED, null, CONFIG_ADMIN_PID);
@@ -113,10 +113,10 @@ public class ConfigurationAdminConfigurationProviderTests implements Configurati
ConfigurationAdmin configurationAdmin = createMock(ConfigurationAdmin.class);
Configuration configuration = createMock(Configuration.class);
- Dictionary<String, Object> properties = new Hashtable<String, Object>();
+ Dictionary<String, String> properties = new Hashtable<String, String>();
properties.put(ConfigurationProvider.KEY_DUMP_ROOT_DIRECTORY, "target");
properties.put("a.b.c", "d.e.f");
- ServiceRegistration<ConfigurationAdmin> serviceRegistration = createConfigurationMocks(configurationAdmin, configuration, properties, 2);
+ ServiceRegistration<?> serviceRegistration = createConfigurationMocks(configurationAdmin, configuration, properties, 2);
// Initial configuration publishing
ConfigurationAdminConfigurationProvider configurationProvider = new ConfigurationAdminConfigurationProvider(bundleContext);
@@ -130,7 +130,7 @@ public class ConfigurationAdminConfigurationProviderTests implements Configurati
verify(configurationAdmin, configuration);
// Update the configuration
- Dictionary<String, Object> newProperties = new Hashtable<String, Object>((Hashtable<String, Object>) properties);
+ Dictionary<String, String> newProperties = new Hashtable<String, String>((Hashtable<String, String>) properties);
newProperties.put("1.2.3", "4.5.6");
reset(configurationAdmin, configuration);
@@ -142,7 +142,7 @@ public class ConfigurationAdminConfigurationProviderTests implements Configurati
configurationProvider.addChangeListener(this);
updateConfigurationAndCheckForNotification(configurationProvider, event, 2);
- Dictionary<String, Object> configDictionary = configurationProvider.getConfiguration();
+ Dictionary<String, String> configDictionary = configurationProvider.getConfiguration();
assertNotNull(configDictionary);
assertEquals("target", configDictionary.get(ConfigurationProvider.KEY_DUMP_ROOT_DIRECTORY));
assertEquals("d.e.f", configDictionary.get("a.b.c"));
@@ -151,7 +151,7 @@ public class ConfigurationAdminConfigurationProviderTests implements Configurati
verify(configurationAdmin, configuration);
}
- private ServiceRegistration<ConfigurationAdmin> createConfigurationMocks(ConfigurationAdmin configurationAdmin, Configuration configuration, Dictionary<String, Object> properties, int times) throws IOException {
+ private ServiceRegistration<ConfigurationAdmin> createConfigurationMocks(ConfigurationAdmin configurationAdmin, Configuration configuration, Dictionary<String, String> properties, int times) throws IOException {
ServiceRegistration<ConfigurationAdmin> serviceRegistration = this.bundleContext.registerService(ConfigurationAdmin.class, configurationAdmin, null);
expect(configurationAdmin.getConfiguration("org.eclipse.virgo.medic", null)).andReturn(configuration).times(times);
diff --git a/org.eclipse.virgo.medic.core/src/test/java/org/eclipse/virgo/medic/management/FileSystemDumpInspectorTests.java b/org.eclipse.virgo.medic.core/src/test/java/org/eclipse/virgo/medic/management/FileSystemDumpInspectorTests.java
index 4227a3c..9652128 100644
--- a/org.eclipse.virgo.medic.core/src/test/java/org/eclipse/virgo/medic/management/FileSystemDumpInspectorTests.java
+++ b/org.eclipse.virgo.medic.core/src/test/java/org/eclipse/virgo/medic/management/FileSystemDumpInspectorTests.java
@@ -37,8 +37,8 @@ public class FileSystemDumpInspectorTests {
}
@Override
- public Dictionary<String, Object> getConfiguration() {
- Dictionary<String, Object> props = new Hashtable<String, Object>();
+ public Dictionary<String, String> getConfiguration() {
+ Dictionary<String, String> props = new Hashtable<String, String>();
props.put(KEY_DUMP_ROOT_DIRECTORY, "src/test/resources/testDumps/serviceability/dump");
return props;
}
diff --git a/org.eclipse.virgo.medic.core/template.mf b/org.eclipse.virgo.medic.core/template.mf
index be374da..56bea19 100644
--- a/org.eclipse.virgo.medic.core/template.mf
+++ b/org.eclipse.virgo.medic.core/template.mf
@@ -5,8 +5,7 @@ Bundle-Name: Medic Core Implementation
Bundle-Version: ${version}
Bundle-Activator: org.eclipse.virgo.medic.impl.MedicActivator
Import-Template:
- ch.qos.logback.classic.*;version="${ch.qos.logback.classic:[=.=.=, +1.0.0)}",
- ch.qos.logback.core.*;version="${ch.qos.logback.core:[=.=.=, +1.0.0)}",
+ ch.qos.logback.*;version="${ch.qos.logback:[=.=.=, +1.0.0)}",
org.eclipse.virgo.medic.*;version="${version:[=.=.=, =.+1)}",
org.eclipse.virgo.util.*;version="${org.eclipse.virgo.util:[=.=.=, +1.0.0)}",
org.eclipse.equinox.log;version="${org.eclipse.equinox.log:[=.=.=, +1.=.=)}",
@@ -21,7 +20,7 @@ Import-Template:
org.osgi.framework;version="0",
org.osgi.service.*;version="0",
org.osgi.util.tracker;version="0",
- org.slf4j.*;version="${org.slf4j.api:[=.=.=, +1.0.0)}",
+ org.slf4j.*;version="${org.slf4j:[=.=.=, +1.0.0)}",
org.xml.sax.*;version="0"
Medic-LoggingConfiguration: org.eclipse.virgo.medic
Excluded-Exports: *.impl,*.impl.*
diff --git a/org.eclipse.virgo.medic.integrationtest/.classpath b/org.eclipse.virgo.medic.integrationtest/.classpath
index 66aa517..1772d4e 100644
--- a/org.eclipse.virgo.medic.integrationtest/.classpath
+++ b/org.eclipse.virgo.medic.integrationtest/.classpath
@@ -21,7 +21,11 @@
</attributes>
</classpathentry>
<classpathentry kind="var" path="MEDIC_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/MEDIC_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/>
+ <classpathentry kind="var" path="MEDIC_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="/MEDIC_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.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="var" path="MEDIC_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-1.6.1.jar" sourcepath="/MEDIC_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-sources-1.6.1.jar"/>
+ <classpathentry kind="var" path="MEDIC_IVY_CACHE/ch.qos.logback/com.springsource.ch.qos.logback.classic/0.9.28/com.springsource.ch.qos.logback.classic-0.9.28.jar" sourcepath="/MEDIC_IVY_CACHE/ch.qos.logback/com.springsource.ch.qos.logback.classic/0.9.24/com.springsource.ch.qos.logback.classic-sources-0.9.24.jar"/>
+ <classpathentry kind="var" path="MEDIC_IVY_CACHE/ch.qos.logback/com.springsource.ch.qos.logback.core/0.9.28/com.springsource.ch.qos.logback.core-0.9.28.jar" sourcepath="/MEDIC_IVY_CACHE/ch.qos.logback/com.springsource.ch.qos.logback.core/0.9.24/com.springsource.ch.qos.logback.core-sources-0.9.24.jar"/>
<classpathentry kind="var" path="MEDIC_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/3.5.0.M04/org.eclipse.virgo.test.framework-3.5.0.M04.jar" sourcepath="/MEDIC_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/3.5.0.M04/org.eclipse.virgo.test.framework-sources-3.5.0.M04.jar"/>
<classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
<classpathentry kind="src" path="/org.eclipse.virgo.medic">
@@ -30,11 +34,7 @@
</attributes>
</classpathentry>
<classpathentry kind="var" path="MEDIC_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.5.0.M04/org.eclipse.virgo.util.common-3.5.0.M04.jar" sourcepath="/MEDIC_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.5.0.M04/org.eclipse.virgo.util.common-sources-3.5.0.M04.jar"/>
- <classpathentry kind="var" path="MEDIC_IVY_CACHE/org.eclipse.virgo.mirrored/ch.qos.logback.classic/1.0.0.v20111214-2030/ch.qos.logback.classic-1.0.0.v20111214-2030.jar"/>
- <classpathentry kind="var" path="MEDIC_IVY_CACHE/org.eclipse.virgo.mirrored/ch.qos.logback.core/1.0.0.v20111214-2030/ch.qos.logback.core-1.0.0.v20111214-2030.jar"/>
- <classpathentry kind="var" path="MEDIC_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.equinox.cm/1.0.400.v20120319-2029/org.eclipse.equinox.cm-1.0.400.v20120319-2029.jar"/>
- <classpathentry kind="var" path="MEDIC_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="MEDIC_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.8.0.v20120508-2119/org.eclipse.osgi-3.8.0.v20120508-2119.jar"/>
- <classpathentry kind="var" path="MEDIC_IVY_CACHE/org.eclipse.virgo.mirrored/org.slf4j.api/1.6.1.v20100831-0715/org.slf4j.api-1.6.1.v20100831-0715.jar"/>
+ <classpathentry kind="var" path="MEDIC_IVY_CACHE/org.eclipse.osgi/org.eclipse.equinox.cm/1.0.300.v20101204/org.eclipse.equinox.cm-1.0.300.v20101204.jar"/>
+ <classpathentry kind="var" path="MEDIC_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi.services/3.3.0.v20110513/org.eclipse.osgi.services-3.3.0.v20110513.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/org.eclipse.virgo.medic.integrationtest/build.xml b/org.eclipse.virgo.medic.integrationtest/build.xml
index 5fed3aa..3df23dc 100644
--- a/org.eclipse.virgo.medic.integrationtest/build.xml
+++ b/org.eclipse.virgo.medic.integrationtest/build.xml
@@ -5,5 +5,5 @@
<property file="${basedir}/../build.versions"/>
<property name="disable.bundlor" value="true" />
<import file="${basedir}/../virgo-build/weaving/default.xml"/>
-
+
</project>
diff --git a/org.eclipse.virgo.medic.integrationtest/ivy.xml b/org.eclipse.virgo.medic.integrationtest/ivy.xml
index ba5271a..11f2c10 100644
--- a/org.eclipse.virgo.medic.integrationtest/ivy.xml
+++ b/org.eclipse.virgo.medic.integrationtest/ivy.xml
@@ -17,9 +17,9 @@
</publications>
<dependencies>
- <dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.osgi" rev="${org.eclipse.osgi}" conf="compile->runtime"/>
- <dependency org="org.eclipse.virgo.mirrored" name="org.slf4j.api" rev="${org.slf4j.api}" conf="compile->runtime"/>
- <dependency org="org.eclipse.virgo.mirrored" name="org.slf4j.jul" rev="${org.slf4j.jul}" conf="test->runtime"/>
+ <dependency org="org.eclipse.osgi" name="org.eclipse.osgi" rev="${org.eclipse.osgi}" conf="compile->runtime"/>
+ <dependency org="org.slf4j" name="com.springsource.slf4j.api" rev="${org.slf4j}" conf="compile->runtime"/>
+ <dependency org="org.slf4j" name="com.springsource.slf4j.bridge" rev="${org.slf4j}" conf="test->runtime"/>
<dependency org="org.eclipse.virgo.medic" name="org.eclipse.virgo.medic" rev="latest.integration" conf="aspects->runtime"/>
<dependency org="org.aspectj" name="com.springsource.org.aspectj.runtime" rev="${org.aspectj}" conf="aspects->runtime"/>
@@ -34,15 +34,14 @@
<dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit}" conf="test->runtime"/>
<dependency org="org.eclipse.virgo.test" name="org.eclipse.virgo.test.framework" rev="${org.eclipse.virgo.test}" conf="test->runtime"/>
- <dependency org="org.eclipse.virgo.mirrored" name="ch.qos.logback.classic" rev="${ch.qos.logback.classic}" conf="test->runtime"/>
- <dependency org="org.eclipse.virgo.mirrored" name="ch.qos.logback.core" rev="${ch.qos.logback.core}" conf="test->runtime"/>
- <dependency org="org.eclipse.virgo.mirrored" name="ch.qos.logback.slf4j" rev="${ch.qos.logback.slf4j}" conf="test->runtime"/>
+ <dependency org="ch.qos.logback" name="com.springsource.ch.qos.logback.classic" rev="${ch.qos.logback}" conf="test->runtime"/>
+ <dependency org="ch.qos.logback" name="com.springsource.ch.qos.logback.core" rev="${ch.qos.logback}" conf="test->runtime"/>
- <dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.osgi.services" rev="${org.eclipse.osgi.services}" conf="test->runtime"/>
- <dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.equinox.cm" rev="${org.eclipse.equinox.cm}" conf="test->runtime"/>
+ <dependency org="org.eclipse.osgi" name="org.eclipse.osgi.services" rev="${org.eclipse.osgi.services}" conf="test->runtime"/>
+ <dependency org="org.eclipse.osgi" name="org.eclipse.equinox.cm" rev="${org.eclipse.equinox.cm}" conf="test->runtime"/>
<!-- Prevent org.eclipse.osgi.services dragging in old Equinox -->
- <override org="org.eclipse.virgo.mirrored" module="org.eclipse.osgi" rev="${org.eclipse.osgi}"/>
+ <override org="org.eclipse.osgi" module="org.eclipse.osgi" rev="${org.eclipse.osgi}"/>
</dependencies>
</ivy-module>
diff --git a/org.eclipse.virgo.medic.integrationtest/src/test/resources/META-INF/test.config.properties b/org.eclipse.virgo.medic.integrationtest/src/test/resources/META-INF/test.config.properties
index 05130cc..d453b90 100644
--- a/org.eclipse.virgo.medic.integrationtest/src/test/resources/META-INF/test.config.properties
+++ b/org.eclipse.virgo.medic.integrationtest/src/test/resources/META-INF/test.config.properties
@@ -1,25 +1,24 @@
launcher.bundles=\
- file:${ivy.cache}/repository/org.aspectj/com.springsource.org.aspectj.runtime/${org.aspectj}/com.springsource.org.aspectj.runtime-${org.aspectj}.jar@start,\
- file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/org.slf4j.api/${org.slf4j.api}/org.slf4j.api-${org.slf4j.api}.jar@start,\
- file:${ivy.cache}/repository/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.5.0.M04/org.eclipse.virgo.util.common-3.5.0.M04.jar,\
- file:${ivy.cache}/repository/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.5.0.M04/org.eclipse.virgo.util.osgi-3.5.0.M04.jar,\
- file:${ivy.cache}/repository/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.5.0.M04/org.eclipse.virgo.util.io-3.5.0.M04.jar,\
- file:${ivy.cache}/repository/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.5.0.M04/org.eclipse.virgo.util.math-3.5.0.M04.jar,\
- file:${ivy.cache}/repository/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.5.0.M04/org.eclipse.virgo.util.parser.manifest-3.5.0.M04.jar,\
- file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/org.eclipse.osgi.services/${org.eclipse.osgi.services}/org.eclipse.osgi.services-${org.eclipse.osgi.services}.jar,\
- file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/org.eclipse.equinox.cm/${org.eclipse.equinox.cm}/org.eclipse.equinox.cm-${org.eclipse.equinox.cm}.jar@start,\
- file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/org.slf4j.jul/${org.slf4j.jul}/org.slf4j.jul-${org.slf4j.jul}.jar,\
+ file:../ivy-cache/repository/org.aspectj/com.springsource.org.aspectj.runtime/${org.aspectj}/com.springsource.org.aspectj.runtime-${org.aspectj}.jar@start,\
+ file:../ivy-cache/repository/org.slf4j/com.springsource.slf4j.api/${org.slf4j}/com.springsource.slf4j.api-${org.slf4j}.jar@start,\
+ file:../ivy-cache/repository/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.5.0.M04/org.eclipse.virgo.util.common-3.5.0.M04.jar,\
+ file:../ivy-cache/repository/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/3.5.0.M04/org.eclipse.virgo.util.osgi-3.5.0.M04.jar,\
+ file:../ivy-cache/repository/org.eclipse.virgo.util/org.eclipse.virgo.util.io/3.5.0.M04/org.eclipse.virgo.util.io-3.5.0.M04.jar,\
+ file:../ivy-cache/repository/org.eclipse.virgo.util/org.eclipse.virgo.util.math/3.5.0.M04/org.eclipse.virgo.util.math-3.5.0.M04.jar,\
+ file:../ivy-cache/repository/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/3.5.0.M04/org.eclipse.virgo.util.parser.manifest-3.5.0.M04.jar,\
+ file:../ivy-cache/repository/org.eclipse.osgi/org.eclipse.osgi.services/${org.eclipse.osgi.services}/org.eclipse.osgi.services-${org.eclipse.osgi.services}.jar,\
+ file:../ivy-cache/repository/org.eclipse.osgi/org.eclipse.equinox.cm/${org.eclipse.equinox.cm}/org.eclipse.equinox.cm-${org.eclipse.equinox.cm}.jar@start,\
+ file:../ivy-cache/repository/org.slf4j/com.springsource.slf4j.bridge/${org.slf4j}/com.springsource.slf4j.bridge-${org.slf4j}.jar,\
file:../org.eclipse.virgo.medic.logbackcorefragment/target/artifacts/org.eclipse.virgo.medic.logbackcorefragment.jar,\
file:../org.eclipse.virgo.medic.logbackclassicfragment/target/artifacts/org.eclipse.virgo.medic.logbackclassicfragment.jar,\
- file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/ch.qos.logback.core/${ch.qos.logback.core}/ch.qos.logback.core-${ch.qos.logback.core}.jar,\
- file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/ch.qos.logback.classic/${ch.qos.logback.classic}/ch.qos.logback.classic-${ch.qos.logback.classic}.jar,\
- file:${ivy.cache}/repository/org.eclipse.virgo.mirrored/ch.qos.logback.slf4j/${ch.qos.logback.slf4j}/ch.qos.logback.slf4j-${ch.qos.logback.slf4j}.jar,\
+ file:../ivy-cache/repository/ch.qos.logback/com.springsource.ch.qos.logback.core/${ch.qos.logback}/com.springsource.ch.qos.logback.core-${ch.qos.logback}.jar,\
+ file:../ivy-cache/repository/ch.qos.logback/com.springsource.ch.qos.logback.classic/${ch.qos.logback}/com.springsource.ch.qos.logback.classic-${ch.qos.logback}.jar,\
file:../org.eclipse.virgo.medic/target/artifacts/org.eclipse.virgo.medic.jar@start,\
file:../org.eclipse.virgo.medic.core/target/artifacts/org.eclipse.virgo.medic.core.jar@start,\
file:src/test/resources/config-fragment,\
file:src/test/resources/appender-fragment
-org.eclipse.virgo.test.properties.include=file:../build.versions,file:../build.properties,file:../user-ivy.properties
+org.eclipse.virgo.test.properties.include=file:../build.versions,file:../build.properties
org.eclipse.virgo.suppress.heap.dumps=false
@@ -28,5 +27,4 @@ osgi.parentClassloader=fwk
osgi.context.bootdelegation=false
osgi.compatibility.bootdelegation=false
osgi.console=2401
-osgi.console.enable.builtin=true
osgi.java.profile=file:src/test/resources/java6-server.profile
diff --git a/org.eclipse.virgo.medic.logbackclassicfragment/template.mf b/org.eclipse.virgo.medic.logbackclassicfragment/template.mf
index 61fdad9..28d801f 100644
--- a/org.eclipse.virgo.medic.logbackclassicfragment/template.mf
+++ b/org.eclipse.virgo.medic.logbackclassicfragment/template.mf
@@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.virgo.medic.logbackclassicfragment
Bundle-Name: Medic Logback Core Fragment
Bundle-Version: ${version}
-Fragment-Host: ch.qos.logback.classic;bundle-version="${ch.qos.logback.classic:[=.=.=, +1.0.0)}"
+Fragment-Host: com.springsource.ch.qos.logback.classic;bundle-version="${ch.qos.logback:[=.=.=, +1.0.0)}"
Import-Package:
org.eclipse.virgo.medic.log.logback;version="${version:[=.=.=, =.+1)}"
diff --git a/org.eclipse.virgo.medic.logbackcorefragment/template.mf b/org.eclipse.virgo.medic.logbackcorefragment/template.mf
index 3769003..9cba884 100644
--- a/org.eclipse.virgo.medic.logbackcorefragment/template.mf
+++ b/org.eclipse.virgo.medic.logbackcorefragment/template.mf
@@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.virgo.medic.logbackcorefragment
Bundle-Name: Medic Logback Core Fragment
Bundle-Version: ${version}
-Fragment-Host: ch.qos.logback.core;bundle-version="${ch.qos.logback.core:[=.=.=, +1.0.0)}"
+Fragment-Host: com.springsource.ch.qos.logback.core;bundle-version="${ch.qos.logback:[=.=.=, +1.0.0)}"
Import-Package:
org.eclipse.virgo.medic.log.logback;version="${version:[=.=.=, =.+1)}"
diff --git a/org.eclipse.virgo.medic.testfragment/.classpath b/org.eclipse.virgo.medic.testfragment/.classpath
index 017a704..df99d67 100644
--- a/org.eclipse.virgo.medic.testfragment/.classpath
+++ b/org.eclipse.virgo.medic.testfragment/.classpath
@@ -21,8 +21,8 @@
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="var" path="MEDIC_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="/MEDIC_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="MEDIC_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.8.0.v20120508-2119/org.eclipse.osgi-3.8.0.v20120508-2119.jar"/>
- <classpathentry kind="var" path="MEDIC_IVY_CACHE/org.eclipse.virgo.mirrored/org.slf4j.api/1.6.1.v20100831-0715/org.slf4j.api-1.6.1.v20100831-0715.jar"/>
+ <classpathentry kind="var" path="MEDIC_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-1.6.1.jar" sourcepath="/MEDIC_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-sources-1.6.1.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/org.eclipse.virgo.medic.testfragment/ivy.xml b/org.eclipse.virgo.medic.testfragment/ivy.xml
index 5c3b7c2..482ad18 100644
--- a/org.eclipse.virgo.medic.testfragment/ivy.xml
+++ b/org.eclipse.virgo.medic.testfragment/ivy.xml
@@ -17,8 +17,8 @@
</publications>
<dependencies>
- <dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.osgi" rev="${org.eclipse.osgi}" conf="provided->runtime"/>
- <dependency org="org.eclipse.virgo.mirrored" name="org.slf4j.api" rev="${org.slf4j.api}" conf="aspects->runtime"/>
+ <dependency org="org.eclipse.osgi" name="org.eclipse.osgi" rev="${org.eclipse.osgi}" conf="provided->runtime"/>
+ <dependency org="org.slf4j" name="com.springsource.slf4j.api" rev="${org.slf4j}" conf="aspects->runtime"/>
<dependency org="org.aspectj" name="com.springsource.org.aspectj.runtime" rev="${org.aspectj}" conf="aspects->runtime"/>
</dependencies>
diff --git a/org.eclipse.virgo.medic.testfragment/template.mf b/org.eclipse.virgo.medic.testfragment/template.mf
index e8a6f09..ef339cd 100644
--- a/org.eclipse.virgo.medic.testfragment/template.mf
+++ b/org.eclipse.virgo.medic.testfragment/template.mf
@@ -5,7 +5,7 @@ Import-Template:
org.aspectj.lang.*;version="${org.aspectj:[=.=.= , +1.0.0)}",
javax.management.*;version="0",
org.osgi.framework;version="0",
- org.slf4j.*;version="${org.slf4j.api:[=.=.=, =.+1.0)}"
+ org.slf4j.*;version="${org.slf4j:[=.=.=, =.+1.0)}"
Bundle-Version: ${version}
Bundle-Name: Medic API
Excluded-Imports:
diff --git a/org.eclipse.virgo.medic/.classpath b/org.eclipse.virgo.medic/.classpath
index 017a704..df99d67 100644
--- a/org.eclipse.virgo.medic/.classpath
+++ b/org.eclipse.virgo.medic/.classpath
@@ -21,8 +21,8 @@
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="var" path="MEDIC_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="/MEDIC_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="MEDIC_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.8.0.v20120508-2119/org.eclipse.osgi-3.8.0.v20120508-2119.jar"/>
- <classpathentry kind="var" path="MEDIC_IVY_CACHE/org.eclipse.virgo.mirrored/org.slf4j.api/1.6.1.v20100831-0715/org.slf4j.api-1.6.1.v20100831-0715.jar"/>
+ <classpathentry kind="var" path="MEDIC_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-1.6.1.jar" sourcepath="/MEDIC_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-sources-1.6.1.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/org.eclipse.virgo.medic/ivy.xml b/org.eclipse.virgo.medic/ivy.xml
index 5c3b7c2..482ad18 100644
--- a/org.eclipse.virgo.medic/ivy.xml
+++ b/org.eclipse.virgo.medic/ivy.xml
@@ -17,8 +17,8 @@
</publications>
<dependencies>
- <dependency org="org.eclipse.virgo.mirrored" name="org.eclipse.osgi" rev="${org.eclipse.osgi}" conf="provided->runtime"/>
- <dependency org="org.eclipse.virgo.mirrored" name="org.slf4j.api" rev="${org.slf4j.api}" conf="aspects->runtime"/>
+ <dependency org="org.eclipse.osgi" name="org.eclipse.osgi" rev="${org.eclipse.osgi}" conf="provided->runtime"/>
+ <dependency org="org.slf4j" name="com.springsource.slf4j.api" rev="${org.slf4j}" conf="aspects->runtime"/>
<dependency org="org.aspectj" name="com.springsource.org.aspectj.runtime" rev="${org.aspectj}" conf="aspects->runtime"/>
</dependencies>
diff --git a/org.eclipse.virgo.medic/template.mf b/org.eclipse.virgo.medic/template.mf
index 11c8f7f..f1dfa90 100644
--- a/org.eclipse.virgo.medic/template.mf
+++ b/org.eclipse.virgo.medic/template.mf
@@ -5,6 +5,6 @@ Import-Template:
org.aspectj.*;version="${org.aspectj:[=.=.= , +1.0.0)}",
javax.management.*;version="0",
org.osgi.framework;version="0",
- org.slf4j.*;version="${org.slf4j.api:[=.=.=, =.+1.0)}"
+ org.slf4j.*;version="${org.slf4j:[=.=.=, =.+1.0)}"
Bundle-Version: ${version}
Bundle-Name: Medic API

Back to the top