[jboss-osgi-commits] JBoss-OSGI SVN: r100864 - in projects/jboss-osgi: projects/bundles/apache-xerces/trunk/src/main/java/org/jboss/osgi/xml and 38 other directories.
jboss-osgi-commits at lists.jboss.org
jboss-osgi-commits at lists.jboss.org
Thu Feb 11 06:46:34 EST 2010
Author: thomas.diesler at jboss.com
Date: 2010-02-11 06:46:29 -0500 (Thu, 11 Feb 2010)
New Revision: 100864
Removed:
projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/osgi/jmx/service/
Modified:
projects/jboss-osgi/projects/bundles/apache-xerces/trunk/pom.xml
projects/jboss-osgi/projects/bundles/apache-xerces/trunk/src/main/java/org/jboss/osgi/xml/XMLParserActivatorExt.java
projects/jboss-osgi/projects/bundles/hotdeploy/trunk/pom.xml
projects/jboss-osgi/projects/bundles/hotdeploy/trunk/src/main/java/org/jboss/osgi/hotdeploy/internal/DeploymentScannerImpl.java
projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml
projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/husky/internal/AbstractConnector.java
projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/husky/internal/AbstractInvoker.java
projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/husky/runtime/osgi/JMXConnector.java
projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/husky/runtime/osgi/ManifestProcessor.java
projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/husky/runtime/osgi/SocketConnector.java
projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/OSGiTest.java
projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/internal/EmbeddedBundle.java
projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/internal/EmbeddedRuntime.java
projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/internal/OSGiRuntimeImpl.java
projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/internal/RemoteBundle.java
projects/jboss-osgi/projects/bundles/husky/trunk/src/test/resources/jboss-osgi-framework.properties
projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/pom.xml
projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/src/main/java/org/jboss/osgi/jbossxb/internal/UnmarshallerServiceImpl.java
projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/src/main/java/org/jboss/osgi/jbossxb/internal/XMLBindingDocumentBuilderFactory.java
projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/src/main/java/org/jboss/osgi/jbossxb/internal/XMLBindingSAXParserFactory.java
projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/src/test/resources/jboss-osgi-framework.properties
projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml
projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/JMXConnectorService.java
projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/JMXServiceActivator.java
projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/MBeanServerService.java
projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/ManagedBundleTracker.java
projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/ManagedFrameworkImpl.java
projects/jboss-osgi/projects/bundles/jndi/trunk/pom.xml
projects/jboss-osgi/projects/bundles/jndi/trunk/src/main/java/org/jboss/osgi/jndi/internal/JNPServer.java
projects/jboss-osgi/projects/bundles/jta/trunk/pom.xml
projects/jboss-osgi/projects/bundles/webapp/trunk/pom.xml
projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/jboss/osgi/webapp/internal/WebAppPublisherInterceptor.java
projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/jboss/osgi/webapp/internal/WebXMLParserInterceptor.java
projects/jboss-osgi/projects/parent/trunk/pom.xml
projects/jboss-osgi/projects/runtime/deployment/trunk/pom.xml
projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/interceptor/AbstractLifecycleInterceptorService.java
projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/internal/DeploymentRegistryServiceImpl.java
projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/internal/SystemDeployerService.java
projects/jboss-osgi/projects/runtime/equinox/trunk/pom.xml
projects/jboss-osgi/projects/runtime/equinox/trunk/src/main/java/org/jboss/osgi/equinox/EquinoxBootstrapProvider.java
projects/jboss-osgi/projects/runtime/equinox/trunk/src/main/java/org/jboss/osgi/equinox/EquinoxIntegration.java
projects/jboss-osgi/projects/runtime/felix/trunk/pom.xml
projects/jboss-osgi/projects/runtime/felix/trunk/src/main/java/org/jboss/osgi/felix/FelixBootstrapProvider.java
projects/jboss-osgi/projects/runtime/felix/trunk/src/main/java/org/jboss/osgi/felix/FelixIntegration.java
projects/jboss-osgi/projects/runtime/felix/trunk/src/main/java/org/jboss/osgi/felix/FelixLogger.java
projects/jboss-osgi/projects/spi/trunk/pom.xml
projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/framework/BundleContextWrapper.java
projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/framework/BundleWrapper.java
projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/framework/FrameworkIntegrationBean.java
projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/framework/FrameworkWrapper.java
projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/framework/PropertiesBootstrapProvider.java
projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/internal/OSGiBootstrapBean.java
projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/management/ManagedBundle.java
projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/util/ExportedPackageHelper.java
projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/util/ServiceLoader.java
projects/jboss-osgi/trunk/pom.xml
projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/interceptor/processor/ParserInterceptor.java
projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/interceptor/processor/PublisherInterceptor.java
projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-equinox.properties
projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-felix.properties
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi99/OSGi99TestCase.java
projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-equinox.properties
projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-felix.properties
projects/jboss-osgi/trunk/testsuite/pom.xml
Log:
Switch from slf4j to jboss-logging
Modified: projects/jboss-osgi/projects/bundles/apache-xerces/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/apache-xerces/trunk/pom.xml 2010-02-11 10:17:50 UTC (rev 100863)
+++ projects/jboss-osgi/projects/bundles/apache-xerces/trunk/pom.xml 2010-02-11 11:46:29 UTC (rev 100864)
@@ -21,13 +21,13 @@
<artifactId>jboss-osgi-apache-xerces</artifactId>
<packaging>bundle</packaging>
- <version>2.9.1-SNAPSHOT</version>
+ <version>2.9.1.SP4-SNAPSHOT</version>
<!-- Parent -->
<parent>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-parent</artifactId>
- <version>1.0.4</version>
+ <version>1.0.5-SNAPSHOT</version>
</parent>
<!-- Subversion -->
@@ -41,7 +41,7 @@
<properties>
<version.apache.xerces>2.9.1</version.apache.xerces>
<version.jboss.osgi.common>1.0.3</version.jboss.osgi.common>
- <version.jboss.osgi.spi>1.0.3</version.jboss.osgi.spi>
+ <version.jboss.osgi.spi>1.0.5-SNAPSHOT</version.jboss.osgi.spi>
<version.wutka.dtdparser>1.2.1</version.wutka.dtdparser>
<version.xml.resolver>1.2</version.xml.resolver>
<version.osgi>4.2.0</version.osgi>
@@ -118,13 +118,13 @@
javax.xml.parsers,
javax.xml.transform*,
javax.xml.validation,
- org.slf4j,
org.w3c.dom*,
org.xml.sax*,
<!-- import -->
- org.jboss.osgi.common.log;version=1.0,
- org.jboss.osgi.spi.capability;version=1.0,
+ org.jboss.logging;version="[2.1,2.2)",
+ org.jboss.osgi.common.log;version="[1.0,1.1)",
+ org.jboss.osgi.spi.capability;version="[1.0,1.1)",
org.osgi.framework,
org.osgi.service.log,
org.osgi.util.xml,
Modified: projects/jboss-osgi/projects/bundles/apache-xerces/trunk/src/main/java/org/jboss/osgi/xml/XMLParserActivatorExt.java
===================================================================
--- projects/jboss-osgi/projects/bundles/apache-xerces/trunk/src/main/java/org/jboss/osgi/xml/XMLParserActivatorExt.java 2010-02-11 10:17:50 UTC (rev 100863)
+++ projects/jboss-osgi/projects/bundles/apache-xerces/trunk/src/main/java/org/jboss/osgi/xml/XMLParserActivatorExt.java 2010-02-11 11:46:29 UTC (rev 100864)
@@ -29,13 +29,12 @@
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.SAXParserFactory;
+import org.jboss.logging.Logger;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceReference;
import org.osgi.util.xml.XMLParserActivator;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* Activate the XML parser using {@link XMLParserActivatorExt}
@@ -46,7 +45,7 @@
public class XMLParserActivatorExt extends XMLParserActivator
{
// Provide logging
- private static Logger log = LoggerFactory.getLogger(XMLParserActivatorExt.class);
+ private static final Logger log = Logger.getLogger(XMLParserActivatorExt.class);
public void start(BundleContext context) throws Exception
{
Modified: projects/jboss-osgi/projects/bundles/hotdeploy/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/hotdeploy/trunk/pom.xml 2010-02-11 10:17:50 UTC (rev 100863)
+++ projects/jboss-osgi/projects/bundles/hotdeploy/trunk/pom.xml 2010-02-11 11:46:29 UTC (rev 100864)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-parent</artifactId>
- <version>1.0.4</version>
+ <version>1.0.5-SNAPSHOT</version>
</parent>
<!-- Subversion -->
@@ -40,8 +40,8 @@
<!-- Properties -->
<properties>
<version.jboss.osgi.common>1.0.3</version.jboss.osgi.common>
- <version.jboss.osgi.deployment>1.0.1</version.jboss.osgi.deployment>
- <version.jboss.osgi.spi>1.0.4</version.jboss.osgi.spi>
+ <version.jboss.osgi.deployment>1.0.2-SNAPSHOT</version.jboss.osgi.deployment>
+ <version.jboss.osgi.spi>1.0.5-SNAPSHOT</version.jboss.osgi.spi>
<version.osgi>4.2.0</version.osgi>
</properties>
@@ -97,14 +97,14 @@
<Private-Package>org.jboss.osgi.hotdeploy.internal</Private-Package>
<Import-Package>
javax.management,
- org.jboss.osgi.common.log;version=1.0,
- org.jboss.osgi.deployment.deployer,
- org.jboss.osgi.spi.service;version=1.0,
- org.jboss.osgi.spi.util;version=1.0,
+ org.jboss.logging;version="[2.1,2.2)",
+ org.jboss.osgi.common.log;version="[1.0,1.1)",
+ org.jboss.osgi.deployment.deployer;version="[1.0,1.1)",
+ org.jboss.osgi.spi.service;version="[1.0,1.1)",
+ org.jboss.osgi.spi.util;version="[1.0,1.1)",
org.osgi.framework,
org.osgi.service.log,
org.osgi.util.tracker,
- org.slf4j;version=1.5,
</Import-Package>
</instructions>
</configuration>
Modified: projects/jboss-osgi/projects/bundles/hotdeploy/trunk/src/main/java/org/jboss/osgi/hotdeploy/internal/DeploymentScannerImpl.java
===================================================================
--- projects/jboss-osgi/projects/bundles/hotdeploy/trunk/src/main/java/org/jboss/osgi/hotdeploy/internal/DeploymentScannerImpl.java 2010-02-11 10:17:50 UTC (rev 100863)
+++ projects/jboss-osgi/projects/bundles/hotdeploy/trunk/src/main/java/org/jboss/osgi/hotdeploy/internal/DeploymentScannerImpl.java 2010-02-11 11:46:29 UTC (rev 100864)
@@ -34,6 +34,7 @@
import java.util.List;
import java.util.Map;
+import org.jboss.logging.Logger;
import org.jboss.osgi.deployment.deployer.DeployerService;
import org.jboss.osgi.deployment.deployer.Deployment;
import org.jboss.osgi.hotdeploy.DeploymentScannerService;
@@ -42,8 +43,6 @@
import org.osgi.framework.BundleException;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.Version;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* The DeploymentScanner service
@@ -53,7 +52,9 @@
*/
public class DeploymentScannerImpl implements DeploymentScannerService
{
- private Logger log = LoggerFactory.getLogger(DeploymentScannerImpl.class);
+ // Provide logging
+ private static final Logger log = Logger.getLogger(DeploymentScannerImpl.class);
+
private BundleContext context;
private long scanInterval;
Modified: projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml 2010-02-11 10:17:50 UTC (rev 100863)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml 2010-02-11 11:46:29 UTC (rev 100864)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-parent</artifactId>
- <version>1.0.4</version>
+ <version>1.0.5-SNAPSHOT</version>
</parent>
<!-- Subversion -->
@@ -40,8 +40,8 @@
<!-- Properties -->
<properties>
- <version.jboss.osgi.runtime.felix>2.0.0</version.jboss.osgi.runtime.felix>
- <version.jboss.osgi.deployment>1.0.1</version.jboss.osgi.deployment>
+ <version.jboss.osgi.runtime.felix>2.0.2.SP1-SNAPSHOT</version.jboss.osgi.runtime.felix>
+ <version.jboss.osgi.deployment>1.0.2-SNAPSHOT</version.jboss.osgi.deployment>
<version.osgi>4.2.0</version.osgi>
</properties>
@@ -82,11 +82,6 @@
<version>${version.jboss.osgi.runtime.felix}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
@@ -105,6 +100,8 @@
<Import-Package>
javax.management,
javax.naming,
+
+ org.jboss.logging;version="[2.1,2.2)",
org.jboss.osgi.deployment.interceptor;version="[1.0,1.1)",
org.jboss.osgi.spi;version="[1.0,1.1)",
org.jboss.osgi.spi.capability;version="[1.0,1.1)",
@@ -114,7 +111,6 @@
org.junit;version="[4.6,5.0)",
org.osgi.framework,
org.osgi.util.tracker,
- org.slf4j;version="[1.5,1.6)",
<!-- ignore client side -->
!org.jboss.osgi.deployment.deployer,
Modified: projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/husky/internal/AbstractConnector.java
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/husky/internal/AbstractConnector.java 2010-02-11 10:17:50 UTC (rev 100863)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/husky/internal/AbstractConnector.java 2010-02-11 11:46:29 UTC (rev 100864)
@@ -30,6 +30,7 @@
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
+import org.jboss.logging.Logger;
import org.jboss.osgi.husky.PackageListener;
import org.jboss.osgi.husky.Request;
import org.jboss.osgi.husky.Response;
@@ -37,8 +38,6 @@
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
import org.osgi.util.tracker.ServiceTracker;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* An abstract {@link Connector} implementation
@@ -49,7 +48,7 @@
public abstract class AbstractConnector implements Connector
{
// Provide logging
- final Logger log = LoggerFactory.getLogger(AbstractConnector.class);
+ private static final Logger log = Logger.getLogger(AbstractConnector.class);
private BundleContext context;
Modified: projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/husky/internal/AbstractInvoker.java
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/husky/internal/AbstractInvoker.java 2010-02-11 10:17:50 UTC (rev 100863)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/husky/internal/AbstractInvoker.java 2010-02-11 11:46:29 UTC (rev 100864)
@@ -29,11 +29,10 @@
import javax.management.MBeanServerConnection;
import javax.management.MBeanServerFactory;
+import org.jboss.logging.Logger;
import org.jboss.osgi.husky.Invoker;
import org.jboss.osgi.husky.Request;
import org.jboss.osgi.husky.Response;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* An {@link Invoker} suitable for OSGi bundle testing.
@@ -49,7 +48,7 @@
public class AbstractInvoker implements Invoker
{
// Provide logging
- final Logger log = LoggerFactory.getLogger(AbstractInvoker.class);
+ private static final Logger log = Logger.getLogger(AbstractInvoker.class);
public Response invoke(Request req)
{
Modified: projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/husky/runtime/osgi/JMXConnector.java
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/husky/runtime/osgi/JMXConnector.java 2010-02-11 10:17:50 UTC (rev 100863)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/husky/runtime/osgi/JMXConnector.java 2010-02-11 11:46:29 UTC (rev 100864)
@@ -32,12 +32,11 @@
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
+import org.jboss.logging.Logger;
import org.jboss.osgi.husky.internal.AbstractConnector;
import org.jboss.osgi.husky.runtime.Connector;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* The JMX connector is a {@link Connector} that process Husky
@@ -49,7 +48,7 @@
public class JMXConnector extends AbstractConnector implements JMXConnectorMBean
{
// Provide Logging
- private Logger log = LoggerFactory.getLogger(JMXConnector.class);
+ private static final Logger log = Logger.getLogger(JMXConnector.class);
/** The ObjectName for this service: jboss.osgi.husky:service=jmx-connector */
public static ObjectName OBJECT_NAME;
Modified: projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/husky/runtime/osgi/ManifestProcessor.java
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/husky/runtime/osgi/ManifestProcessor.java 2010-02-11 10:17:50 UTC (rev 100863)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/husky/runtime/osgi/ManifestProcessor.java 2010-02-11 11:46:29 UTC (rev 100864)
@@ -27,13 +27,12 @@
import java.util.Hashtable;
import java.util.List;
+import org.jboss.logging.Logger;
import org.jboss.osgi.husky.PackageListener;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceReference;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* Processed the {@link #HEADER_TEST_PACKAGE} and registers the listeners.
@@ -44,7 +43,7 @@
public class ManifestProcessor
{
// Provide Logging
- private Logger log = LoggerFactory.getLogger(ManifestProcessor.class);
+ private static final Logger log = Logger.getLogger(ManifestProcessor.class);
/** The manifest header that identifies a bundle as Husky test bundle: 'Test-Package' */
public static final String HEADER_TEST_PACKAGE = "Test-Package";
Modified: projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/husky/runtime/osgi/SocketConnector.java
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/husky/runtime/osgi/SocketConnector.java 2010-02-11 10:17:50 UTC (rev 100863)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/husky/runtime/osgi/SocketConnector.java 2010-02-11 11:46:29 UTC (rev 100864)
@@ -30,13 +30,12 @@
import java.net.Socket;
import java.util.Properties;
+import org.jboss.logging.Logger;
import org.jboss.osgi.husky.internal.AbstractConnector;
import org.jboss.osgi.husky.internal.Util;
import org.jboss.osgi.husky.runtime.Connector;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceRegistration;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* The socket connector is a {@link Connector} that process Husky
@@ -52,7 +51,7 @@
public class SocketConnector extends AbstractConnector
{
// Provide Logging
- private Logger log = LoggerFactory.getLogger(SocketConnector.class);
+ private static final Logger log = Logger.getLogger(SocketConnector.class);
/** The Husky socket connector host poperty: 'org.jboss.osgi.husky.runtime.connector.host' */
public static final String PROP_SOCKET_CONNECTOR_HOST = Connector.class.getName().toLowerCase() + ".host";
Modified: projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/OSGiTest.java
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/OSGiTest.java 2010-02-11 10:17:50 UTC (rev 100863)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/OSGiTest.java 2010-02-11 11:46:29 UTC (rev 100864)
@@ -27,13 +27,12 @@
import javax.naming.InitialContext;
import javax.naming.NamingException;
+import org.jboss.logging.Logger;
import org.jboss.virtual.VFS;
import org.jboss.virtual.VirtualFile;
import org.junit.After;
import org.junit.Before;
import org.osgi.framework.Bundle;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* An abstract OSGi Test.
@@ -47,7 +46,7 @@
public abstract class OSGiTest
{
// Provide logging
- final Logger log = LoggerFactory.getLogger(OSGiTest.class);
+ private static final Logger log = Logger.getLogger(OSGiTest.class);
private OSGiTestHelper helper;
Modified: projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/internal/EmbeddedBundle.java
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/internal/EmbeddedBundle.java 2010-02-11 10:17:50 UTC (rev 100863)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/internal/EmbeddedBundle.java 2010-02-11 11:46:29 UTC (rev 100864)
@@ -25,6 +25,7 @@
import java.net.URL;
import java.util.Dictionary;
+import org.jboss.logging.Logger;
import org.jboss.osgi.deployment.deployer.DeployerService;
import org.jboss.osgi.spi.util.ExportedPackageHelper;
import org.jboss.osgi.testing.OSGiBundle;
@@ -34,8 +35,6 @@
import org.osgi.framework.ServiceReference;
import org.osgi.framework.Version;
import org.osgi.service.packageadmin.PackageAdmin;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* An OSGi Test Case
@@ -46,7 +45,7 @@
public class EmbeddedBundle extends OSGiBundleImpl
{
// Provide logging
- private final Logger log = LoggerFactory.getLogger(EmbeddedBundle.class);
+ private static final Logger log = Logger.getLogger(EmbeddedBundle.class);
private Bundle bundle;
Modified: projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/internal/EmbeddedRuntime.java
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/internal/EmbeddedRuntime.java 2010-02-11 10:17:50 UTC (rev 100863)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/internal/EmbeddedRuntime.java 2010-02-11 11:46:29 UTC (rev 100864)
@@ -32,6 +32,7 @@
import javax.management.MBeanServerConnection;
import javax.management.MBeanServerFactory;
+import org.jboss.logging.Logger;
import org.jboss.osgi.deployment.deployer.DeployerService;
import org.jboss.osgi.deployment.deployer.Deployment;
import org.jboss.osgi.deployment.deployer.DeploymentFactory;
@@ -60,6 +61,9 @@
*/
public class EmbeddedRuntime extends OSGiRuntimeImpl
{
+ // Provide logging
+ private static final Logger log = Logger.getLogger(EmbeddedRuntime.class);
+
public EmbeddedRuntime(OSGiTestHelper helper)
{
super(helper);
Modified: projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/internal/OSGiRuntimeImpl.java
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/internal/OSGiRuntimeImpl.java 2010-02-11 10:17:50 UTC (rev 100863)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/internal/OSGiRuntimeImpl.java 2010-02-11 11:46:29 UTC (rev 100864)
@@ -39,6 +39,7 @@
import javax.naming.InitialContext;
import javax.naming.NamingException;
+import org.jboss.logging.Logger;
import org.jboss.osgi.deployment.deployer.DeployerService;
import org.jboss.osgi.spi.capability.Capability;
import org.jboss.osgi.spi.util.BundleInfo;
@@ -49,8 +50,6 @@
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleException;
import org.osgi.framework.Version;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* An abstract implementation of the {@link OSGiRuntime}
@@ -61,7 +60,7 @@
public abstract class OSGiRuntimeImpl implements OSGiRuntime
{
// Provide logging
- final Logger log = LoggerFactory.getLogger(OSGiRuntimeImpl.class);
+ private static final Logger log = Logger.getLogger(OSGiRuntimeImpl.class);
private OSGiTestHelper helper;
private Map<String, OSGiBundle> bundles = new LinkedHashMap<String, OSGiBundle>();
Modified: projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/internal/RemoteBundle.java
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/internal/RemoteBundle.java 2010-02-11 10:17:50 UTC (rev 100863)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/internal/RemoteBundle.java 2010-02-11 11:46:29 UTC (rev 100864)
@@ -34,6 +34,7 @@
import javax.management.InstanceNotFoundException;
import javax.management.ObjectName;
+import org.jboss.logging.Logger;
import org.jboss.osgi.spi.management.ManagedBundle;
import org.jboss.osgi.spi.management.ManagedBundleMBean;
import org.jboss.osgi.spi.util.BundleInfo;
@@ -43,8 +44,6 @@
import org.osgi.framework.BundleException;
import org.osgi.framework.Constants;
import org.osgi.framework.Version;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* An implementation of a remote {@link OSGiBundle}
@@ -55,7 +54,7 @@
public class RemoteBundle extends OSGiBundleImpl
{
// Provide logging
- private final Logger log = LoggerFactory.getLogger(RemoteBundle.class);
+ private static final Logger log = Logger.getLogger(RemoteBundle.class);
private ManagedBundleMBean bundle;
private String location;
Modified: projects/jboss-osgi/projects/bundles/husky/trunk/src/test/resources/jboss-osgi-framework.properties
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/src/test/resources/jboss-osgi-framework.properties 2010-02-11 10:17:50 UTC (rev 100863)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/src/test/resources/jboss-osgi-framework.properties 2010-02-11 11:46:29 UTC (rev 100864)
@@ -23,9 +23,9 @@
org.jboss.osgi.spi.management;version=1.0, \
org.jboss.osgi.spi.service;version=1.0, \
org.jboss.osgi.spi.util;version=1.0, \
+ org.jboss.logging;version=2.1, \
org.jboss.virtual;version=2.1, \
- org.osgi.framework;version=1.5, \
- org.slf4j;version=1.5
+ org.osgi.framework;version=1.5
# Bundles that need to be installed with the Framework automatically
org.jboss.osgi.spi.framework.autoInstall=\
Modified: projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/pom.xml 2010-02-11 10:17:50 UTC (rev 100863)
+++ projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/pom.xml 2010-02-11 11:46:29 UTC (rev 100864)
@@ -21,13 +21,13 @@
<artifactId>jboss-osgi-xml-binding</artifactId>
<packaging>bundle</packaging>
- <version>2.0.x-SNAPSHOT</version>
+ <version>2.0.2.Beta4-SP1-SNAPSHOT</version>
<!-- Parent -->
<parent>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-parent</artifactId>
- <version>1.0.4</version>
+ <version>1.0.5-SNAPSHOT</version>
</parent>
<!-- Subversion -->
@@ -39,14 +39,14 @@
<!-- Properties -->
<properties>
- <version.jboss.osgi.runtime.felix>2.0.0</version.jboss.osgi.runtime.felix>
+ <version.jboss.osgi.runtime.felix>2.0.2.SP1-SNAPSHOT</version.jboss.osgi.runtime.felix>
<version.jboss.xb>2.0.2.Beta4</version.jboss.xb>
<version.jboss.osgi.common>1.0.3</version.jboss.osgi.common>
<version.jboss.osgi.common.core>2.2.13.GA</version.jboss.osgi.common.core>
- <version.jboss.osgi.husky>1.0.2</version.jboss.osgi.husky>
+ <version.jboss.osgi.husky>1.0.4-SNAPSHOT</version.jboss.osgi.husky>
<version.jboss.osgi.jaxb>2.1.10.SP3</version.jboss.osgi.jaxb>
<version.jboss.osgi.reflect>2.2.0</version.jboss.osgi.reflect>
- <version.jboss.osgi.spi>1.0.3</version.jboss.osgi.spi>
+ <version.jboss.osgi.spi>1.0.5-SNAPSHOT</version.jboss.osgi.spi>
<version.osgi>4.2.0</version.osgi>
</properties>
@@ -72,10 +72,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
<!-- Provided Dependencies -->
<dependency>
@@ -130,11 +126,6 @@
<version>${version.jboss.osgi.runtime.felix}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
@@ -156,7 +147,6 @@
javax.xml.bind.*,
javax.xml.namespace,
javax.xml.parsers,
- org.slf4j,
org.w3c.dom*,
org.xml.sax*,
@@ -257,7 +247,7 @@
</property>
<property>
<name>org.jboss.osgi.husky.Invoker</name>
- <value>org.jboss.osgi.husky.internal.OSGiInvoker</value>
+ <value>org.jboss.osgi.husky.internal.AbstractInvoker</value>
</property>
<property>
<name>test.archive.directory</name>
Modified: projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/src/main/java/org/jboss/osgi/jbossxb/internal/UnmarshallerServiceImpl.java
===================================================================
--- projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/src/main/java/org/jboss/osgi/jbossxb/internal/UnmarshallerServiceImpl.java 2010-02-11 10:17:50 UTC (rev 100863)
+++ projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/src/main/java/org/jboss/osgi/jbossxb/internal/UnmarshallerServiceImpl.java 2010-02-11 11:46:29 UTC (rev 100864)
@@ -27,6 +27,7 @@
import java.io.InputStream;
import java.io.Reader;
+import org.jboss.logging.Logger;
import org.jboss.osgi.jbossxb.UnmarshallerService;
import org.jboss.osgi.spi.util.BundleClassLoader;
import org.jboss.util.xml.JBossEntityResolver;
@@ -36,8 +37,6 @@
import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.xml.sax.ErrorHandler;
import org.xml.sax.InputSource;
@@ -50,7 +49,7 @@
public class UnmarshallerServiceImpl implements UnmarshallerService
{
// Provide logging
- private static Logger log = LoggerFactory.getLogger(UnmarshallerServiceImpl.class);
+ private static final Logger log = Logger.getLogger(UnmarshallerServiceImpl.class);
private UnmarshallerFactory factory;
private Unmarshaller unmarshaller;
Modified: projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/src/main/java/org/jboss/osgi/jbossxb/internal/XMLBindingDocumentBuilderFactory.java
===================================================================
--- projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/src/main/java/org/jboss/osgi/jbossxb/internal/XMLBindingDocumentBuilderFactory.java 2010-02-11 10:17:50 UTC (rev 100863)
+++ projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/src/main/java/org/jboss/osgi/jbossxb/internal/XMLBindingDocumentBuilderFactory.java 2010-02-11 11:46:29 UTC (rev 100864)
@@ -32,12 +32,11 @@
import javax.xml.parsers.ParserConfigurationException;
import org.apache.xerces.jaxp.DocumentBuilderFactoryImpl;
+import org.jboss.logging.Logger;
import org.osgi.framework.BundleContext;
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceReference;
import org.osgi.util.xml.XMLParserActivator;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* A {@link DocumentBuilderFactory}
@@ -58,7 +57,7 @@
{
// The log4j initialization routine may use this DocumentBuilderFactory
// Only create the logger, when we are running in an OSGi context
- log = LoggerFactory.getLogger(XMLBindingDocumentBuilderFactory.class);
+ log = Logger.getLogger(XMLBindingDocumentBuilderFactory.class);
XMLBindingDocumentBuilderFactory.context = context;
}
Modified: projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/src/main/java/org/jboss/osgi/jbossxb/internal/XMLBindingSAXParserFactory.java
===================================================================
--- projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/src/main/java/org/jboss/osgi/jbossxb/internal/XMLBindingSAXParserFactory.java 2010-02-11 10:17:50 UTC (rev 100863)
+++ projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/src/main/java/org/jboss/osgi/jbossxb/internal/XMLBindingSAXParserFactory.java 2010-02-11 11:46:29 UTC (rev 100864)
@@ -32,12 +32,11 @@
import javax.xml.parsers.SAXParserFactory;
import org.apache.xerces.jaxp.SAXParserFactoryImpl;
+import org.jboss.logging.Logger;
import org.osgi.framework.BundleContext;
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceReference;
import org.osgi.util.xml.XMLParserActivator;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.xml.sax.SAXException;
/**
@@ -58,7 +57,7 @@
{
// The log4j initialization routine may use this DocumentBuilderFactory
// Only create the logger, when we are running in an OSGi context
- log = LoggerFactory.getLogger(XMLBindingSAXParserFactory.class);
+ log = Logger.getLogger(XMLBindingSAXParserFactory.class);
XMLBindingSAXParserFactory.context = context;
}
Modified: projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/src/test/resources/jboss-osgi-framework.properties
===================================================================
--- projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/src/test/resources/jboss-osgi-framework.properties 2010-02-11 10:17:50 UTC (rev 100863)
+++ projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/src/test/resources/jboss-osgi-framework.properties 2010-02-11 11:46:29 UTC (rev 100864)
@@ -24,9 +24,9 @@
org.jboss.osgi.spi.management;version=1.0, \
org.jboss.osgi.spi.service;version=1.0, \
org.jboss.osgi.spi.util;version=1.0, \
+ org.jboss.logging;version=2.1, \
org.jboss.virtual;version=2.1, \
- org.osgi.framework;version=1.5, \
- org.slf4j;version=1.5
+ org.osgi.framework;version=1.5
# Bundles that need to be installed with the Framework automatically
org.jboss.osgi.spi.framework.autoInstall=\
Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml 2010-02-11 10:17:50 UTC (rev 100863)
+++ projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml 2010-02-11 11:46:29 UTC (rev 100864)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-parent</artifactId>
- <version>1.0.4</version>
+ <version>1.0.5-SNAPSHOT</version>
</parent>
<!-- Subversion -->
@@ -40,8 +40,8 @@
<!-- Properties -->
<properties>
<version.jboss.osgi.common.core>2.2.13.GA</version.jboss.osgi.common.core>
- <version.jboss.osgi.jndi>1.0.2</version.jboss.osgi.jndi>
- <version.jboss.osgi.spi>1.0.4</version.jboss.osgi.spi>
+ <version.jboss.osgi.jndi>1.0.3-SNAPSHOT</version.jboss.osgi.jndi>
+ <version.jboss.osgi.spi>1.0.5-SNAPSHOT</version.jboss.osgi.spi>
<version.osgi>4.2.0</version.osgi>
</properties>
@@ -108,9 +108,6 @@
org.osgi.service.packageadmin,
org.osgi.util.tracker,
- <!-- logging -->
- org.slf4j,
-
<!-- FIXME optional -->
org.jboss.osgi.jndi,
org.jboss.net.sockets,
Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/JMXConnectorService.java
===================================================================
--- projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/JMXConnectorService.java 2010-02-11 10:17:50 UTC (rev 100863)
+++ projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/JMXConnectorService.java 2010-02-11 11:46:29 UTC (rev 100864)
@@ -36,10 +36,9 @@
import javax.management.remote.JMXConnectorServerFactory;
import javax.management.remote.JMXServiceURL;
+import org.jboss.logging.Logger;
import org.jboss.net.sockets.DefaultSocketFactory;
import org.osgi.framework.BundleContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* A Service Activator that registers an MBeanServer
@@ -50,7 +49,7 @@
public class JMXConnectorService
{
// Provide logging
- private Logger log = LoggerFactory.getLogger(JMXConnectorService.class);
+ private static final Logger log = Logger.getLogger(JMXConnectorService.class);
private JMXServiceURL serviceURL;
private JMXConnectorServer jmxConnectorServer;
Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/JMXServiceActivator.java
===================================================================
--- projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/JMXServiceActivator.java 2010-02-11 10:17:50 UTC (rev 100863)
+++ projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/JMXServiceActivator.java 2010-02-11 11:46:29 UTC (rev 100864)
@@ -37,13 +37,12 @@
import javax.naming.Reference;
import javax.naming.StringRefAddr;
+import org.jboss.logging.Logger;
import org.jboss.osgi.spi.management.ManagedFramework;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
import org.osgi.util.tracker.ServiceTracker;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* A BundleActivator for the MBeanServer related services
@@ -54,7 +53,7 @@
public class JMXServiceActivator implements BundleActivator
{
// Provide logging
- private Logger log = LoggerFactory.getLogger(JMXServiceActivator.class);
+ private static final Logger log = Logger.getLogger(JMXServiceActivator.class);
private JMXConnectorService jmxConnector;
private String jmxHost;
Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/MBeanServerService.java
===================================================================
--- projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/MBeanServerService.java 2010-02-11 10:17:50 UTC (rev 100863)
+++ projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/MBeanServerService.java 2010-02-11 11:46:29 UTC (rev 100864)
@@ -28,10 +28,9 @@
import javax.management.MBeanServer;
import javax.management.MBeanServerFactory;
+import org.jboss.logging.Logger;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* A service that registers an MBeanServer
@@ -42,7 +41,7 @@
public class MBeanServerService
{
// Provide logging
- private Logger log = LoggerFactory.getLogger(MBeanServerService.class);
+ private static final Logger log = Logger.getLogger(MBeanServerService.class);
private BundleContext context;
Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/ManagedBundleTracker.java
===================================================================
--- projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/ManagedBundleTracker.java 2010-02-11 10:17:50 UTC (rev 100863)
+++ projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/ManagedBundleTracker.java 2010-02-11 11:46:29 UTC (rev 100864)
@@ -27,13 +27,12 @@
import javax.management.MBeanServer;
import javax.management.ObjectName;
+import org.jboss.logging.Logger;
import org.jboss.osgi.spi.management.ManagedBundle;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleEvent;
import org.osgi.util.tracker.BundleTracker;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* Track and register/unregister bundles with the MBeanServer.
@@ -44,7 +43,7 @@
public class ManagedBundleTracker extends BundleTracker
{
// Provide logging
- private Logger log = LoggerFactory.getLogger(ManagedBundleTracker.class);
+ private static final Logger log = Logger.getLogger(ManagedBundleTracker.class);
private BundleContext systemContext;
private MBeanServer mbeanServer;
Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/ManagedFrameworkImpl.java
===================================================================
--- projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/ManagedFrameworkImpl.java 2010-02-11 10:17:50 UTC (rev 100863)
+++ projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/ManagedFrameworkImpl.java 2010-02-11 11:46:29 UTC (rev 100864)
@@ -42,6 +42,7 @@
import javax.management.QueryExp;
import javax.management.StandardMBean;
+import org.jboss.logging.Logger;
import org.jboss.osgi.spi.management.ManagedBundle;
import org.jboss.osgi.spi.management.ManagedFrameworkMBean;
import org.jboss.osgi.spi.management.ManagedServiceReference;
@@ -51,8 +52,6 @@
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceReference;
import org.osgi.service.packageadmin.PackageAdmin;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* The managed view of an OSGi Framework
@@ -63,7 +62,7 @@
public class ManagedFrameworkImpl implements ManagedFrameworkMBean
{
// Provide logging
- final Logger log = LoggerFactory.getLogger(ManagedFrameworkImpl.class);
+ private static final Logger log = Logger.getLogger(ManagedFrameworkImpl.class);
private MBeanServer mbeanServer;
private BundleContext context;
Modified: projects/jboss-osgi/projects/bundles/jndi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/jndi/trunk/pom.xml 2010-02-11 10:17:50 UTC (rev 100863)
+++ projects/jboss-osgi/projects/bundles/jndi/trunk/pom.xml 2010-02-11 11:46:29 UTC (rev 100864)
@@ -27,18 +27,24 @@
<parent>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-parent</artifactId>
- <version>1.0.4</version>
+ <version>1.0.5-SNAPSHOT</version>
</parent>
<!-- Properties -->
<properties>
<version.jboss.naming>5.0.1.GA</version.jboss.naming>
<version.jboss.osgi.common>1.0.3</version.jboss.osgi.common>
+ <version.jboss.osgi.spi>1.0.5-SNAPSHOT</version.jboss.osgi.spi>
<version.osgi>4.2.0</version.osgi>
</properties>
<!-- Dependencies -->
<dependencies>
+ <dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-spi</artifactId>
+ <version>${version.jboss.osgi.spi}</version>
+ </dependency>
<!-- Provided Dependencies -->
<dependency>
@@ -85,7 +91,6 @@
<Import-Package>
javax.naming*,
javax.net,
- org.slf4j,
org.jboss.logging,
org.jboss.net.sockets,
org.jboss.osgi.common.log;version=1.0,
Modified: projects/jboss-osgi/projects/bundles/jndi/trunk/src/main/java/org/jboss/osgi/jndi/internal/JNPServer.java
===================================================================
--- projects/jboss-osgi/projects/bundles/jndi/trunk/src/main/java/org/jboss/osgi/jndi/internal/JNPServer.java 2010-02-11 10:17:50 UTC (rev 100863)
+++ projects/jboss-osgi/projects/bundles/jndi/trunk/src/main/java/org/jboss/osgi/jndi/internal/JNPServer.java 2010-02-11 11:46:29 UTC (rev 100864)
@@ -32,14 +32,13 @@
import javax.naming.NamingException;
+import org.jboss.logging.Logger;
import org.jboss.net.sockets.DefaultSocketFactory;
import org.jnp.interfaces.Naming;
import org.jnp.server.Main;
import org.jnp.server.NamingBean;
import org.jnp.server.NamingServer;
import org.osgi.framework.BundleContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* Start/Stop the {@link NamingServer}
@@ -50,7 +49,7 @@
public class JNPServer
{
// Provide logging
- final Logger log = LoggerFactory.getLogger(JNPServer.class);
+ private static final Logger log = Logger.getLogger(JNPServer.class);
private String host;
private int jndiPort;
Modified: projects/jboss-osgi/projects/bundles/jta/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/jta/trunk/pom.xml 2010-02-11 10:17:50 UTC (rev 100863)
+++ projects/jboss-osgi/projects/bundles/jta/trunk/pom.xml 2010-02-11 11:46:29 UTC (rev 100864)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-parent</artifactId>
- <version>1.0.4</version>
+ <version>1.0.5-SNAPSHOT</version>
</parent>
<!-- Subversion -->
@@ -41,7 +41,7 @@
<properties>
<version.jboss.jta.api>1.0.1.GA</version.jboss.jta.api>
<version.jboss.jbossts>4.6.1.GA</version.jboss.jbossts>
- <version.jboss.osgi.spi>1.0.3</version.jboss.osgi.spi>
+ <version.jboss.osgi.spi>1.0.5-SNAPSHOT</version.jboss.osgi.spi>
<version.osgi>4.2.0</version.osgi>
</properties>
@@ -88,11 +88,6 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
Modified: projects/jboss-osgi/projects/bundles/webapp/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/webapp/trunk/pom.xml 2010-02-11 10:17:50 UTC (rev 100863)
+++ projects/jboss-osgi/projects/bundles/webapp/trunk/pom.xml 2010-02-11 11:46:29 UTC (rev 100864)
@@ -21,13 +21,13 @@
<artifactId>jboss-osgi-webapp</artifactId>
<packaging>bundle</packaging>
- <version>0.7.x-SNAPSHOT</version>
+ <version>0.7.2.SP2-SNAPSHOT</version>
<!-- Parent -->
<parent>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-parent</artifactId>
- <version>1.0.4</version>
+ <version>1.0.5-SNAPSHOT</version>
</parent>
<!-- Subversion -->
@@ -39,7 +39,7 @@
<!-- Properties -->
<properties>
- <version.jboss.osgi.deployment>1.0.1</version.jboss.osgi.deployment>
+ <version.jboss.osgi.deployment>1.0.2-SNAPSHOT</version.jboss.osgi.deployment>
<version.ops4j.pax.web>0.7.2</version.ops4j.pax.web>
<version.osgi>4.2.0</version.osgi>
</properties>
@@ -98,16 +98,17 @@
<Import-Package>
javax.servlet,
javax.servlet.http,
- javax.xml.parsers,
- org.apache.commons.logging;version=1.1,
- org.jboss.osgi.deployment.interceptor;version=1.0,
- org.jboss.osgi.spi.capability;version=1.0,
+ javax.xml.parsers,
+
+ org.apache.commons.logging;version="[1.1,1.2)",
+ org.jboss.logging;version="[2.1,2.2)",
+ org.jboss.osgi.deployment.interceptor;version="[1.0,1.1)",
+ org.jboss.osgi.spi.capability;version="[1.0,1.1)",
org.jboss.virtual,
org.ops4j.pax.web.service,
org.osgi.service.http,
org.osgi.framework,
org.osgi.util.tracker,
- org.slf4j;version=1.5,
org.w3c.dom,
org.xml.sax,
</Import-Package>
Modified: projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/jboss/osgi/webapp/internal/WebAppPublisherInterceptor.java
===================================================================
--- projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/jboss/osgi/webapp/internal/WebAppPublisherInterceptor.java 2010-02-11 10:17:50 UTC (rev 100863)
+++ projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/jboss/osgi/webapp/internal/WebAppPublisherInterceptor.java 2010-02-11 11:46:29 UTC (rev 100864)
@@ -23,6 +23,7 @@
//$Id$
+import org.jboss.logging.Logger;
import org.jboss.osgi.deployment.interceptor.AbstractLifecycleInterceptor;
import org.jboss.osgi.deployment.interceptor.InvocationContext;
import org.jboss.osgi.deployment.interceptor.LifecycleInterceptor;
@@ -30,8 +31,6 @@
import org.ops4j.pax.web.extender.war.internal.WebAppPublisherExt;
import org.ops4j.pax.web.extender.war.internal.model.WebApp;
import org.osgi.framework.Bundle;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* The WebApp lifecycle interceptor.
@@ -42,7 +41,7 @@
public class WebAppPublisherInterceptor extends AbstractLifecycleInterceptor implements LifecycleInterceptor
{
// Provide logging
- private Logger log = LoggerFactory.getLogger(WebAppPublisherInterceptor.class);
+ private static final Logger log = Logger.getLogger(WebAppPublisherInterceptor.class);
private WebAppPublisherExt publisher;
Modified: projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/jboss/osgi/webapp/internal/WebXMLParserInterceptor.java
===================================================================
--- projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/jboss/osgi/webapp/internal/WebXMLParserInterceptor.java 2010-02-11 10:17:50 UTC (rev 100863)
+++ projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/jboss/osgi/webapp/internal/WebXMLParserInterceptor.java 2010-02-11 11:46:29 UTC (rev 100864)
@@ -25,6 +25,7 @@
import java.io.IOException;
+import org.jboss.logging.Logger;
import org.jboss.osgi.deployment.interceptor.AbstractLifecycleInterceptor;
import org.jboss.osgi.deployment.interceptor.InvocationContext;
import org.jboss.osgi.deployment.interceptor.LifecycleInterceptor;
@@ -33,8 +34,6 @@
import org.ops4j.pax.web.extender.war.internal.model.WebApp;
import org.ops4j.pax.web.extender.war.internal.parser.dom.DOMWebXmlParser;
import org.osgi.framework.Bundle;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* The WebApp lifecycle interceptor.
@@ -45,7 +44,7 @@
public class WebXMLParserInterceptor extends AbstractLifecycleInterceptor implements LifecycleInterceptor
{
// Provide logging
- private Logger log = LoggerFactory.getLogger(WebXMLParserInterceptor.class);
+ private static final Logger log = Logger.getLogger(WebXMLParserInterceptor.class);
public WebXMLParserInterceptor()
{
Modified: projects/jboss-osgi/projects/parent/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/parent/trunk/pom.xml 2010-02-11 10:17:50 UTC (rev 100863)
+++ projects/jboss-osgi/projects/parent/trunk/pom.xml 2010-02-11 11:46:29 UTC (rev 100864)
@@ -17,7 +17,6 @@
<version.aqute.bnd>0.0.356</version.aqute.bnd>
<version.jboss.logging>2.1.0.GA</version.jboss.logging>
<version.junit>4.6</version.junit>
- <version.slf4j>1.5.8</version.slf4j>
</properties>
<!-- Subversion -->
@@ -37,20 +36,15 @@
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
+ <artifactId>jboss-logging-spi</artifactId>
<version>${version.jboss.logging}</version>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${version.slf4j}</version>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ <version>${version.jboss.logging}</version>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${version.slf4j}</version>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${version.junit}</version>
@@ -159,13 +153,6 @@
<enabled>true</enabled>
</snapshots>
</repository>
- <repository>
- <id>aQute</id>
- <url>http://www.aQute.biz/repo</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
</repositories>
<!-- PluginRepositories -->
Modified: projects/jboss-osgi/projects/runtime/deployment/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/deployment/trunk/pom.xml 2010-02-11 10:17:50 UTC (rev 100863)
+++ projects/jboss-osgi/projects/runtime/deployment/trunk/pom.xml 2010-02-11 11:46:29 UTC (rev 100864)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-parent</artifactId>
- <version>1.0.4</version>
+ <version>1.0.5-SNAPSHOT</version>
</parent>
<!-- Subversion -->
@@ -39,7 +39,7 @@
<!-- Properties -->
<properties>
<version.jboss.deployers>2.2.0.Alpha1</version.jboss.deployers>
- <version.jboss.osgi.spi>1.0.4</version.jboss.osgi.spi>
+ <version.jboss.osgi.spi>1.0.5-SNAPSHOT</version.jboss.osgi.spi>
<version.osgi>4.2.0</version.osgi>
</properties>
@@ -83,11 +83,6 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<!-- Build -->
Modified: projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/interceptor/AbstractLifecycleInterceptorService.java
===================================================================
--- projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/interceptor/AbstractLifecycleInterceptorService.java 2010-02-11 10:17:50 UTC (rev 100863)
+++ projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/interceptor/AbstractLifecycleInterceptorService.java 2010-02-11 11:46:29 UTC (rev 100864)
@@ -30,14 +30,13 @@
import java.util.List;
import java.util.Set;
+import org.jboss.logging.Logger;
import org.jboss.osgi.deployment.internal.InterceptorWrapper;
import org.jboss.osgi.spi.util.ConstantsHelper;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
import org.osgi.util.tracker.ServiceTracker;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* A basic service that manages bundle lifecycle interceptors.
@@ -48,7 +47,7 @@
public abstract class AbstractLifecycleInterceptorService implements LifecycleInterceptorService
{
// Provide logging
- private Logger log = LoggerFactory.getLogger(AbstractLifecycleInterceptorService.class);
+ private static final Logger log = Logger.getLogger(AbstractLifecycleInterceptorService.class);
// The system bundle context
private BundleContext context;
Modified: projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/internal/DeploymentRegistryServiceImpl.java
===================================================================
--- projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/internal/DeploymentRegistryServiceImpl.java 2010-02-11 10:17:50 UTC (rev 100863)
+++ projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/internal/DeploymentRegistryServiceImpl.java 2010-02-11 11:46:29 UTC (rev 100864)
@@ -28,13 +28,12 @@
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
+import org.jboss.logging.Logger;
import org.jboss.osgi.deployment.deployer.DeployerService;
import org.jboss.osgi.deployment.deployer.Deployment;
import org.jboss.osgi.deployment.deployer.DeploymentRegistryService;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Version;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* A {@link DeployerService} that installs/uninstalls the bundles directly on the OSGi framework without going through the MC registered deployers.
@@ -45,7 +44,7 @@
public class DeploymentRegistryServiceImpl implements DeploymentRegistryService
{
// Provide logging
- private Logger log = LoggerFactory.getLogger(DeploymentRegistryServiceImpl.class);
+ private static final Logger log = Logger.getLogger(DeploymentRegistryServiceImpl.class);
private List<Deployment> deployments = new CopyOnWriteArrayList<Deployment>();
Modified: projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/internal/SystemDeployerService.java
===================================================================
--- projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/internal/SystemDeployerService.java 2010-02-11 10:17:50 UTC (rev 100863)
+++ projects/jboss-osgi/projects/runtime/deployment/trunk/src/main/java/org/jboss/osgi/deployment/internal/SystemDeployerService.java 2010-02-11 11:46:29 UTC (rev 100864)
@@ -34,6 +34,7 @@
import javax.management.MBeanServer;
import javax.management.StandardMBean;
+import org.jboss.logging.Logger;
import org.jboss.osgi.deployment.deployer.AbstractDeployerService;
import org.jboss.osgi.deployment.deployer.DeployerService;
import org.jboss.osgi.deployment.deployer.Deployment;
@@ -47,8 +48,6 @@
import org.osgi.service.packageadmin.PackageAdmin;
import org.osgi.service.startlevel.StartLevel;
import org.osgi.util.tracker.ServiceTracker;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* A {@link DeployerService} that installs/uninstalls the bundles directly on the OSGi framework.
@@ -59,7 +58,7 @@
public class SystemDeployerService extends AbstractDeployerService
{
// Provide logging
- private Logger log = LoggerFactory.getLogger(SystemDeployerService.class);
+ private static final Logger log = Logger.getLogger(SystemDeployerService.class);
private BundleContext context;
private ServiceTracker startLevelTracker;
Modified: projects/jboss-osgi/projects/runtime/equinox/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/equinox/trunk/pom.xml 2010-02-11 10:17:50 UTC (rev 100863)
+++ projects/jboss-osgi/projects/runtime/equinox/trunk/pom.xml 2010-02-11 11:46:29 UTC (rev 100864)
@@ -20,7 +20,7 @@
<artifactId>jboss-osgi-runtime-equinox</artifactId>
<packaging>jar</packaging>
- <version>3.5.2-SNAPSHOT</version>
+ <version>3.5.1.SP1-SNAPSHOT</version>
<!-- Parent -->
<parent>
@@ -39,9 +39,9 @@
<!-- Properties -->
<properties>
<version.eclipse.equinox>3.5.1</version.eclipse.equinox>
- <version.jboss.osgi.deployment>1.0.0</version.jboss.osgi.deployment>
- <version.jboss.osgi.husky>1.0.2</version.jboss.osgi.husky>
- <version.jboss.osgi.spi>1.0.3</version.jboss.osgi.spi>
+ <version.jboss.osgi.deployment>1.0.2-SNAPSHOT</version.jboss.osgi.deployment>
+ <version.jboss.osgi.husky>1.0.4-SNAPSHOT</version.jboss.osgi.husky>
+ <version.jboss.osgi.spi>1.0.5-SNAPSHOT</version.jboss.osgi.spi>
</properties>
<!-- Dependencies -->
@@ -64,32 +64,14 @@
</dependency>
<dependency>
<groupId>org.eclipse.equinox</groupId>
- <artifactId>org.eclipse.osgi</artifactId>
- <version>${version.eclipse.equinox}</version>
- <classifier>sources</classifier>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.osgi.services</artifactId>
<version>${version.eclipse.equinox}</version>
</dependency>
<dependency>
<groupId>org.eclipse.equinox</groupId>
- <artifactId>org.eclipse.osgi.services</artifactId>
- <version>${version.eclipse.equinox}</version>
- <classifier>sources</classifier>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.osgi.util</artifactId>
<version>${version.eclipse.equinox}</version>
</dependency>
- <dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>org.eclipse.osgi.util</artifactId>
- <version>${version.eclipse.equinox}</version>
- <classifier>sources</classifier>
- </dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
@@ -97,11 +79,6 @@
<version>${version.jboss.osgi.husky}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<!-- Build -->
Modified: projects/jboss-osgi/projects/runtime/equinox/trunk/src/main/java/org/jboss/osgi/equinox/EquinoxBootstrapProvider.java
===================================================================
--- projects/jboss-osgi/projects/runtime/equinox/trunk/src/main/java/org/jboss/osgi/equinox/EquinoxBootstrapProvider.java 2010-02-11 10:17:50 UTC (rev 100863)
+++ projects/jboss-osgi/projects/runtime/equinox/trunk/src/main/java/org/jboss/osgi/equinox/EquinoxBootstrapProvider.java 2010-02-11 11:46:29 UTC (rev 100864)
@@ -25,14 +25,13 @@
import java.util.Map;
+import org.jboss.logging.Logger;
import org.jboss.osgi.deployment.DeploymentServicesActivator;
import org.jboss.osgi.spi.framework.PropertiesBootstrapProvider;
import org.jboss.osgi.spi.util.ServiceLoader;
import org.osgi.framework.BundleContext;
import org.osgi.framework.launch.Framework;
import org.osgi.framework.launch.FrameworkFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* A bootstrap provider for Equinox.
@@ -43,7 +42,7 @@
public class EquinoxBootstrapProvider extends PropertiesBootstrapProvider
{
// Provide logging
- final Logger log = LoggerFactory.getLogger(EquinoxBootstrapProvider.class);
+ private static final Logger log = Logger.getLogger(EquinoxBootstrapProvider.class);
private DeploymentServicesActivator deploymentActivator;
Modified: projects/jboss-osgi/projects/runtime/equinox/trunk/src/main/java/org/jboss/osgi/equinox/EquinoxIntegration.java
===================================================================
--- projects/jboss-osgi/projects/runtime/equinox/trunk/src/main/java/org/jboss/osgi/equinox/EquinoxIntegration.java 2010-02-11 10:17:50 UTC (rev 100863)
+++ projects/jboss-osgi/projects/runtime/equinox/trunk/src/main/java/org/jboss/osgi/equinox/EquinoxIntegration.java 2010-02-11 11:46:29 UTC (rev 100864)
@@ -25,14 +25,13 @@
import java.util.Map;
+import org.jboss.logging.Logger;
import org.jboss.osgi.deployment.DeploymentServicesActivator;
import org.jboss.osgi.spi.framework.FrameworkIntegrationBean;
import org.jboss.osgi.spi.util.ServiceLoader;
import org.osgi.framework.BundleContext;
import org.osgi.framework.launch.Framework;
import org.osgi.framework.launch.FrameworkFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* Equinox specific OSGi Framework integration.
@@ -43,7 +42,7 @@
public class EquinoxIntegration extends FrameworkIntegrationBean
{
// Provide logging
- final Logger log = LoggerFactory.getLogger(EquinoxIntegration.class);
+ private static final Logger log = Logger.getLogger(EquinoxIntegration.class);
private DeploymentServicesActivator deploymentActivator;
Modified: projects/jboss-osgi/projects/runtime/felix/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/felix/trunk/pom.xml 2010-02-11 10:17:50 UTC (rev 100863)
+++ projects/jboss-osgi/projects/runtime/felix/trunk/pom.xml 2010-02-11 11:46:29 UTC (rev 100864)
@@ -20,7 +20,7 @@
<artifactId>jboss-osgi-runtime-felix</artifactId>
<packaging>jar</packaging>
- <version>2.0.3-SNAPSHOT</version>
+ <version>2.0.2.SP1-SNAPSHOT</version>
<!-- Parent -->
<parent>
@@ -38,9 +38,9 @@
<properties>
<version.felix.framework>2.0.2</version.felix.framework>
- <version.jboss.osgi.deployment>1.0.0</version.jboss.osgi.deployment>
- <version.jboss.osgi.husky>1.0.2</version.jboss.osgi.husky>
- <version.jboss.osgi.spi>1.0.3</version.jboss.osgi.spi>
+ <version.jboss.osgi.deployment>1.0.2-SNAPSHOT</version.jboss.osgi.deployment>
+ <version.jboss.osgi.husky>1.0.3-SNAPSHOT</version.jboss.osgi.husky>
+ <version.jboss.osgi.spi>1.0.5-SNAPSHOT</version.jboss.osgi.spi>
<version.osgi>4.2.0</version.osgi>
</properties>
Modified: projects/jboss-osgi/projects/runtime/felix/trunk/src/main/java/org/jboss/osgi/felix/FelixBootstrapProvider.java
===================================================================
--- projects/jboss-osgi/projects/runtime/felix/trunk/src/main/java/org/jboss/osgi/felix/FelixBootstrapProvider.java 2010-02-11 10:17:50 UTC (rev 100863)
+++ projects/jboss-osgi/projects/runtime/felix/trunk/src/main/java/org/jboss/osgi/felix/FelixBootstrapProvider.java 2010-02-11 11:46:29 UTC (rev 100864)
@@ -25,14 +25,13 @@
import java.util.Map;
+import org.jboss.logging.Logger;
import org.jboss.osgi.deployment.DeploymentServicesActivator;
import org.jboss.osgi.spi.framework.PropertiesBootstrapProvider;
import org.jboss.osgi.spi.util.ServiceLoader;
import org.osgi.framework.BundleContext;
import org.osgi.framework.launch.Framework;
import org.osgi.framework.launch.FrameworkFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* A bootstrap provider for Felix.
@@ -43,7 +42,7 @@
public class FelixBootstrapProvider extends PropertiesBootstrapProvider
{
// Provide logging
- final Logger log = LoggerFactory.getLogger(FelixBootstrapProvider.class);
+ private static final Logger log = Logger.getLogger(FelixBootstrapProvider.class);
private DeploymentServicesActivator deploymentActivator;
Modified: projects/jboss-osgi/projects/runtime/felix/trunk/src/main/java/org/jboss/osgi/felix/FelixIntegration.java
===================================================================
--- projects/jboss-osgi/projects/runtime/felix/trunk/src/main/java/org/jboss/osgi/felix/FelixIntegration.java 2010-02-11 10:17:50 UTC (rev 100863)
+++ projects/jboss-osgi/projects/runtime/felix/trunk/src/main/java/org/jboss/osgi/felix/FelixIntegration.java 2010-02-11 11:46:29 UTC (rev 100864)
@@ -25,6 +25,7 @@
import java.util.Map;
+import org.jboss.logging.Logger;
import org.jboss.osgi.deployment.DeploymentServicesActivator;
import org.jboss.osgi.spi.framework.FrameworkIntegrationBean;
import org.jboss.osgi.spi.util.ServiceLoader;
@@ -32,8 +33,6 @@
import org.osgi.framework.BundleException;
import org.osgi.framework.launch.Framework;
import org.osgi.framework.launch.FrameworkFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* Felix specific OSGi Framework integration.
@@ -44,7 +43,7 @@
public class FelixIntegration extends FrameworkIntegrationBean
{
// Provide logging
- final Logger log = LoggerFactory.getLogger(FelixIntegration.class);
+ private static final Logger log = Logger.getLogger(FelixIntegration.class);
private DeploymentServicesActivator deploymentActivator;
Modified: projects/jboss-osgi/projects/runtime/felix/trunk/src/main/java/org/jboss/osgi/felix/FelixLogger.java
===================================================================
--- projects/jboss-osgi/projects/runtime/felix/trunk/src/main/java/org/jboss/osgi/felix/FelixLogger.java 2010-02-11 10:17:50 UTC (rev 100863)
+++ projects/jboss-osgi/projects/runtime/felix/trunk/src/main/java/org/jboss/osgi/felix/FelixLogger.java 2010-02-11 11:46:29 UTC (rev 100864)
@@ -24,9 +24,8 @@
//$Id: FelixIntegration.java 84730 2009-02-25 12:57:23Z thomas.diesler at jboss.com $
import org.apache.felix.moduleloader.ResourceNotFoundException;
+import org.jboss.logging.Logger;
import org.osgi.framework.ServiceReference;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* An integration with the Felix Logger.
@@ -40,7 +39,7 @@
public class FelixLogger extends org.apache.felix.framework.Logger
{
// Provide logging
- final Logger log = LoggerFactory.getLogger(FelixLogger.class);
+ private static final Logger log = Logger.getLogger(FelixLogger.class);
public FelixLogger()
{
Modified: projects/jboss-osgi/projects/spi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/spi/trunk/pom.xml 2010-02-11 10:17:50 UTC (rev 100863)
+++ projects/jboss-osgi/projects/spi/trunk/pom.xml 2010-02-11 11:46:29 UTC (rev 100864)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-parent</artifactId>
- <version>1.0.4</version>
+ <version>1.0.5-SNAPSHOT</version>
</parent>
<!-- Subversion -->
@@ -53,8 +53,8 @@
<version>${version.args4j}</version>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
Modified: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/framework/BundleContextWrapper.java
===================================================================
--- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/framework/BundleContextWrapper.java 2010-02-11 10:17:50 UTC (rev 100863)
+++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/framework/BundleContextWrapper.java 2010-02-11 11:46:29 UTC (rev 100864)
@@ -37,8 +37,6 @@
import org.osgi.framework.ServiceListener;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.ServiceRegistration;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* A generic BundleContext wrapper that delegates all method calls to the underlying
@@ -49,9 +47,6 @@
*/
public class BundleContextWrapper implements BundleContext
{
- // Provide logging
- final Logger log = LoggerFactory.getLogger(BundleContextWrapper.class);
-
protected BundleContext context;
public BundleContextWrapper(BundleContext context)
Modified: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/framework/BundleWrapper.java
===================================================================
--- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/framework/BundleWrapper.java 2010-02-11 10:17:50 UTC (rev 100863)
+++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/framework/BundleWrapper.java 2010-02-11 11:46:29 UTC (rev 100864)
@@ -35,8 +35,6 @@
import org.osgi.framework.BundleException;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.Version;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* A generic Bundle wrapper that delegates all method calls to the underlying
@@ -47,9 +45,6 @@
*/
public class BundleWrapper implements Bundle
{
- // Provide logging
- final Logger log = LoggerFactory.getLogger(BundleWrapper.class);
-
protected Bundle bundle;
public BundleWrapper(Bundle bundle)
Modified: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/framework/FrameworkIntegrationBean.java
===================================================================
--- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/framework/FrameworkIntegrationBean.java 2010-02-11 10:17:50 UTC (rev 100863)
+++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/framework/FrameworkIntegrationBean.java 2010-02-11 11:46:29 UTC (rev 100864)
@@ -29,13 +29,12 @@
import java.util.List;
import java.util.Map;
+import org.jboss.logging.Logger;
import org.jboss.osgi.spi.util.ExportedPackageHelper;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleException;
import org.osgi.framework.launch.Framework;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* An abstraction of an OSGi Framework.
@@ -49,7 +48,7 @@
public abstract class FrameworkIntegrationBean
{
// Provide logging
- final Logger log = LoggerFactory.getLogger(FrameworkIntegrationBean.class);
+ private static final Logger log = Logger.getLogger(FrameworkIntegrationBean.class);
private Map<String, Object> properties = new HashMap<String, Object>();
private List<URL> autoInstall = new ArrayList<URL>();
Modified: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/framework/FrameworkWrapper.java
===================================================================
--- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/framework/FrameworkWrapper.java 2010-02-11 10:17:50 UTC (rev 100863)
+++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/framework/FrameworkWrapper.java 2010-02-11 11:46:29 UTC (rev 100864)
@@ -36,8 +36,6 @@
import org.osgi.framework.ServiceReference;
import org.osgi.framework.Version;
import org.osgi.framework.launch.Framework;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* A generic Framework wrapper that delegates all method calls to the underlying
@@ -48,9 +46,6 @@
*/
public class FrameworkWrapper implements Framework
{
- // Provide logging
- final Logger log = LoggerFactory.getLogger(FrameworkWrapper.class);
-
protected Framework framework;
public FrameworkWrapper(Framework framework)
Modified: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/framework/PropertiesBootstrapProvider.java
===================================================================
--- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/framework/PropertiesBootstrapProvider.java 2010-02-11 10:17:50 UTC (rev 100863)
+++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/framework/PropertiesBootstrapProvider.java 2010-02-11 11:46:29 UTC (rev 100864)
@@ -37,6 +37,7 @@
import java.util.Properties;
import java.util.Set;
+import org.jboss.logging.Logger;
import org.jboss.osgi.spi.internal.StringPropertyReplacer;
import org.jboss.osgi.spi.util.ExportedPackageHelper;
import org.jboss.osgi.spi.util.ServiceLoader;
@@ -45,8 +46,6 @@
import org.osgi.framework.BundleException;
import org.osgi.framework.launch.Framework;
import org.osgi.framework.launch.FrameworkFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* A simple properties based bootstrap provider
@@ -84,7 +83,7 @@
public class PropertiesBootstrapProvider implements OSGiBootstrapProvider
{
// Provide logging
- final Logger log = LoggerFactory.getLogger(PropertiesBootstrapProvider.class);
+ private static final Logger log = Logger.getLogger(PropertiesBootstrapProvider.class);
/** The default framework property: jboss.osgi.framework.properties */
public static final String OSGI_FRAMEWORK_CONFIG = "jboss.osgi.framework.properties";
Modified: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/internal/OSGiBootstrapBean.java
===================================================================
--- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/internal/OSGiBootstrapBean.java 2010-02-11 10:17:50 UTC (rev 100863)
+++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/internal/OSGiBootstrapBean.java 2010-02-11 11:46:29 UTC (rev 100864)
@@ -37,6 +37,7 @@
import java.util.List;
import java.util.Properties;
+import org.jboss.logging.Logger;
import org.jboss.osgi.spi.framework.OSGiBootstrap;
import org.jboss.osgi.spi.framework.OSGiBootstrapProvider;
import org.jboss.osgi.spi.framework.PropertiesBootstrapProvider;
@@ -44,8 +45,6 @@
import org.kohsuke.args4j.Option;
import org.osgi.framework.BundleException;
import org.osgi.framework.launch.Framework;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* An internal bean that collabrates with {@link OSGiBootstrap}.
@@ -103,7 +102,7 @@
// This property must be set before the logger is obtained
System.setProperty(OSGI_SERVER_HOME, osgiServerHome);
- log = LoggerFactory.getLogger(OSGiBootstrapBean.class);
+ log = Logger.getLogger(OSGiBootstrapBean.class);
Properties defaults = new Properties();
defaults.setProperty(OSGI_SERVER_NAME, serverName);
@@ -131,7 +130,7 @@
public static OSGiBootstrapProvider getBootstrapProvider()
{
if (log == null)
- log = LoggerFactory.getLogger(OSGiBootstrap.class);
+ log = Logger.getLogger(OSGiBootstrap.class);
OSGiBootstrapProvider provider = null;
Modified: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/management/ManagedBundle.java
===================================================================
--- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/management/ManagedBundle.java 2010-02-11 10:17:50 UTC (rev 100863)
+++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/management/ManagedBundle.java 2010-02-11 11:46:29 UTC (rev 100864)
@@ -33,6 +33,7 @@
import javax.management.ObjectName;
+import org.jboss.logging.Logger;
import org.jboss.osgi.spi.util.ConstantsHelper;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
@@ -40,8 +41,6 @@
import org.osgi.framework.ServiceReference;
import org.osgi.framework.Version;
import org.osgi.service.packageadmin.PackageAdmin;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* The managed view of an OSGi Bundle
@@ -52,7 +51,7 @@
public class ManagedBundle implements ManagedBundleMBean
{
// Provide logging
- final Logger log = LoggerFactory.getLogger(ManagedBundle.class);
+ private static final Logger log = Logger.getLogger(ManagedBundle.class);
public static final String PROPERTY_ID = "id";
public static final String PROPERTY_SYMBOLIC_NAME = "name";
Modified: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/util/ExportedPackageHelper.java
===================================================================
--- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/util/ExportedPackageHelper.java 2010-02-11 10:17:50 UTC (rev 100863)
+++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/util/ExportedPackageHelper.java 2010-02-11 11:46:29 UTC (rev 100864)
@@ -27,13 +27,12 @@
import java.util.Collections;
import java.util.List;
+import org.jboss.logging.Logger;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
import org.osgi.service.packageadmin.ExportedPackage;
import org.osgi.service.packageadmin.PackageAdmin;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* A helper the logs the exported packages for a bundle.
@@ -44,7 +43,7 @@
public final class ExportedPackageHelper
{
// Provide logging
- final Logger log = LoggerFactory.getLogger(ExportedPackageHelper.class);
+ private static final Logger log = Logger.getLogger(ExportedPackageHelper.class);
private PackageAdmin packageAdmin;
Modified: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/util/ServiceLoader.java
===================================================================
--- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/util/ServiceLoader.java 2010-02-11 10:17:50 UTC (rev 100863)
+++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/util/ServiceLoader.java 2010-02-11 11:46:29 UTC (rev 100864)
@@ -28,8 +28,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.jboss.logging.Logger;
/**
* Loads service implementations from the requesters classpath.
@@ -40,7 +39,7 @@
public abstract class ServiceLoader
{
// Provide logging
- static final Logger log = LoggerFactory.getLogger(ServiceLoader.class);
+ private static final Logger log = Logger.getLogger(ServiceLoader.class);
/**
* Loads a list of service implementations defined in META-INF/services/${serviceClass}
Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml 2010-02-11 10:17:50 UTC (rev 100863)
+++ projects/jboss-osgi/trunk/pom.xml 2010-02-11 11:46:29 UTC (rev 100864)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-parent</artifactId>
- <version>1.0.4</version>
+ <version>1.0.5-SNAPSHOT</version>
</parent>
<!-- Subversion -->
@@ -53,28 +53,28 @@
<version.apache.felix.metatype>1.0.2</version.apache.felix.metatype>
<version.izpack>4.3.1</version.izpack>
<version.javax.servlet>2.5</version.javax.servlet>
- <version.jboss.osgi.apache.xerces>2.9.1.SP3</version.jboss.osgi.apache.xerces>
+ <version.jboss.osgi.apache.xerces>2.9.1.SP4-SNAPSHOT</version.jboss.osgi.apache.xerces>
<version.jboss.osgi.blueprint>1.0.0.Beta1</version.jboss.osgi.blueprint>
<version.jboss.osgi.common>1.0.3</version.jboss.osgi.common>
<version.jboss.osgi.common.core>2.2.13.GA</version.jboss.osgi.common.core>
- <version.jboss.osgi.deployment>1.0.1</version.jboss.osgi.deployment>
+ <version.jboss.osgi.deployment>1.0.2-SNAPSHOT</version.jboss.osgi.deployment>
<version.jboss.osgi.framework>1.0.0.Alpha4-SNAPSHOT</version.jboss.osgi.framework>
- <version.jboss.osgi.hotdeploy>1.0.4</version.jboss.osgi.hotdeploy>
+ <version.jboss.osgi.hotdeploy>1.0.5-SNAPSHOT</version.jboss.osgi.hotdeploy>
<version.jboss.osgi.husky>1.0.4-SNAPSHOT</version.jboss.osgi.husky>
<version.jboss.osgi.jaxb>2.1.10.SP3</version.jboss.osgi.jaxb>
<version.jboss.osgi.jmx>1.0.4-SNAPSHOT</version.jboss.osgi.jmx>
- <version.jboss.osgi.jndi>1.0.2</version.jboss.osgi.jndi>
- <version.jboss.osgi.jta>1.0.0</version.jboss.osgi.jta>
+ <version.jboss.osgi.jndi>1.0.3-SNAPSHOT</version.jboss.osgi.jndi>
+ <version.jboss.osgi.jta>1.0.1-SNAPSHOT</version.jboss.osgi.jta>
<version.jboss.osgi.reflect>2.2.0</version.jboss.osgi.reflect>
<version.jboss.osgi.runtime.deployers>1.0.4</version.jboss.osgi.runtime.deployers>
- <version.jboss.osgi.runtime.equinox>3.5.1</version.jboss.osgi.runtime.equinox>
- <version.jboss.osgi.runtime.felix>2.0.2</version.jboss.osgi.runtime.felix>
+ <version.jboss.osgi.runtime.equinox>3.5.1.SP1-SNAPSHOT</version.jboss.osgi.runtime.equinox>
+ <version.jboss.osgi.runtime.felix>2.0.2.SP1-SNAPSHOT</version.jboss.osgi.runtime.felix>
<version.jboss.osgi.runtime.jbossas>1.0.2</version.jboss.osgi.runtime.jbossas>
<version.jboss.osgi.serviceloader>1.0.0</version.jboss.osgi.serviceloader>
<version.jboss.osgi.spi>1.0.5-SNAPSHOT</version.jboss.osgi.spi>
- <version.jboss.osgi.webapp>0.7.2.SP1</version.jboss.osgi.webapp>
+ <version.jboss.osgi.webapp>0.7.2.SP2-SNAPSHOT</version.jboss.osgi.webapp>
<version.jboss.osgi.webconsole>1.0.2</version.jboss.osgi.webconsole>
- <version.jboss.osgi.xml.binding>2.0.2.Beta4</version.jboss.osgi.xml.binding>
+ <version.jboss.osgi.xml.binding>2.0.2.Beta4-SP1-SNAPSHOT</version.jboss.osgi.xml.binding>
<version.ops4j.pax.web>0.7.2</version.ops4j.pax.web>
<version.osgi>4.2.0</version.osgi>
@@ -298,11 +298,6 @@
<artifactId>jboss-logging-log4j</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<!-- Repositories -->
Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/interceptor/processor/ParserInterceptor.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/interceptor/processor/ParserInterceptor.java 2010-02-11 10:17:50 UTC (rev 100863)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/interceptor/processor/ParserInterceptor.java 2010-02-11 11:46:29 UTC (rev 100864)
@@ -26,13 +26,12 @@
import java.io.IOException;
import java.util.Properties;
+import org.jboss.logging.Logger;
import org.jboss.osgi.deployment.interceptor.AbstractLifecycleInterceptor;
import org.jboss.osgi.deployment.interceptor.InvocationContext;
import org.jboss.osgi.deployment.interceptor.LifecycleInterceptorException;
import org.jboss.virtual.VirtualFile;
import org.osgi.framework.Bundle;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* An interceptor that creates and attaches HttpMetadata.
@@ -43,7 +42,7 @@
public class ParserInterceptor extends AbstractLifecycleInterceptor
{
// Provide logging
- private Logger log = LoggerFactory.getLogger(ParserInterceptor.class);
+ private static final Logger log = Logger.getLogger(ParserInterceptor.class);
ParserInterceptor()
{
Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/interceptor/processor/PublisherInterceptor.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/interceptor/processor/PublisherInterceptor.java 2010-02-11 10:17:50 UTC (rev 100863)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/interceptor/processor/PublisherInterceptor.java 2010-02-11 11:46:29 UTC (rev 100864)
@@ -25,6 +25,7 @@
import javax.servlet.http.HttpServlet;
+import org.jboss.logging.Logger;
import org.jboss.osgi.deployment.interceptor.AbstractLifecycleInterceptor;
import org.jboss.osgi.deployment.interceptor.InvocationContext;
import org.jboss.osgi.deployment.interceptor.LifecycleInterceptorException;
@@ -32,8 +33,6 @@
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
import org.osgi.service.http.HttpService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* An interceptor that publishes HttpMetadata.
@@ -44,7 +43,7 @@
public class PublisherInterceptor extends AbstractLifecycleInterceptor
{
// Provide logging
- private Logger log = LoggerFactory.getLogger(PublisherInterceptor.class);
+ private static final Logger log = Logger.getLogger(PublisherInterceptor.class);
PublisherInterceptor()
{
Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-equinox.properties
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-equinox.properties 2010-02-11 10:17:50 UTC (rev 100863)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-equinox.properties 2010-02-11 11:46:29 UTC (rev 100864)
@@ -17,7 +17,7 @@
# Extra System Packages
org.osgi.framework.system.packages.extra=\
org.apache.log4j;version=1.2, \
- org.jboss.logging, \
+ org.jboss.logging;version=2.1, \
org.jboss.net.protocol, \
org.jboss.osgi.deployment.common;version=1.0, \
org.jboss.osgi.deployment.deployer;version=1.0, \
Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-felix.properties
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-felix.properties 2010-02-11 10:17:50 UTC (rev 100863)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-felix.properties 2010-02-11 11:46:29 UTC (rev 100864)
@@ -20,7 +20,7 @@
# Extra System Packages
org.osgi.framework.system.packages.extra=\
org.apache.log4j;version=1.2, \
- org.jboss.logging, \
+ org.jboss.logging;version=2.1, \
org.jboss.net.protocol, \
org.jboss.osgi.deployment.common;version=1.0, \
org.jboss.osgi.deployment.deployer;version=1.0, \
@@ -37,7 +37,6 @@
org.jboss.virtual.plugins.vfs.helpers;version=2.1, \
org.jboss.virtual.protocol;version=2.1, \
org.osgi.framework;version=1.5
-
# Bundles that need to be installed with the Framework automatically
org.jboss.osgi.spi.framework.autoInstall=\
Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi99/OSGi99TestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi99/OSGi99TestCase.java 2010-02-11 10:17:50 UTC (rev 100863)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi99/OSGi99TestCase.java 2010-02-11 11:46:29 UTC (rev 100864)
@@ -31,6 +31,7 @@
import java.io.FileOutputStream;
import java.io.IOException;
+import org.jboss.logging.Logger;
import org.jboss.osgi.spi.util.ConstantsHelper;
import org.jboss.osgi.testing.OSGiBundle;
import org.jboss.osgi.testing.OSGiRuntime;
@@ -41,8 +42,6 @@
import org.junit.Test;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* [JBOSGI-99] No explicit control over bundle.start()
@@ -55,7 +54,7 @@
public class OSGi99TestCase extends OSGiTest
{
// Provide logging
- private static Logger log = LoggerFactory.getLogger(OSGi99TestCase.class);
+ private static final Logger log = Logger.getLogger(OSGi99TestCase.class);
private static OSGiRuntime runtime;
Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-equinox.properties
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-equinox.properties 2010-02-11 10:17:50 UTC (rev 100863)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-equinox.properties 2010-02-11 11:46:29 UTC (rev 100864)
@@ -14,7 +14,7 @@
# Extra System Packages
org.osgi.framework.system.packages.extra=\
org.apache.log4j;version=1.2, \
- org.jboss.logging, \
+ org.jboss.logging;version=2.1, \
org.jboss.net.protocol, \
org.jboss.osgi.deployment.common;version=1.0, \
org.jboss.osgi.deployment.deployer;version=1.0, \
Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-felix.properties
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-felix.properties 2010-02-11 10:17:50 UTC (rev 100863)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-felix.properties 2010-02-11 11:46:29 UTC (rev 100864)
@@ -17,7 +17,7 @@
# Extra System Packages
org.osgi.framework.system.packages.extra=\
org.apache.log4j;version=1.2, \
- org.jboss.logging, \
+ org.jboss.logging;version=2.1, \
org.jboss.net.protocol, \
org.jboss.osgi.deployment.common;version=1.0, \
org.jboss.osgi.deployment.deployer;version=1.0, \
Modified: projects/jboss-osgi/trunk/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/pom.xml 2010-02-11 10:17:50 UTC (rev 100863)
+++ projects/jboss-osgi/trunk/testsuite/pom.xml 2010-02-11 11:46:29 UTC (rev 100864)
@@ -213,11 +213,6 @@
</exclusions>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<!-- Build -->
@@ -474,12 +469,6 @@
<artifactId>jboss-as-client</artifactId>
<version>6.0.0.M1</version>
<scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.slf4j</groupId>
- <artifactId>slf4j-jboss-logging</artifactId>
- </exclusion>
- </exclusions>
<type>pom</type>
</dependency>
</dependencies>
@@ -506,12 +495,6 @@
<artifactId>jboss-as-client</artifactId>
<version>6.0.0.M1</version>
<scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.slf4j</groupId>
- <artifactId>slf4j-jboss-logging</artifactId>
- </exclusion>
- </exclusions>
<type>pom</type>
</dependency>
</dependencies>
More information about the jboss-osgi-commits
mailing list