[jboss-cvs] JBossAS SVN: r97001 - in projects/jboss-osgi/projects/bundles: jboss-xml-binding/trunk/src/main/java/org/jboss/osgi/jbossxb/internal and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Nov 25 19:57:16 EST 2009
Author: thomas.diesler at jboss.com
Date: 2009-11-25 19:57:15 -0500 (Wed, 25 Nov 2009)
New Revision: 97001
Modified:
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/XMLBindingActivator.java
projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml
projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/EmbeddedKernelBootstrap.java
Log:
[JBOSGI-212] Cannot refresh Microcontainer service
Does not resolve in equinox
Modified: projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/pom.xml 2009-11-26 00:55:40 UTC (rev 97000)
+++ projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/pom.xml 2009-11-26 00:57:15 UTC (rev 97001)
@@ -21,7 +21,7 @@
<artifactId>jboss-osgi-xml-binding</artifactId>
<packaging>bundle</packaging>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0.1-SNAPSHOT</version>
<!-- Parent -->
<parent>
@@ -35,7 +35,7 @@
<version.jboss.xb>2.0.1.GA</version.jboss.xb>
<version.javassist>3.9.0.GA</version.javassist>
<version.jboss.osgi.jaxb>2.1.10.SP2</version.jboss.osgi.jaxb>
- <version.jboss.reflect>2.0.0.GA</version.jboss.reflect>
+ <version.jboss.reflect>2.0.2.GA</version.jboss.reflect>
<version.osgi>4.2.0</version.osgi>
</properties>
@@ -47,6 +47,10 @@
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jboss</groupId>
<artifactId>jbossxb</artifactId>
<version>${version.jboss.xb}</version>
@@ -84,7 +88,7 @@
<Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
<Embed-Transitive>true</Embed-Transitive>
<Export-Package>
- org.jboss.osgi.jbossxb;version=${version}
+ org.jboss.osgi.jbossxb;version=2.0.1
</Export-Package>
<Import-Package>
<!-- system -->
@@ -92,6 +96,7 @@
javax.xml.bind.*,
javax.xml.namespace,
javax.xml.parsers,
+ org.slf4j,
org.w3c.dom*,
org.xml.sax*,
@@ -100,7 +105,7 @@
org.apache.xerces.*,
org.jboss.logging,
org.jboss.osgi.common.log;version=1.0,
- org.jboss.osgi.jaxb;version=1.0,
+ org.jboss.osgi.jaxb;version=2.0,
org.jboss.osgi.spi.capability;version=1.0,
org.jboss.osgi.spi.service;version=1.0,
org.jboss.util*,
@@ -117,13 +122,13 @@
jboss-reflect;inline=false,
</Embed-Dependency>
<_exportcontents>
- org.jboss.beans.info.*;version=${version.jboss.reflect},
- org.jboss.config.*;version=${version.jboss.reflect},
- org.jboss.classadapter.*;version=${version.jboss.reflect},
- org.jboss.joinpoint.*;version=${version.jboss.reflect},
- org.jboss.reflect*;version=${version.jboss.reflect},
- org.jboss.xb.*;version=${version.jboss.xb},
- javassist*;version=${version.javassist},
+ org.jboss.beans.info.*;version=2.0.2,
+ org.jboss.config.*;version=2.0.2,
+ org.jboss.classadapter.*;version=2.0.2,
+ org.jboss.joinpoint.*;version=2.0.2,
+ org.jboss.reflect*;version=2.0.2,
+ org.jboss.xb.*;version=2.0.1,
+ javassist*;version=3.9.0,
</_exportcontents>
</instructions>
</configuration>
Modified: projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/src/main/java/org/jboss/osgi/jbossxb/internal/XMLBindingActivator.java
===================================================================
--- projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/src/main/java/org/jboss/osgi/jbossxb/internal/XMLBindingActivator.java 2009-11-26 00:55:40 UTC (rev 97000)
+++ projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/src/main/java/org/jboss/osgi/jbossxb/internal/XMLBindingActivator.java 2009-11-26 00:57:15 UTC (rev 97001)
@@ -25,7 +25,6 @@
import javax.xml.parsers.SAXParserFactory;
-import org.jboss.osgi.common.log.LogServiceTracker;
import org.jboss.osgi.jbossxb.XMLBindingService;
import org.jboss.osgi.xml.XMLParserCapability;
import org.jboss.xb.binding.JBossXBException;
@@ -33,8 +32,9 @@
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
-import org.osgi.service.log.LogService;
import org.osgi.util.tracker.ServiceTracker;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A {@link BundleActivator} that initializes the JBossXB bundle
@@ -44,12 +44,11 @@
*/
public class XMLBindingActivator implements BundleActivator
{
- private LogService log;
+ // Provide logging
+ private static Logger log = LoggerFactory.getLogger(XMLBindingActivator.class);
public void start(BundleContext context) throws Exception
{
- log = new LogServiceTracker(context);
-
ServiceTracker saxTracker = new ServiceTracker(context, SAXParserFactory.class.getName(), null)
{
@Override
@@ -62,7 +61,7 @@
SAXParserFactory saxFactory = (SAXParserFactory)super.addingService(reference);
if (hasXMLBindingService == false && hasJBossSAXParser == true)
{
- log.log(LogService.LOG_DEBUG, "JBossXB SAXParserFactory: " + saxFactory);
+ log.debug("JBossXB SAXParserFactory: " + saxFactory);
ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader();
try
@@ -82,7 +81,6 @@
// Register the XMLBindingService
XMLBindingService service = new XMLBindingService(){};
context.registerService(XMLBindingService.class.getName(), service, null);
- log.log(LogService.LOG_INFO, "XMLBindingService registered");
}
finally
{
Modified: projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml 2009-11-26 00:55:40 UTC (rev 97000)
+++ projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml 2009-11-26 00:57:15 UTC (rev 97001)
@@ -115,7 +115,7 @@
<Bundle-Activator>org.jboss.osgi.microcontainer.internal.MicrocontainerServiceActivator</Bundle-Activator>
<Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
<Export-Package>
- org.jboss.osgi.microcontainer;version=${version}
+ org.jboss.osgi.microcontainer;version=2.0.9
</Export-Package>
<Private-Package>
org.jboss.osgi.microcontainer.internal
@@ -135,7 +135,7 @@
<!-- import -->
javassist*,
- org.jboss.beans.*,
+ org.jboss.beans.info.*,
org.jboss.classadapter.spi,
org.jboss.config.*,
org.jboss.deployers.*,
@@ -182,10 +182,9 @@
jboss-kernel;inline=false,
</Embed-Dependency>
<_exportcontents>
- org.jboss.beans*;version=${version.jboss.microcontainer},
- org.jboss.kernel.spi*;version=${version.jboss.microcontainer},
- org.jboss.dependency*;version=${version.jboss.microcontainer},
- org.jboss.deployers*;version=${version.jboss.deployers},
+ org.jboss.kernel.spi*;version=2.0.9,
+ org.jboss.dependency*;version=2.0.9,
+ org.jboss.deployers*;version=2.0.5,
</_exportcontents>
</instructions>
</configuration>
Modified: projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/EmbeddedKernelBootstrap.java
===================================================================
--- projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/EmbeddedKernelBootstrap.java 2009-11-26 00:55:40 UTC (rev 97000)
+++ projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/EmbeddedKernelBootstrap.java 2009-11-26 00:57:15 UTC (rev 97001)
@@ -26,9 +26,9 @@
import java.net.URL;
import org.jboss.kernel.plugins.bootstrap.basic.BasicBootstrap;
-import org.jboss.osgi.common.log.LogServiceTracker;
import org.osgi.framework.BundleContext;
-import org.osgi.service.log.LogService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Boostrap the Microcontainer
@@ -38,12 +38,13 @@
*/
public class EmbeddedKernelBootstrap extends BasicBootstrap
{
- private LogService log;
+ // Provide logging
+ private static Logger log = LoggerFactory.getLogger(EmbeddedKernelBootstrap.class);
+
private EmbeddedXMLDeployer deployer;
public EmbeddedKernelBootstrap(BundleContext context)
{
- this.log = new LogServiceTracker(context);
// Get or bootstrap the kernel
if (kernel == null)
@@ -51,7 +52,7 @@
try
{
super.bootstrap();
- log.log(LogService.LOG_DEBUG, "bootstrap kernel: " + kernel);
+ log.debug("bootstrap kernel: " + kernel);
}
catch (Throwable e)
{
@@ -66,7 +67,7 @@
*/
public void deploy(URL url)
{
- log.log(LogService.LOG_DEBUG, "deploy: " + url);
+ log.debug("deploy: " + url);
ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader();
try
{
@@ -89,7 +90,7 @@
*/
public void undeploy(URL url)
{
- log.log(LogService.LOG_DEBUG, "undeploy: " + url);
+ log.debug("undeploy: " + url);
try
{
deployer.undeploy(url);
More information about the jboss-cvs-commits
mailing list