384178 - add osgi manifest headers to source bundles. get rid of log4j and use logback
diff --git a/core/src/test/resources/log4j.properties b/core/src/test/resources/log4j.properties
deleted file mode 100644
index 5f5f166..0000000
--- a/core/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-log4j.rootCategory=warn, stdout
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout.ConversionPattern=%r [%t] %-5p\: %-15c{2} - %m%n
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-
-#log4j.logger.org.springframework=TRACE
-#log4j.logger.org.springframework.osgi=DEBUG
-log4j.logger.org.springframework.osgi.blueservice=TRACE
-#log4j.logger.org.springframework.beans.factory.support=TRACE
-#log4j.logger.org.springframework.osgi.config.internal.adapter=TRACE
-
diff --git a/core/src/test/resources/logback-test.xml b/core/src/test/resources/logback-test.xml
new file mode 100644
index 0000000..848dc5e
--- /dev/null
+++ b/core/src/test/resources/logback-test.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<configuration>
+ <appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <pattern>%r [%t] %-5p: %-15c{2} - %m%n</pattern>
+ </encoder>
+ </appender>
+ <logger name="org.springframework.osgi" level="WARN"/>
+ <logger name="org.springframework" level="WARN"/>
+ <logger name="org.springframework.osgi.config.internal.adapter" level="INFO"/>
+ <logger name="org.springframework.beans.factory.support" level="WARN"/>
+ <root level="warn">
+ <appender-ref ref="stdout"/>
+ </root>
+</configuration>
\ No newline at end of file
diff --git a/extender/src/test/resources/log4j.properties b/extender/src/test/resources/log4j.properties
deleted file mode 100644
index 6682020..0000000
--- a/extender/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-log4j.rootCategory=WARN, stdout
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout.ConversionPattern=%p [%c] - %m%n
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-
-log4j.logger.org.springframework.osgi.internal=INFO
\ No newline at end of file
diff --git a/extender/src/test/resources/logback-test.xml b/extender/src/test/resources/logback-test.xml
new file mode 100644
index 0000000..336172d
--- /dev/null
+++ b/extender/src/test/resources/logback-test.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<configuration>
+ <appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <pattern>%p [%c] - %m%n</pattern>
+ </encoder>
+ </appender>
+ <logger name="org.springframework.osgi.internal" level="INFO"/>
+ <root level="WARN">
+ <appender-ref ref="stdout"/>
+ </root>
+</configuration>
\ No newline at end of file
diff --git a/integration-tests/tests/src/test/java/org/eclipse/gemini/blueprint/iandt/compliance/io/FragmentTest.java b/integration-tests/tests/src/test/java/org/eclipse/gemini/blueprint/iandt/compliance/io/FragmentTest.java
index f3b8ed8..a553381 100644
--- a/integration-tests/tests/src/test/java/org/eclipse/gemini/blueprint/iandt/compliance/io/FragmentTest.java
+++ b/integration-tests/tests/src/test/java/org/eclipse/gemini/blueprint/iandt/compliance/io/FragmentTest.java
@@ -121,7 +121,7 @@
}
public void testRootFileOnlyInHostBundle() {
- Object[] res = copyEnumeration(bundle.findEntries("/", "log4j.properties", false));
+ Object[] res = copyEnumeration(bundle.findEntries("/", "logback.xml", false));
assertResourceArray(res, 1);
}
diff --git a/integration-tests/tests/src/test/java/org/eclipse/gemini/blueprint/iandt/io/BaseIoTest.java b/integration-tests/tests/src/test/java/org/eclipse/gemini/blueprint/iandt/io/BaseIoTest.java
index 6148e46..64b295b 100644
--- a/integration-tests/tests/src/test/java/org/eclipse/gemini/blueprint/iandt/io/BaseIoTest.java
+++ b/integration-tests/tests/src/test/java/org/eclipse/gemini/blueprint/iandt/io/BaseIoTest.java
@@ -53,7 +53,7 @@
protected String[] getBundleContentPattern() {
- return (String[]) ObjectUtils.addObjectToArray(super.getBundleContentPattern(),
+ return ObjectUtils.addObjectToArray(super.getBundleContentPattern(),
"org/eclipse/gemini/blueprint/iandt/io/BaseIoTest.class");
}
@@ -121,11 +121,10 @@
}
protected void printPathWithinContext(Resource[] resources) {
- for (int i = 0; i < resources.length; i++) {
- Resource resource = resources[i];
- assertTrue(resource instanceof ContextResource);
- // Disabled print out
- //System.out.println("Path within context " + ((ContextResource) resource).getPathWithinContext());
- }
+ for (Resource resource : resources) {
+ assertTrue(resource instanceof ContextResource);
+ // Disabled print out
+ //System.out.println("Path within context " + ((ContextResource) resource).getPathWithinContext());
+ }
}
}
\ No newline at end of file
diff --git a/integration-tests/tests/src/test/java/org/eclipse/gemini/blueprint/iandt/ns/NamespaceProviderAndConsumerTest.java b/integration-tests/tests/src/test/java/org/eclipse/gemini/blueprint/iandt/ns/NamespaceProviderAndConsumerTest.java
index 0d54e32..58b68a5 100644
--- a/integration-tests/tests/src/test/java/org/eclipse/gemini/blueprint/iandt/ns/NamespaceProviderAndConsumerTest.java
+++ b/integration-tests/tests/src/test/java/org/eclipse/gemini/blueprint/iandt/ns/NamespaceProviderAndConsumerTest.java
@@ -55,7 +55,7 @@
assertNotNull(nsBean);
}
- public void tstNamespaceFilesOnTheClassPath() throws Exception {
+ public void testNamespaceFilesOnTheClassPath() throws Exception {
Bundle bundle = OsgiBundleUtils.findBundleBySymbolicName(bundleContext, BND_SYM_NAME);
assertNotNull("cannot find handler bundle", bundle);
URL handlers = bundle.getResource("META-INF/spring.handlers");
diff --git a/integration-tests/tests/src/test/java/org/eclipse/gemini/blueprint/iandt/proxycreator/ClassDependenciesVisibilityTest.java b/integration-tests/tests/src/test/java/org/eclipse/gemini/blueprint/iandt/proxycreator/ClassDependenciesVisibilityTest.java
index 2aff6b2..6574a01 100644
--- a/integration-tests/tests/src/test/java/org/eclipse/gemini/blueprint/iandt/proxycreator/ClassDependenciesVisibilityTest.java
+++ b/integration-tests/tests/src/test/java/org/eclipse/gemini/blueprint/iandt/proxycreator/ClassDependenciesVisibilityTest.java
@@ -23,10 +23,8 @@
import javax.swing.event.DocumentEvent;
import org.eclipse.gemini.blueprint.iandt.BaseIntegrationTest;
+import org.eclipse.gemini.blueprint.service.importer.support.*;
import org.osgi.framework.AdminPermission;
-import org.eclipse.gemini.blueprint.service.importer.support.Cardinality;
-import org.eclipse.gemini.blueprint.service.importer.support.ImportContextClassLoader;
-import org.eclipse.gemini.blueprint.service.importer.support.OsgiServiceProxyFactoryBean;
/**
* Integration test for bug OSGI-597.
@@ -46,8 +44,8 @@
System.out.println(cl);
OsgiServiceProxyFactoryBean fb = new OsgiServiceProxyFactoryBean();
fb.setBundleContext(bundleContext);
- fb.setCardinality(Cardinality.C_0__1);
- fb.setContextClassLoader(ImportContextClassLoader.UNMANAGED);
+ fb.setAvailability(Availability.OPTIONAL);
+ fb.setImportContextClassLoader(ImportContextClassLoaderEnum.UNMANAGED);
fb.setInterfaces(new Class<?>[] { DocumentEvent.class });
fb.setBeanClassLoader(cl);
fb.setApplicationEventPublisher(applicationContext);
diff --git a/integration-tests/tests/src/test/resources/log4j.properties b/integration-tests/tests/src/test/resources/log4j.properties
deleted file mode 100644
index 0b9c72c..0000000
--- a/integration-tests/tests/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,34 +0,0 @@
-log4j.rootCategory=WARN, stdout, file
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout.ConversionPattern=%t %p [%c{2}] - %m%n
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.threshold=TRACE
-
-log4j.appender.file=org.apache.log4j.RollingFileAppender
-log4j.appender.file.File=./target/out.log
-log4j.appender.file.threshold=TRACE
-log4j.appender.file.MaxFileSize=100KB
-# Keep one backup file
-log4j.appender.file.MaxBackupIndex=2
-log4j.appender.file.layout=org.apache.log4j.PatternLayout
-log4j.appender.file.layout.ConversionPattern==%t %p [%c{2}] - %m%n
-
-#log4j.logger.org.springframework.osgi.web.tomcat.internal=TRACE
-log4j.logger.org.springframework=INFO
-#log4j.logger.org.eclipse.gemini.blueprint.extender.internal.activator=TRACE
-#log4j.logger.org.eclipse.gemini.blueprint.iandt=TRACE
-#log4j.logger.org.eclipse.gemini.blueprint.test=TRACE
-
-#log4j.logger.org.eclipse.gemini.blueprint.service.exporter.support.internal.support=TRACE
-# namespace resolving
-#log4j.logger.org.springframework.beans.factory.xml.DefaultNamespaceHandlerResolver=TRACE
-#log4j.logger.org.eclipse.gemini.blueprint.context.support.DelegatedNamespaceHandlerResolver=TRACE
-#log4j.logger.org.eclipse.gemini.blueprint.extender.internal.support.NamespacePlugins=TRACE
-#log4j.logger.org.eclipse.gemini.blueprint.extender.internal.support.NamespaceManager=TRACE
-#log4j.logger.org.eclipse.gemini.blueprint.extender.internal.support=TRACE
-#log4j.logger.org.eclipse.gemini.blueprint.service.exporter.support=TRACE
-#log4j.logger.org.eclipse.gemini.blueprint.extender.internal.blueprint.activator.support=TRACE
-#log4j.logger.org.eclipse.gemini.blueprint.extender.internal.activator=TRACE
-#log4j.logger.org.eclipse.gemini.blueprint.extender.internal.blueprint=TRACE
-#log4j.logger.org.eclipse.gemini.blueprint.service.importer.support.internal.aop=TRACE
-#log4j.logger.org.eclipse.gemini.blueprint.service.dependency.internal=TRACE
\ No newline at end of file
diff --git a/integration-tests/tests/src/test/resources/logback.xml b/integration-tests/tests/src/test/resources/logback.xml
new file mode 100644
index 0000000..3342076
--- /dev/null
+++ b/integration-tests/tests/src/test/resources/logback.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- For assistance related to logback-translator or configuration -->
+<!-- files in general, please contact the logback user mailing list -->
+<!-- at http://www.qos.ch/mailman/listinfo/logback-user -->
+<!-- -->
+<!-- For professional support please see -->
+<!-- http://www.qos.ch/shop/products/professionalSupport -->
+<!-- -->
+<configuration>
+ <appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <pattern>%t %p [%c{2}] - %m%n</pattern>
+ </encoder>
+ <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+ <level>TRACE</level>
+ </filter>
+ </appender>
+ <appender name="file" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <!--See also http://logback.qos.ch/manual/appenders.html#RollingFileAppender-->
+ <File>./target/out.log</File>
+ <encoder>
+ <pattern>=%t %p [%c{2}] - %m%n</pattern>
+ </encoder>
+ <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+ <level>TRACE</level>
+ </filter>
+ <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
+ <maxIndex>2</maxIndex>
+ <FileNamePattern>./target/out.log.%i</FileNamePattern>
+ </rollingPolicy>
+ <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+ <MaxFileSize>100KB</MaxFileSize>
+ </triggeringPolicy>
+ </appender>
+ <logger name="org.springframework" level="INFO"/>
+ <logger name="org.eclipse.gemini.blueprint.context.support.DelegatedNamespaceHandlerResolver" level="WARN"/>
+ <logger name="org.eclipse.gemini.blueprint.service.exporter.support.internal.support" level="WARN"/>
+ <logger name="org.eclipse.gemini.blueprint.service.dependency.internal" level="WARN"/>
+ <logger name="org.springframework.beans.factory.xml.DefaultNamespaceHandlerResolver" level="WARN"/>
+ <logger name="org.eclipse.gemini.blueprint.iandt" level="WARN"/>
+ <logger name="org.eclipse.gemini.blueprint.test" level="WARN"/>
+ <logger name="org.eclipse.gemini.blueprint.extender.internal.activator" level="WARN"/>
+ <logger name="org.eclipse.gemini.blueprint.service.exporter.support" level="WARN"/>
+ <logger name="org.eclipse.gemini.blueprint.extender.internal.blueprint.activator.support" level="WARN"/>
+ <logger name="org.eclipse.gemini.blueprint.service.importer.support.internal.aop" level="WARN"/>
+ <logger name="org.eclipse.gemini.blueprint.extender.internal.support" level="WARN"/>
+ <logger name="org.eclipse.gemini.blueprint.extender.internal.blueprint" level="WARN"/>
+ <logger name="org.eclipse.gemini.blueprint.extender.internal.support.NamespaceManager" level="WARN"/>
+ <logger name="org.eclipse.gemini.blueprint.extender.internal.support.NamespacePlugins" level="WARN"/>
+ <root level="WARN">
+ <appender-ref ref="stdout"/>
+ <appender-ref ref="file"/>
+ </root>
+</configuration>
\ No newline at end of file
diff --git a/integration-tests/tests/src/test/resources/org/eclipse/gemini/blueprint/iandt/testingFramework/log4j.properties b/integration-tests/tests/src/test/resources/org/eclipse/gemini/blueprint/iandt/testingFramework/log4j.properties
deleted file mode 100644
index b69b3cd..0000000
--- a/integration-tests/tests/src/test/resources/org/eclipse/gemini/blueprint/iandt/testingFramework/log4j.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-log4j.rootLogger=INFO, stdout
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.threshold=TRACE
-log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - %m%n
-
-log4j.logger.org.springframework.osgi=INFO
-log4j.logger.org.springframework.osgi.util=TRACE
-
-#log4j.debug=false
\ No newline at end of file
diff --git a/integration-tests/tests/src/test/resources/org/eclipse/gemini/blueprint/iandt/testingFramework/logback.xml b/integration-tests/tests/src/test/resources/org/eclipse/gemini/blueprint/iandt/testingFramework/logback.xml
new file mode 100644
index 0000000..7e1e72a
--- /dev/null
+++ b/integration-tests/tests/src/test/resources/org/eclipse/gemini/blueprint/iandt/testingFramework/logback.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+ <appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <pattern>%d %p [%c] - %m%n</pattern>
+ </encoder>
+ <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+ <level>TRACE</level>
+ </filter>
+ </appender>
+ <logger name="org.springframework.osgi" level="INFO"/>
+ <logger name="org.springframework.osgi.util" level="TRACE"/>
+ <root level="INFO">
+ <appender-ref ref="stdout"/>
+ </root>
+</configuration>
\ No newline at end of file
diff --git a/io/src/test/resources/log4j.properties b/io/src/test/resources/log4j.properties
deleted file mode 100644
index 2c7848f..0000000
--- a/io/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-log4j.rootCategory=WARN, stdout
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout.ConversionPattern=%p [%c] - %m%n
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-
-log4j.logger.org.springframework.osgi=WARN
\ No newline at end of file
diff --git a/io/src/test/resources/logback-test.xml b/io/src/test/resources/logback-test.xml
new file mode 100644
index 0000000..3b9df81
--- /dev/null
+++ b/io/src/test/resources/logback-test.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+ <appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <pattern>%p [%c] - %m%n</pattern>
+ </encoder>
+ </appender>
+ <logger name="org.springframework.osgi" level="TRACE"/>
+ <root level="WARN">
+ <appender-ref ref="stdout"/>
+ </root>
+</configuration>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 3835315..66a62b1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,8 @@
<spring.osgi.license.loc>..</spring.osgi.license.loc>
<!-- other properties -->
- <slf4j.version>1.6.4</slf4j.version>
+ <slf4j.version>1.7.5</slf4j.version>
+ <logback.version>1.0.13</logback.version>
<env.buildPlan></env.buildPlan>
<env.buildNumber></env.buildNumber>
<!-- change that to gitVersion and add a way to get git version of the build -->
@@ -46,8 +47,8 @@
<!-- platform versions -->
<equinox.ver>3.6.2.R36x_v20110210</equinox.ver>
- <kf.ver>5.3.3</kf.ver>
<!-- Knopflerfish 3.5 -->
+ <kf.ver>5.3.3</kf.ver>
<felix.ver>2.0.5</felix.ver>
<!-- javadoc configuration -->
@@ -362,30 +363,36 @@
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j.version}</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <version>${logback.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.log4j</groupId>
- <artifactId>com.springsource.org.apache.log4j</artifactId>
- <version>1.2.16</version>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.slf4j</groupId>-->
+ <!--<artifactId>slf4j-log4j12</artifactId>-->
+ <!--<version>${slf4j.version}</version>-->
+ <!--<scope>provided</scope>-->
+ <!--<exclusions>-->
+ <!--<exclusion>-->
+ <!--<groupId>log4j</groupId>-->
+ <!--<artifactId>log4j</artifactId>-->
+ <!--</exclusion>-->
+ <!--</exclusions>-->
+ <!--</dependency>-->
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.16</version>
- <scope>test</scope>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.apache.log4j</groupId>-->
+ <!--<artifactId>com.springsource.org.apache.log4j</artifactId>-->
+ <!--<version>1.2.16</version>-->
+ <!--</dependency>-->
+
+ <!--<dependency>-->
+ <!--<groupId>log4j</groupId>-->
+ <!--<artifactId>log4j</artifactId>-->
+ <!--<version>1.2.16</version>-->
+ <!--<scope>test</scope>-->
+ <!--</dependency>-->
</dependencies>
@@ -564,6 +571,42 @@
<fork>true</fork>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.2.1</version>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>jar-no-fork</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Bundle-ManifestVersion>2</Bundle-ManifestVersion>
+ <Bundle-Name>${project.artifactId}</Bundle-Name>
+ <Bundle-Version>${project.version}</Bundle-Version>
+ <Bundle-SymbolicName>${spring.osgi.symbolic.name}.source</Bundle-SymbolicName>
+ <Bundle-Vendor>Eclipse Foundation</Bundle-Vendor>
+ <Bundle-DocURL>http://www.eclipse.org/gemini/blueprint/</Bundle-DocURL>
+ <Bundle-Description>${bundle.description}</Bundle-Description>
+ <Bundle-License>http://www.opensource.org/licenses/eclipse-1.0.php, http://www.opensource.org/licenses/apache2.0.php</Bundle-License>
+ <Implementation-Title>Eclipse Gemini Blueprint</Implementation-Title>
+ <Implementation-Version>${project.version}</Implementation-Version>
+ <Implementation-Vendor>Eclipse Foundation</Implementation-Vendor>
+ <Implementation-Vendor-Id>org.eclipse.gemini.blueprint</Implementation-Vendor-Id>
+ <Gemini-Blueprint-Version>${project.version}</Gemini-Blueprint-Version>
+ <Spring-Version>${spring.maven.artifact.version}</Spring-Version>
+ <Git-Revision>${git.commit.id.describe}</Git-Revision>
+ <Eclipse-SourceBundle>${spring.osgi.symbolic.name};version="${project.version}";roots:="."</Eclipse-SourceBundle>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
<!-- clover plug-in -->
<plugin>
diff --git a/test-support/src/main/java/org/eclipse/gemini/blueprint/test/AbstractConfigurableOsgiTests.java b/test-support/src/main/java/org/eclipse/gemini/blueprint/test/AbstractConfigurableOsgiTests.java
index 2e84306..9dc9d55 100644
--- a/test-support/src/main/java/org/eclipse/gemini/blueprint/test/AbstractConfigurableOsgiTests.java
+++ b/test-support/src/main/java/org/eclipse/gemini/blueprint/test/AbstractConfigurableOsgiTests.java
@@ -162,6 +162,12 @@
List defaults = new ArrayList();
// javax packages
defaults.add("javax.*");
+
+ // sql + transaction + activation?
+ defaults.add("javax.sql.*");
+ defaults.add("javax.transaction.*");
+ defaults.add("javax.activation.*");
+
// XML API available in JDK 1.4
defaults.add("org.w3c.*");
defaults.add("org.xml.*");
diff --git a/test-support/src/main/java/org/eclipse/gemini/blueprint/test/AbstractOnTheFlyBundleCreatorTests.java b/test-support/src/main/java/org/eclipse/gemini/blueprint/test/AbstractOnTheFlyBundleCreatorTests.java
index 82c0d9d..d6f78ee 100644
--- a/test-support/src/main/java/org/eclipse/gemini/blueprint/test/AbstractOnTheFlyBundleCreatorTests.java
+++ b/test-support/src/main/java/org/eclipse/gemini/blueprint/test/AbstractOnTheFlyBundleCreatorTests.java
@@ -545,8 +545,10 @@
String bundleString = OsgiStringUtils.nullSafeNameAndSymName(bundle);
boolean debug = logger.isDebugEnabled();
- if (debug)
+ if (debug) {
logger.debug("Test bundle [" + bundleString + "] successfully installed");
+ logger.debug(Constants.FRAMEWORK_BOOTDELEGATION + " = " + context.getProperty(Constants.FRAMEWORK_BOOTDELEGATION));
+ }
bundle.start();
if (debug)
logger.debug("Test bundle [" + bundleString + "] successfully started");
diff --git a/test-support/src/main/resources/org/eclipse/gemini/blueprint/test/internal/boot-bundles.properties b/test-support/src/main/resources/org/eclipse/gemini/blueprint/test/internal/boot-bundles.properties
index de30fec..3702f78 100644
--- a/test-support/src/main/resources/org/eclipse/gemini/blueprint/test/internal/boot-bundles.properties
+++ b/test-support/src/main/resources/org/eclipse/gemini/blueprint/test/internal/boot-bundles.properties
@@ -17,17 +17,18 @@
# versioning
ignore.junit.version=4.9.0
-ignore.log4j.version=1.2.16
+ignore.logback.version=1.0.13
ignore.spring.version=3.1.1.RELEASE
ignore.gemini.blueprint.version=2.0.0.BUILD-SNAPSHOT
-ignore.slf4j.version=1.6.4
+ignore.slf4j.version=1.7.5
ignore.asm.version=2.2.3
# groupIds
ignore.spring.groupId=org.springframework
ignore.gemini.blueprint.groupId=org.eclipse.gemini.blueprint
ignore.slf4j.groupId=org.slf4j
+ignore.logback.groupId=ch.qos.logback
#
# actual libraries
@@ -38,12 +39,13 @@
# junit
org.junit,com.springsource.org.junit,${ignore.junit.version}=
-# log4j
-org.apache.log4j,com.springsource.org.apache.log4j,${ignore.log4j.version}=
# slf4j
${ignore.slf4j.groupId},slf4j-api,${ignore.slf4j.version}=
-${ignore.slf4j.groupId},slf4j-log4j12,${ignore.slf4j.version}=
${ignore.slf4j.groupId},jcl-over-slf4j,${ignore.slf4j.version}=
+${ignore.logback.groupId},logback-core,${ignore.logback.version}=
+${ignore.logback.groupId},logback-classic,${ignore.logback.version}=
+#${ignore.slf4j.groupId},slf4j-log4j12,${ignore.slf4j.version}=
+
# aop alliance
org.aopalliance,com.springsource.org.aopalliance,1.0.0=
# asm
diff --git a/test-support/src/test/resources/log4j.properties b/test-support/src/test/resources/log4j.properties
deleted file mode 100644
index 4306f7f..0000000
--- a/test-support/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-log4j.rootCategory=WARN, stdout
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout.ConversionPattern=%p [%c] - %m%n
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-
-log4j.logger.org.springframework.osgi=TRACE
\ No newline at end of file
diff --git a/test-support/src/test/resources/logback-test.xml b/test-support/src/test/resources/logback-test.xml
new file mode 100644
index 0000000..3b9df81
--- /dev/null
+++ b/test-support/src/test/resources/logback-test.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+ <appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <pattern>%p [%c] - %m%n</pattern>
+ </encoder>
+ </appender>
+ <logger name="org.springframework.osgi" level="TRACE"/>
+ <root level="WARN">
+ <appender-ref ref="stdout"/>
+ </root>
+</configuration>
\ No newline at end of file
