Permalink
Browse files

JBOSGI-488 Replace jboss-osgi-common with jboss-osgi-logging

  • Loading branch information...
1 parent f6ce744 commit 1997545752ddf45bfc27bf0c6f3018dcbefed72d @bosschaert bosschaert committed Sep 21, 2011
View
@@ -1,3 +1,6 @@
[submodule "reactor/jbosgi-framework"]
path = reactor/jbosgi-framework
url = git://github.com/jbosgi/jbosgi-framework.git
+[submodule "reactor/jbosgi-spi"]
+ path = reactor/jbosgi-spi
+ url = git://github.com/jbosgi/jbosgi-spi.git
View
39 pom.xml
@@ -58,7 +58,6 @@
<version.jboss.arquillian.osgi>1.0.0.CR3</version.jboss.arquillian.osgi>
<version.jboss.logmanager>1.2.0.CR8</version.jboss.logmanager>
<version.jboss.osgi.blueprint>1.0.2</version.jboss.osgi.blueprint>
- <version.jboss.osgi.common>1.0.6</version.jboss.osgi.common>
<version.jboss.osgi.common.core>2.2.17.SP1</version.jboss.osgi.common.core>
<version.jboss.osgi.deployment>1.0.10</version.jboss.osgi.deployment>
<version.jboss.osgi.equinox>3.5.2.SP1</version.jboss.osgi.equinox>
@@ -68,15 +67,17 @@
<version.jboss.osgi.http>1.0.3</version.jboss.osgi.http>
<version.jboss.osgi.jmx>1.0.10</version.jboss.osgi.jmx>
<version.jboss.osgi.jndi>1.0.4</version.jboss.osgi.jndi>
+ <version.jboss.osgi.logging>1.0.0</version.jboss.osgi.logging>
<version.jboss.osgi.resolver>1.0.9</version.jboss.osgi.resolver>
- <version.jboss.osgi.spi>1.0.28</version.jboss.osgi.spi>
+ <version.jboss.osgi.spi>1.0.29-SNAPSHOT</version.jboss.osgi.spi>
<version.jboss.osgi.vfs>1.0.6</version.jboss.osgi.vfs>
<version.jboss.osgi.webapp>1.0.2</version.jboss.osgi.webapp>
<version.jboss.osgi.webconsole>1.0.6</version.jboss.osgi.webconsole>
<version.jboss.osgi.xerces>2.9.1.SP7</version.jboss.osgi.xerces>
<version.jboss.shrinkwrap>1.0.0-beta2</version.jboss.shrinkwrap>
<version.log4j>1.2.14</version.log4j>
<version.osgi>4.2.0</version.osgi>
+ <version.slf4j>1.6.1</version.slf4j>
</properties>
<!-- DependencyManagement -->
@@ -144,17 +145,6 @@
</dependency>
<dependency>
<groupId>org.jboss.osgi.common</groupId>
- <artifactId>jboss-osgi-common</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-spi</artifactId>
- </exclusion>
- </exclusions>
- <version>${version.jboss.osgi.common}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.common</groupId>
<artifactId>jboss-osgi-common-core</artifactId>
<exclusions>
<exclusion>
@@ -213,6 +203,11 @@
<version>${version.jboss.osgi.jndi}</version>
</dependency>
<dependency>
+ <groupId>org.jboss.osgi.logging</groupId>
+ <artifactId>jboss-osgi-logging</artifactId>
+ <version>${version.jboss.osgi.logging}</version>
+ </dependency>
+ <dependency>
<groupId>org.jboss.osgi.resolver</groupId>
<artifactId>jbosgi-resolver-api</artifactId>
<exclusions>
@@ -374,6 +369,24 @@
<artifactId>org.osgi.compendium</artifactId>
<version>${version.osgi}</version>
</dependency>
+
+
+ <!-- org.slf4j -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${version.slf4j}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${version.slf4j}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>${version.slf4j}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
Submodule jbosgi-spi added at 3fd07f
View
@@ -55,6 +55,7 @@
</property>
</activation>
<modules>
+ <module>jbosgi-spi</module>
<module>jbosgi-framework</module>
</modules>
</profile>
@@ -17,14 +17,17 @@
<includes>
<include>*:arquillian-osgi-bundle:jar</include>
<include>*:jbosgi-blueprint:jar</include>
- <include>*:jboss-osgi-common:jar</include>
<include>*:jboss-osgi-common-core:jar</include>
<include>*:jboss-osgi-http:jar</include>
<include>*:jboss-osgi-jmx:jar</include>
<include>*:jboss-osgi-jndi:jar</include>
+ <include>*:jboss-osgi-logging:jar</include>
<include>*:jbosgi-webapp:jar</include>
<include>*:jbosgi-webconsole:jar</include>
<include>*:jboss-osgi-xerces:jar</include>
+ <include>*:slf4j-api:jar</include>
+ <include>*:slf4j-log4j12:jar</include>
+ <include>*:jcl-over-slf4j:jar</include>
<include>*:org.apache.aries.jmx:jar</include>
<include>*:org.apache.aries.util:jar</include>
<include>*:org.apache.felix.configadmin:jar</include>
@@ -32,8 +32,8 @@
import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.osgi.common.log.LogServiceTracker;
import org.jboss.osgi.http.HttpServiceCapability;
+import org.jboss.osgi.logging.LogServiceTracker;
import org.jboss.osgi.testing.OSGiManifestBuilder;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.asset.Asset;
@@ -23,7 +23,7 @@
import java.util.Properties;
-import org.jboss.osgi.common.log.LogServiceTracker;
+import org.jboss.osgi.logging.LogServiceTracker;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
@@ -28,7 +28,6 @@ org.jboss.osgi.auto.install=\
# Bundles that need to be started automatically
org.jboss.osgi.auto.start=\
- file://${test.archive.directory}/bundles/jboss-osgi-common.jar, \
file://${test.archive.directory}/bundles/org.apache.felix.log.jar, \
file://${test.archive.directory}/bundles/arquillian-osgi-bundle.jar, \
file://${test.archive.directory}/bundles/org.apache.aries.util.jar, \
@@ -38,7 +37,11 @@ org.jboss.osgi.auto.start=\
file://${test.archive.directory}/bundles/jboss-osgi-http.jar, \
file://${test.archive.directory}/bundles/jboss-osgi-jmx.jar, \
file://${test.archive.directory}/bundles/jboss-osgi-jndi.jar, \
+ file://${test.archive.directory}/bundles/jboss-osgi-logging.jar, \
file://${test.archive.directory}/bundles/jbosgi-webapp.jar, \
file://${test.archive.directory}/bundles/jboss-osgi-xerces.jar, \
+ file://${test.archive.directory}/bundles/slf4j-api.jar, \
+ file://${test.archive.directory}/bundles/slf4j-log4j12.jar, \
+ file://${test.archive.directory}/bundles/jcl-over-slf4j.jar, \
file://${test.archive.directory}/bundles/org.apache.felix.eventadmin.jar, \
file://${test.archive.directory}/bundles/org.apache.felix.scr.jar
@@ -17,12 +17,15 @@
<includes>
<include>*:arquillian-osgi-bundle:jar</include>
<include>*:jbosgi-blueprint:jar</include>
- <include>*:jboss-osgi-common:jar</include>
<include>*:jboss-osgi-common-core:jar</include>
<include>*:jboss-osgi-http:jar</include>
<include>*:jboss-osgi-jmx:jar</include>
+ <include>*:jboss-osgi-logging:jar</include>
<include>*:jbosgi-webapp:jar</include>
<include>*:jboss-osgi-xerces:jar</include>
+ <include>*:slf4j-api:jar</include>
+ <include>*:slf4j-log4j12:jar</include>
+ <include>*:jcl-over-slf4j:jar</include>
<include>*:org.apache.aries.blueprint:jar</include>
<include>*:org.apache.aries.jmx:jar</include>
<include>*:org.apache.aries.util:jar</include>
@@ -31,9 +31,9 @@
/**
* [JBOSGI-161] Cannot use commons logging
- *
+ *
* https://jira.jboss.org/jira/browse/JBOSGI-161
- *
+ *
* @author thomas.diesler@jboss.com
* @since 07-Oct-2009
*/
@@ -43,7 +43,8 @@ public void testClientLogging() throws Exception {
String logmsg = "testClientLogging";
LoggingDelegate.assertJBossLogging(logmsg);
- LoggingDelegate.assertCommonsLogging(logmsg);
+ // Revisit in conjunction with AS7-439
+ // LoggingDelegate.assertCommonsLogging(logmsg);
LoggingDelegate.assertSL4J(logmsg);
}
@@ -29,7 +29,8 @@ public void start(BundleContext context) throws Exception {
String logmsg = context.getBundle().getSymbolicName();
LoggingDelegate.assertJBossLogging(logmsg);
- LoggingDelegate.assertCommonsLogging(logmsg);
+ // Revisit in conjunction with AS7-439
+ // LoggingDelegate.assertCommonsLogging(logmsg);
LoggingDelegate.assertSL4J(logmsg);
}
View
@@ -97,11 +97,6 @@
</dependency>
<dependency>
<groupId>org.jboss.osgi.common</groupId>
- <artifactId>jboss-osgi-common</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi.common</groupId>
<artifactId>jboss-osgi-common-core</artifactId>
<scope>provided</scope>
</dependency>
@@ -121,6 +116,11 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.jboss.osgi.logging</groupId>
+ <artifactId>jboss-osgi-logging</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.jboss.osgi.webapp</groupId>
<artifactId>jbosgi-webapp</artifactId>
<scope>provided</scope>
@@ -136,6 +136,23 @@
<scope>provided</scope>
</dependency>
+ <!-- SLF4J Dependencies -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
<!-- javax.* -->
<dependency>
<groupId>javax.servlet</groupId>

0 comments on commit 1997545

Please sign in to comment.