merge master
diff --git a/integration-tests/bundles/lifecycle.test.bundle/src/main/java/org/eclipse/gemini/blueprint/iandt/lifecycle/GuineaPig.java b/integration-tests/bundles/lifecycle.test.bundle/src/main/java/org/eclipse/gemini/blueprint/iandt/lifecycle/GuineaPig.java
index 994aed2..dee39d3 100644
--- a/integration-tests/bundles/lifecycle.test.bundle/src/main/java/org/eclipse/gemini/blueprint/iandt/lifecycle/GuineaPig.java
+++ b/integration-tests/bundles/lifecycle.test.bundle/src/main/java/org/eclipse/gemini/blueprint/iandt/lifecycle/GuineaPig.java
@@ -1,20 +1,22 @@
-/******************************************************************************
- * Copyright (c) 2006, 2010 VMware Inc., Oracle Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * and Apache License v2.0 which accompanies this distribution.
- * The Eclipse Public License is available at
- * http://www.eclipse.org/legal/epl-v10.html and the Apache License v2.0
- * is available at http://www.opensource.org/licenses/apache2.0.php.
- * You may elect to redistribute this code under either of these licenses.
- *
- * Contributors:
- * VMware Inc.
- * Oracle Inc.
- *****************************************************************************/
-
+/******************************************************************************
+ * Copyright (c) 2006, 2010 VMware Inc., Oracle Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Apache License v2.0 which accompanies this distribution.
+ * The Eclipse Public License is available at
+ * http://www.eclipse.org/legal/epl-v10.html and the Apache License v2.0
+ * is available at http://www.opensource.org/licenses/apache2.0.php.
+ * You may elect to redistribute this code under either of these licenses.
+ *
+ * Contributors:
+ * VMware Inc.
+ * Oracle Inc.
+ *****************************************************************************/
+
package org.eclipse.gemini.blueprint.iandt.lifecycle;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.osgi.framework.BundleContext;
import org.osgi.framework.FrameworkEvent;
import org.osgi.framework.FrameworkListener;
@@ -31,6 +33,7 @@
BundleContext bundleContext;
Listener listener;
+ private static final Log log = LogFactory.getLog(GuineaPig.class);
public void setBundleContext(BundleContext bundleContext) {
this.bundleContext = bundleContext;
@@ -52,7 +55,7 @@
static class Listener implements FrameworkListener {
public void frameworkEvent(FrameworkEvent frameworkEvent) {
- System.out.println("Eavesdropping on " + frameworkEvent);
+ log.info("Eavesdropping on " + frameworkEvent);
}
}
}
diff --git a/integration-tests/bundles/lifecycle.test.bundle/src/main/resources/META-INF/MANIFEST.MF b/integration-tests/bundles/lifecycle.test.bundle/src/main/resources/META-INF/MANIFEST.MF
index 10d8631..4207a9e 100644
--- a/integration-tests/bundles/lifecycle.test.bundle/src/main/resources/META-INF/MANIFEST.MF
+++ b/integration-tests/bundles/lifecycle.test.bundle/src/main/resources/META-INF/MANIFEST.MF
@@ -5,5 +5,10 @@
Bundle-ClassPath: .
Import-Package: org.springframework.beans.factory,
org.eclipse.gemini.blueprint.context,
- org.osgi.framework
+ org.osgi.framework,
+ org.apache.commons.logging,
+ org.springframework.context,
+ org.springframework.context.support,
+ org.springframework.core.io,
+ org.springframework.core.io.support
diff --git a/integration-tests/tests/pom.xml b/integration-tests/tests/pom.xml
index 47e507f..4a64ed3 100644
--- a/integration-tests/tests/pom.xml
+++ b/integration-tests/tests/pom.xml
@@ -21,7 +21,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.configadmin</artifactId>
- <version>1.2.4</version>
+ <version>1.2.8</version>
<scope>provided</scope>
<exclusions>
<exclusion>
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.metatype</artifactId>
- <version>1.0.2</version>
+ <version>1.0.8</version>
<scope>provided</scope>
<exclusions>
<exclusion>
@@ -56,7 +56,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.eventadmin</artifactId>
- <version>1.0.0</version>
+ <version>1.3.0</version>
<scope>provided</scope>
<exclusions>
<exclusion>
diff --git a/integration-tests/tests/src/test/java/org/eclipse/gemini/blueprint/iandt/BaseIntegrationTest.java b/integration-tests/tests/src/test/java/org/eclipse/gemini/blueprint/iandt/BaseIntegrationTest.java
index aaa8ab2..f691505 100644
--- a/integration-tests/tests/src/test/java/org/eclipse/gemini/blueprint/iandt/BaseIntegrationTest.java
+++ b/integration-tests/tests/src/test/java/org/eclipse/gemini/blueprint/iandt/BaseIntegrationTest.java
@@ -289,6 +289,11 @@
platform.getConfigurationProperties().setProperty("org.osgi.framework.storage.clean", "onFirstInit");
platform.getConfigurationProperties().setProperty("felix.fragment.validation", "warning");
+ platform.getConfigurationProperties().setProperty("felix.log.level", "4");
+
+ // todo: set system property to point to logback file.
+ // todo: figure out a better way to attach logback includes.xml files.
+
// KF 3.1 settings
//platform.getConfigurationProperties().setProperty("org.knopflerfish.framework.all_signed", "false");
diff --git a/integration-tests/tests/src/test/java/org/eclipse/gemini/blueprint/iandt/lifecycle/LifecycleTest.java b/integration-tests/tests/src/test/java/org/eclipse/gemini/blueprint/iandt/lifecycle/LifecycleTest.java
index bd6a224..8109937 100644
--- a/integration-tests/tests/src/test/java/org/eclipse/gemini/blueprint/iandt/lifecycle/LifecycleTest.java
+++ b/integration-tests/tests/src/test/java/org/eclipse/gemini/blueprint/iandt/lifecycle/LifecycleTest.java
@@ -1,27 +1,29 @@
-/******************************************************************************
- * Copyright (c) 2006, 2010 VMware Inc., Oracle Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * and Apache License v2.0 which accompanies this distribution.
- * The Eclipse Public License is available at
- * http://www.eclipse.org/legal/epl-v10.html and the Apache License v2.0
- * is available at http://www.opensource.org/licenses/apache2.0.php.
- * You may elect to redistribute this code under either of these licenses.
- *
- * Contributors:
- * VMware Inc.
- * Oracle Inc.
- *****************************************************************************/
-
+/******************************************************************************
+ * Copyright (c) 2006, 2010 VMware Inc., Oracle Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Apache License v2.0 which accompanies this distribution.
+ * The Eclipse Public License is available at
+ * http://www.eclipse.org/legal/epl-v10.html and the Apache License v2.0
+ * is available at http://www.opensource.org/licenses/apache2.0.php.
+ * You may elect to redistribute this code under either of these licenses.
+ *
+ * Contributors:
+ * VMware Inc.
+ * Oracle Inc.
+ *****************************************************************************/
+
package org.eclipse.gemini.blueprint.iandt.lifecycle;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
-import org.eclipse.gemini.blueprint.iandt.BaseIntegrationTest;
+import org.eclipse.gemini.blueprint.iandt.BaseIntegrationTest;
import org.osgi.framework.AdminPermission;
import org.osgi.framework.Bundle;
import org.osgi.framework.Constants;
+import org.osgi.framework.ServiceReference;
import org.osgi.util.tracker.ServiceTracker;
import org.springframework.context.ApplicationContext;
import org.springframework.context.support.AbstractRefreshableApplicationContext;
@@ -32,64 +34,114 @@
*/
public class LifecycleTest extends BaseIntegrationTest {
- protected String getManifestLocation() {
- return null;
- }
+ protected String getManifestLocation() {
+ return null;
+ }
- protected String[] getTestBundlesNames() {
- return new String[] { "org.eclipse.gemini.blueprint.iandt,lifecycle," + getSpringDMVersion() };
- }
+ protected String[] getTestBundlesNames() {
+ return new String[]{"org.eclipse.gemini.blueprint.iandt,lifecycle," + getSpringDMVersion()};
+ }
- public void testLifecycle() throws Exception {
- assertNotSame("Guinea pig has already been shutdown", "true",
- System.getProperty("org.eclipse.gemini.blueprint.iandt.lifecycle.GuineaPig.close"));
+ public void testLifecycle() throws Exception {
+ assertNotSame("Guinea pig has already been shutdown", "true",
+ System.getProperty("org.eclipse.gemini.blueprint.iandt.lifecycle.GuineaPig.close"));
- assertEquals("Guinea pig didn't startup", "true",
- System.getProperty("org.eclipse.gemini.blueprint.iandt.lifecycle.GuineaPig.startUp"));
- Bundle[] bundles = bundleContext.getBundles();
- Bundle testBundle = null;
- for (int i = 0; i < bundles.length; i++) {
- if ("org.eclipse.gemini.blueprint.iandt.lifecycle".equals(bundles[i].getSymbolicName())) {
- testBundle = bundles[i];
- break;
- }
- }
+ assertEquals("Guinea pig didn't startup", "true",
+ System.getProperty("org.eclipse.gemini.blueprint.iandt.lifecycle.GuineaPig.startUp"));
+ Bundle[] bundles = bundleContext.getBundles();
+ Bundle testBundle = null;
+ for (int i = 0; i < bundles.length; i++) {
+ if ("org.eclipse.gemini.blueprint.iandt.lifecycle".equals(bundles[i].getSymbolicName())) {
+ testBundle = bundles[i];
+ break;
+ }
+ }
- assertNotNull("Could not find the test bundle", testBundle);
- StringBuilder filter = new StringBuilder();
- filter.append("(&");
- filter.append("(").append(Constants.OBJECTCLASS).append("=").append(ApplicationContext.class.getName()).append(
- ")");
- filter.append("(").append(ConfigurableOsgiBundleApplicationContext.APPLICATION_CONTEXT_SERVICE_PROPERTY_NAME);
- filter.append("=").append(testBundle.getSymbolicName()).append(")");
- filter.append(")");
- ServiceTracker tracker = new ServiceTracker(bundleContext, bundleContext.createFilter(filter.toString()), null);
- try {
+ assertNotNull("Could not find the test bundle", testBundle);
+ StringBuilder filter = new StringBuilder();
+ filter.append("(&");
+ filter.append("(").append(Constants.OBJECTCLASS).append("=").append(ApplicationContext.class.getName()).append(")");
+ filter.append("(").append(ConfigurableOsgiBundleApplicationContext.APPLICATION_CONTEXT_SERVICE_PROPERTY_NAME);
+ filter.append("=").append(testBundle.getSymbolicName()).append(")");
+ filter.append(")");
- tracker.open();
+ logger.info("Creating filter = " + filter);
- AbstractRefreshableApplicationContext appContext = (AbstractRefreshableApplicationContext) tracker.waitForService(30000);
- assertNotNull("test application context", appContext);
- assertTrue("application context is active", appContext.isActive());
+ /*
+ [org.springframework.beans.factory.DisposableBean,
+ org.eclipse.gemini.blueprint.context.DelegatedExecutionOsgiBundleApplicationContext,
+ org.eclipse.gemini.blueprint.context.ConfigurableOsgiBundleApplicationContext,
+ org.springframework.context.ConfigurableApplicationContext,
+ org.springframework.context.ApplicationContext,
+ org.springframework.context.Lifecycle,
+ org.springframework.beans.factory.ListableBeanFactory,
+ org.springframework.beans.factory.HierarchicalBeanFactory,
+ org.springframework.context.MessageSource,
+ org.springframework.context.ApplicationEventPublisher,
+ org.springframework.core.io.support.ResourcePatternResolver,
+ org.springframework.beans.factory.BeanFactory,
+ org.springframework.core.io.ResourceLoader]
+ */
- testBundle.stop();
- while (testBundle.getState() == Bundle.STOPPING) {
- Thread.sleep(10);
- }
- assertEquals("Guinea pig didn't shutdown", "true",
- System.getProperty("org.eclipse.gemini.blueprint.iandt.lifecycle.GuineaPig.close"));
+// ServiceTracker tracker = new ServiceTracker(bundleContext, bundleContext.createFilter(filter.toString()), null);
+// ServiceTracker tracker = new ServiceTracker(testBundle.getBundleContext(), testBundle.getBundleContext().createFilter(filter.toString()), null);
+// tracker.open();
- assertFalse("application context is inactive", appContext.isActive());
- }
- finally {
- tracker.close();
- }
- }
+ try {
+// logger.info("All Services");
+// ServiceReference[] refs = bundleContext.getAllServiceReferences(ApplicationContext.class.getName(), null);
+// printServiceRefs(refs);
+// logger.info("Visible Services from local context");
+// refs = bundleContext.getServiceReferences(null, filter.toString());
+// printServiceRefs(refs);
+// logger.info("Visible Services from test client context");
+// refs = testBundle.getBundleContext().getServiceReferences(null, filter.toString());
+// printServiceRefs(refs);
+//
+// logger.info("tracking count = " + tracker.getTrackingCount());
+// AbstractRefreshableApplicationContext appContext = (AbstractRefreshableApplicationContext) tracker.waitForService(50000);
+// logger.info("tracking count = " + tracker.getTrackingCount());
+// AbstractRefreshableApplicationContext appContext = (AbstractRefreshableApplicationContext) tracker.getService();
- protected List getTestPermissions() {
- List perms = super.getTestPermissions();
- // export package
- perms.add(new AdminPermission("*", AdminPermission.EXECUTE));
- return perms;
- }
+ ServiceReference[] refs = bundleContext.getServiceReferences(null, filter.toString());
+ assertEquals("Should have a single service matched", 1, refs.length);
+
+ AbstractRefreshableApplicationContext appContext = (AbstractRefreshableApplicationContext)bundleContext.getService(refs[0]);
+
+ assertNotNull("test application context", appContext);
+ assertTrue("application context is active", appContext.isActive());
+
+ testBundle.stop();
+ while (testBundle.getState() == Bundle.STOPPING) {
+ Thread.sleep(10);
+ }
+ assertEquals("Guinea pig didn't shutdown", "true",
+ System.getProperty("org.eclipse.gemini.blueprint.iandt.lifecycle.GuineaPig.close"));
+
+ assertFalse("application context is inactive", appContext.isActive());
+ } finally {
+// tracker.close();
+ }
+ }
+
+ private void printServiceRefs(ServiceReference[] refs) {
+ for (ServiceReference ref : refs) {
+ String[] keys = ref.getPropertyKeys();
+ logger.info(ref);
+ for (String key : keys) {
+ if (Constants.OBJECTCLASS.equals(key)) {
+ logger.info("\t" + key + " = " + Arrays.toString((String[]) ref.getProperty(key)));
+ } else {
+ logger.info("\t" + key + " = " + ref.getProperty(key));
+ }
+ }
+ }
+ }
+
+ protected List getTestPermissions() {
+ List perms = super.getTestPermissions();
+ // export package
+ perms.add(new AdminPermission("*", AdminPermission.EXECUTE));
+ return perms;
+ }
}
diff --git a/integration-tests/tests/src/test/resources/logback-test.xml b/integration-tests/tests/src/test/resources/logback-test.xml
new file mode 100644
index 0000000..67fe5f1
--- /dev/null
+++ b/integration-tests/tests/src/test/resources/logback-test.xml
@@ -0,0 +1,57 @@
+<?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 debug="true">
+ <appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <pattern>%-30(%d{HH:mm:ss.SSS} [%thread]) %-5level %logger{32} : %line - %msg %ex%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>%-30(%d{HH:mm:ss.SSS} [%thread]) %-5level %logger{32}:%line - %msg %ex%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.eclipse.gemini.blueprint.test.AbstractOnTheFlyBundleCreatorTests" level="WARN"/>
+ <logger name="org.apache.felix" level="DEBUG"/>
+ <logger name="org.springframework" level="WARN"/>
+ <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/logback.xml b/integration-tests/tests/src/test/resources/org/eclipse/gemini/blueprint/iandt/testingFramework/logback.xml
index 7e1e72a..6962b28 100644
--- 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
@@ -1,16 +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>
+ <appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <pattern>%-30(%d{HH:mm:ss.SSS} [%thread]) %-5level %logger{32}:%line - %msg %ex%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="INFO"/>
+ <root level="INFO">
+ <appender-ref ref="stdout"/>
+ </root>
</configuration>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 5c202b9..c60234f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -368,6 +368,32 @@
<version>${logback.version}</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>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>
<build>
@@ -880,18 +906,18 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
</exclusion>
- <exclusion>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.shell</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.shell.tui</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.bundlerepository</artifactId>
- </exclusion>
+ <!--<exclusion>-->
+ <!--<groupId>org.apache.felix</groupId>-->
+ <!--<artifactId>org.apache.felix.shell</artifactId>-->
+ <!--</exclusion>-->
+ <!--<exclusion>-->
+ <!--<groupId>org.apache.felix</groupId>-->
+ <!--<artifactId>org.apache.felix.shell.tui</artifactId>-->
+ <!--</exclusion>-->
+ <!--<exclusion>-->
+ <!--<groupId>org.apache.felix</groupId>-->
+ <!--<artifactId>org.apache.felix.bundlerepository</artifactId>-->
+ <!--</exclusion>-->
</exclusions>
</dependency>
<!-- include the OSGi jar to allow PermissionAdmin API to be used -->
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 3702f78..c1069cb 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
@@ -36,7 +36,6 @@
# listed in dependency order to ease deployment
# dependencies
-
# junit
org.junit,com.springsource.org.junit,${ignore.junit.version}=
# slf4j
@@ -44,7 +43,6 @@
${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=
