3:13 p.m.
Author: thomas.diesler(a)jboss.com
Date: 2009-11-26 09:13:37 -0500 (Thu, 26 Nov 2009)
New Revision: 97023
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/apache-xerces/trunk/src/main/java/org/jboss/osgi/xml/XMLParserCapability.java
Log:
Remove dependency on osgi.common
Modified: projects/jboss-osgi/projects/bundles/apache-xerces/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/apache-xerces/trunk/pom.xml 2009-11-26 13:13:31
UTC (rev 97022)
+++ projects/jboss-osgi/projects/bundles/apache-xerces/trunk/pom.xml 2009-11-26 14:13:37
UTC (rev 97023)
@@ -21,18 +21,18 @@
<artifactId>jboss-osgi-apache-xerces</artifactId>
<packaging>bundle</packaging>
- <version>2.9.2-SNAPSHOT</version>
+ <version>2.9.1-SNAPSHOT</version>
<!-- Parent -->
<parent>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-parent</artifactId>
- <version>1.0.4-SNAPSHOT</version>
+ <version>1.0.4</version>
</parent>
<properties>
<version.apache.xerces>2.9.1</version.apache.xerces>
- <version.jboss.osgi.common>1.0.3-SNAPSHOT</version.jboss.osgi.common>
+ <version.jboss.osgi.spi>1.0.3-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>
@@ -40,11 +40,10 @@
<dependencies>
<dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-common</artifactId>
- <version>${version.jboss.osgi.common}</version>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-spi</artifactId>
+ <version>${version.jboss.osgi.spi}</version>
</dependency>
-
<dependency>
<groupId>apache-xerces</groupId>
<artifactId>xml-apis</artifactId>
@@ -95,7 +94,7 @@
org.jboss.osgi.xml.internal
</Privat-Package>
<Export-Package>
- org.jboss.osgi.xml;version=${version}
+ org.jboss.osgi.xml;version=2.9.1
</Export-Package>
<Import-Package>
javax.xml.datatype,
@@ -103,11 +102,11 @@
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.osgi.framework,
org.osgi.service.log,
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 2009-11-26
13:13:31 UTC (rev 97022)
+++
projects/jboss-osgi/projects/bundles/apache-xerces/trunk/src/main/java/org/jboss/osgi/xml/XMLParserActivatorExt.java 2009-11-26
14:13:37 UTC (rev 97023)
@@ -29,13 +29,13 @@
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.SAXParserFactory;
-import org.jboss.osgi.common.log.LogServiceTracker;
-import org.jboss.osgi.xml.internal.XMLParserActivator;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceReference;
-import org.osgi.service.log.LogService;
+import org.osgi.util.xml.XMLParserActivator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Activate the XML parser using {@link XMLParserActivatorExt}
@@ -45,12 +45,11 @@
*/
public class XMLParserActivatorExt extends XMLParserActivator
{
- private LogService log;
+ // Provide logging
+ private static Logger log = LoggerFactory.getLogger(XMLParserActivatorExt.class);
public void start(BundleContext context) throws Exception
{
- log = new LogServiceTracker(context);
-
super.start(context);
logSAXParserFactory(context);
@@ -58,7 +57,7 @@
}
@Override
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({ "unchecked", "rawtypes" })
public void setDOMProperties(DocumentBuilderFactory factory, Hashtable props)
{
super.setDOMProperties(factory, props);
@@ -89,7 +88,7 @@
}
@Override
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({ "unchecked", "rawtypes" })
public void setSAXProperties(SAXParserFactory factory, Hashtable props)
{
super.setSAXProperties(factory, props);
@@ -127,20 +126,20 @@
for (ServiceReference sref : saxRefs)
{
Object factory = context.getService(sref);
- log.log(LogService.LOG_DEBUG, "SAXParserFactory: " +
factory.getClass().getName());
+ log.debug("SAXParserFactory: " + factory.getClass().getName());
for (String key : sref.getPropertyKeys())
{
Object value = sref.getProperty(key);
if (key.equals(Constants.OBJECTCLASS))
value = Arrays.asList((String[])value);
- log.log(LogService.LOG_DEBUG, " " + key + "=" +
value);
+ log.debug(" " + key + "=" + value);
}
}
}
else
{
- log.log(LogService.LOG_WARNING, "No SAXParserFactory registered");
+ log.warn("No SAXParserFactory registered");
}
}
@@ -152,20 +151,20 @@
for (ServiceReference sref : domRefs)
{
Object factory = context.getService(sref);
- log.log(LogService.LOG_DEBUG, "DocumentBuilderFactory: " +
factory.getClass().getName());
+ log.debug("DocumentBuilderFactory: " +
factory.getClass().getName());
for (String key : sref.getPropertyKeys())
{
Object value = sref.getProperty(key);
if (key.equals(Constants.OBJECTCLASS))
value = Arrays.asList((String[])value);
- log.log(LogService.LOG_DEBUG, " " + key + "=" +
value);
+ log.debug(" " + key + "=" + value);
}
}
}
else
{
- log.log(LogService.LOG_WARNING, "No DocumentBuilderFactory
registered");
+ log.warn("No DocumentBuilderFactory registered");
}
}
}
\ No newline at end of file
Modified:
projects/jboss-osgi/projects/bundles/apache-xerces/trunk/src/main/java/org/jboss/osgi/xml/XMLParserCapability.java
===================================================================
---
projects/jboss-osgi/projects/bundles/apache-xerces/trunk/src/main/java/org/jboss/osgi/xml/XMLParserCapability.java 2009-11-26
13:13:31 UTC (rev 97022)
+++
projects/jboss-osgi/projects/bundles/apache-xerces/trunk/src/main/java/org/jboss/osgi/xml/XMLParserCapability.java 2009-11-26
14:13:37 UTC (rev 97023)
@@ -26,10 +26,9 @@
import javax.xml.parsers.SAXParserFactory;
import org.jboss.osgi.spi.capability.Capability;
-import org.jboss.osgi.spi.capability.LogServiceCapability;
/**
- * Adds the XML parser capability to the {@link OSGiRuntime} under test.
+ * Adds the XML parser capability.
*
* It is ignored if the {@link SAXParserFactory} is already registered.
*
@@ -60,8 +59,6 @@
super(SAXParserFactory.class.getName());
setFilter("(" + PARSER_PROVIDER + "=" + PROVIDER_JBOSS_OSGI +
")");
- addDependency(new LogServiceCapability());
-
addBundle("bundles/jboss-osgi-apache-xerces.jar");
}
}
\ No newline at end of file