JBoss-OSGI SVN: r100931 - in projects/jboss-osgi/trunk/distribution/installer/src/main/resources: runtime/conf and 1 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-02-13 08:11:01 -0500 (Sat, 13 Feb 2010)
New Revision: 100931
Modified:
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-equinox.properties
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-felix.properties
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml
Log:
Remove version from org.jboss.osgi.testing
Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml 2010-02-13 12:09:55 UTC (rev 100930)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml 2010-02-13 13:11:01 UTC (rev 100931)
@@ -54,6 +54,8 @@
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.osgi.testing,
+
org.osgi.framework;version=1.5
</value>
</entry>
Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml 2010-02-13 12:09:55 UTC (rev 100930)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml 2010-02-13 13:11:01 UTC (rev 100931)
@@ -54,6 +54,8 @@
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.osgi.testing,
+
org.osgi.framework;version=1.5
</value>
</entry>
Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml 2010-02-13 12:09:55 UTC (rev 100930)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml 2010-02-13 13:11:01 UTC (rev 100931)
@@ -44,7 +44,7 @@
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.osgi.testing;version=1.0
+ org.jboss.osgi.testing
</value></entry>
<!-- Husky socket connector properties -->
<entry><key>org.jboss.osgi.husky.runtime.connector.host</key><value>${jboss.bind.address}</value></entry>
Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-equinox.properties
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-equinox.properties 2010-02-13 12:09:55 UTC (rev 100930)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-equinox.properties 2010-02-13 13:11:01 UTC (rev 100931)
@@ -28,6 +28,7 @@
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.osgi.testing, \
org.jboss.virtual;version=2.1, \
org.jboss.virtual.plugins.registry;version=2.1, \
org.jboss.virtual.plugins.context.jar;version=2.1, \
Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-felix.properties
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-felix.properties 2010-02-13 12:09:55 UTC (rev 100930)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-felix.properties 2010-02-13 13:11:01 UTC (rev 100931)
@@ -28,6 +28,7 @@
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.osgi.testing, \
org.jboss.virtual;version=2.1, \
org.jboss.virtual.plugins.registry;version=2.1, \
org.jboss.virtual.plugins.context.jar;version=2.1, \
Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml 2010-02-13 12:09:55 UTC (rev 100930)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml 2010-02-13 13:11:01 UTC (rev 100931)
@@ -41,7 +41,7 @@
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.osgi.testing;version=1.0
+ org.jboss.osgi.testing
</value></entry>
<!-- Hot Deployment -->
<entry><key>org.jboss.osgi.hotdeploy.scandir</key><value>${osgi.server.home}/deploy</value></entry>
14 years, 4 months
- 1
- 0
JBoss-OSGI SVN: r100930 - in projects/jboss-osgi: projects/runtime/framework/trunk/src/test/resources/bootstrap and 7 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-02-13 07:09:55 -0500 (Sat, 13 Feb 2010)
New Revision: 100930
Modified:
projects/jboss-osgi/projects/runtime/framework/trunk/src/etc/osgitck/jboss-osgi-bootstrap.xml
projects/jboss-osgi/projects/runtime/framework/trunk/src/test/resources/bootstrap/jboss-osgi-bootstrap.xml
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-equinox.properties
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-felix.properties
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-extra-all.properties
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-extra-default.properties
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-extra-minimal.properties
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-extra-web.properties
projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml
projects/jboss-osgi/trunk/testsuite/example/src/test/resources/log4j.xml
projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml
projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/log4j.xml
Log:
Allign org.osgi.framework.system.packages.extra
Use log4j.append.file=true
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/etc/osgitck/jboss-osgi-bootstrap.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/src/etc/osgitck/jboss-osgi-bootstrap.xml 2010-02-13 11:27:48 UTC (rev 100929)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/src/etc/osgitck/jboss-osgi-bootstrap.xml 2010-02-13 12:09:55 UTC (rev 100930)
@@ -19,25 +19,26 @@
<entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry>
<entry><key>org.osgi.framework.system.packages.extra</key><value>
- junit.framework;version=3.8.1,
+ <!-- logging -->
+ org.apache.log4j;version=1.2,
+ org.jboss.logging;version=2.1,
- org.jboss.logging;version=2.0,
+ <!-- jboss -->
+ org.jboss.beans.metadata.plugins;version=2.2,
+ org.jboss.beans.metadata.plugins.builder;version=2.2,
+ org.jboss.beans.metadata.spi;version=2.2,
+ org.jboss.beans.metadata.spi.builder;version=2.2,
+ org.jboss.dependency.spi;version=2.2,
+ org.jboss.kernel.spi.dependency;version=2.2,
+
+ <!-- jboss-osgi -->
+ org.jboss.osgi.spi;version=1.0,
org.jboss.osgi.spi.capability;version=1.0,
- org.jboss.osgi.spi.logging;version=1.0,
+ org.jboss.osgi.spi.framework;version=1.0,
org.jboss.osgi.spi.management;version=1.0,
org.jboss.osgi.spi.service;version=1.0,
- org.jboss.osgi.testing;version=1.0,
org.jboss.osgi.spi.util;version=1.0,
-
- org.osgi.framework,
- org.osgi.framework.launch,
- org.osgi.framework.hooks.service,
- org.osgi.service.condpermadmin,
- org.osgi.service.packageadmin,
- org.osgi.service.permissionadmin,
- org.osgi.service.startlevel,
- org.osgi.service.url,
- org.osgi.util.tracker,
+ org.jboss.osgi.testing;version=1.0
</value></entry>
</map>
</property>
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/test/resources/bootstrap/jboss-osgi-bootstrap.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/src/test/resources/bootstrap/jboss-osgi-bootstrap.xml 2010-02-13 11:27:48 UTC (rev 100929)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/src/test/resources/bootstrap/jboss-osgi-bootstrap.xml 2010-02-13 12:09:55 UTC (rev 100930)
@@ -19,18 +19,26 @@
<entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry>
<entry><key>org.osgi.framework.system.packages.extra</key><value>
- org.jboss.logging;version=2.0,
+ <!-- logging -->
+ org.apache.log4j;version=1.2,
+ org.jboss.logging;version=2.1,
+ <!-- jboss -->
+ org.jboss.beans.metadata.plugins;version=2.2,
+ org.jboss.beans.metadata.plugins.builder;version=2.2,
+ org.jboss.beans.metadata.spi;version=2.2,
+ org.jboss.beans.metadata.spi.builder;version=2.2,
+ org.jboss.dependency.spi;version=2.2,
+ org.jboss.kernel.spi.dependency;version=2.2,
+
+ <!-- jboss-osgi -->
org.jboss.osgi.spi;version=1.0,
org.jboss.osgi.spi.capability;version=1.0,
+ org.jboss.osgi.spi.framework;version=1.0,
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.osgi.framework,
- org.osgi.framework.launch,
- org.osgi.service.startlevel,
- org.osgi.service.packageadmin
+ org.jboss.osgi.testing;version=1.0
</value></entry>
</map>
</property>
Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml 2010-02-13 11:27:48 UTC (rev 100929)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml 2010-02-13 12:09:55 UTC (rev 100930)
@@ -26,35 +26,35 @@
<entry>
<key>org.osgi.framework.system.packages.extra</key>
<value>
- <!-- log4j -->
+ <!-- system -->
+ javax.transaction;version=1.0,
+ javax.xml.bind.annotation;version=2.1,
+ org.apache.xerces.dom;version=2.9,
+ org.jnp.interfaces;version=5.0,
+
+ <!-- logging -->
org.apache.log4j;version=1.2,
-
- <!-- jboss-osgi -->
+ org.jboss.logging;version=2.1,
+
+ <!-- jboss -->
+ org.jboss.net.protocol,
+ org.jboss.virtual;version=2.1,
+ org.jboss.virtual.plugins.registry;version=2.1,
+ org.jboss.virtual.plugins.context.jar;version=2.1,
+ org.jboss.virtual.plugins.vfs.helpers;version=2.1,
+ org.jboss.virtual.protocol;version=2.1,
+
+ <!-- jboss-osgi -->
org.jboss.osgi.deployment.common;version=1.0,
org.jboss.osgi.deployment.deployer;version=1.0,
org.jboss.osgi.deployment.interceptor;version=1.0,
- org.jboss.osgi.microcontainer;version=1.0,
org.jboss.osgi.spi;version=1.0,
org.jboss.osgi.spi.capability;version=1.0,
+ org.jboss.osgi.spi.framework;version=1.0,
org.jboss.osgi.spi.management;version=1.0,
org.jboss.osgi.spi.service;version=1.0,
- org.jboss.osgi.spi.util;version=1.0,
-
- <!-- jboss -->
- org.jboss.beans.metadata.plugins;version=2.0,
- org.jboss.beans.metadata.plugins.builder;version=2.0,
- org.jboss.beans.metadata.spi.builder;version=2.0,
- org.jboss.beans.metadata.spi;version=2.0,
- org.jboss.dependency.spi;version=2.0,
- org.jboss.kernel.spi.dependency;version=2.0,
- org.jboss.logging,
- org.jboss.reflect.spi;version=2.0,
- org.jboss.util.xml;version=2.2,
- org.jboss.virtual;version=2.1,
- org.jboss.virtual.plugins.registry;version=2.1,
- org.jboss.virtual.plugins.context.jar;version=2.1,
- org.jboss.virtual.plugins.vfs.helpers;version=2.1,
- org.jboss.virtual.protocol;version=2.1
+ org.jboss.osgi.spi.util;version=1.0,
+ org.osgi.framework;version=1.5
</value>
</entry>
<!--
Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml 2010-02-13 11:27:48 UTC (rev 100929)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml 2010-02-13 12:09:55 UTC (rev 100930)
@@ -31,35 +31,30 @@
javax.xml.bind.annotation;version=2.1,
org.apache.xerces.dom;version=2.9,
org.jnp.interfaces;version=5.0,
-
- <!-- log4j -->
+
+ <!-- logging -->
org.apache.log4j;version=1.2,
-
- <!-- jboss-osgi -->
+ org.jboss.logging;version=2.1,
+
+ <!-- jboss -->
+ org.jboss.net.protocol,
+ org.jboss.virtual;version=2.1,
+ org.jboss.virtual.plugins.registry;version=2.1,
+ org.jboss.virtual.plugins.context.jar;version=2.1,
+ org.jboss.virtual.plugins.vfs.helpers;version=2.1,
+ org.jboss.virtual.protocol;version=2.1,
+
+ <!-- jboss-osgi -->
+ org.jboss.osgi.deployment.common;version=1.0,
org.jboss.osgi.deployment.deployer;version=1.0,
org.jboss.osgi.deployment.interceptor;version=1.0,
- org.jboss.osgi.microcontainer;version=1.0,
org.jboss.osgi.spi;version=1.0,
org.jboss.osgi.spi.capability;version=1.0,
+ org.jboss.osgi.spi.framework;version=1.0,
org.jboss.osgi.spi.management;version=1.0,
org.jboss.osgi.spi.service;version=1.0,
- org.jboss.osgi.spi.util;version=1.0,
-
- <!-- jboss -->
- org.jboss.beans.metadata.plugins;version=2.0,
- org.jboss.beans.metadata.plugins.builder;version=2.0,
- org.jboss.beans.metadata.spi.builder;version=2.0,
- org.jboss.beans.metadata.spi;version=2.0,
- org.jboss.dependency.spi;version=2.0,
- org.jboss.kernel.spi.dependency;version=2.0,
- org.jboss.logging,
- org.jboss.reflect.spi;version=2.0,
- org.jboss.util.xml;version=2.2,
- org.jboss.virtual;version=2.1,
- org.jboss.virtual.plugins.registry;version=2.1,
- org.jboss.virtual.plugins.context.jar;version=2.1,
- org.jboss.virtual.plugins.vfs.helpers;version=2.1,
- org.jboss.virtual.protocol;version=2.1,
+ org.jboss.osgi.spi.util;version=1.0,
+ org.osgi.framework;version=1.5
</value>
</entry>
<!--
Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml 2010-02-13 11:27:48 UTC (rev 100929)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml 2010-02-13 12:09:55 UTC (rev 100930)
@@ -21,27 +21,22 @@
<entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry>
<entry><key>org.osgi.framework.system.packages.extra</key><value>
- <!-- loging -->
- org.apache.log4j;version=1.2,
- org.slf4j;version=1.5,
-
- <!-- jboss -->
- org.jboss.beans.metadata.plugins;version=2.0,
- org.jboss.beans.metadata.plugins.builder;version=2.0,
- org.jboss.beans.metadata.spi;version=2.0,
- org.jboss.beans.metadata.spi.builder;version=2.0,
- org.jboss.dependency.spi;version=2.0,
- org.jboss.kernel.spi.dependency;version=2.0,
- org.jboss.logging,
- org.jboss.util,
- org.jboss.util.collection,
- org.jboss.util.propertyeditor,
- org.jboss.util.xml,
-
<!-- jnp naming -->
org.jnp.interfaces,
org.jnp.server,
+ <!-- logging -->
+ org.apache.log4j;version=1.2,
+ org.jboss.logging;version=2.1,
+
+ <!-- jboss -->
+ org.jboss.beans.metadata.plugins;version=2.2,
+ org.jboss.beans.metadata.plugins.builder;version=2.2,
+ org.jboss.beans.metadata.spi;version=2.2,
+ org.jboss.beans.metadata.spi.builder;version=2.2,
+ org.jboss.dependency.spi;version=2.2,
+ org.jboss.kernel.spi.dependency;version=2.2,
+
<!-- jboss-osgi -->
org.jboss.osgi.spi;version=1.0,
org.jboss.osgi.spi.capability;version=1.0,
@@ -49,6 +44,7 @@
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.osgi.testing;version=1.0
</value></entry>
<!-- Husky socket connector properties -->
<entry><key>org.jboss.osgi.husky.runtime.connector.host</key><value>${jboss.bind.address}</value></entry>
Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-equinox.properties
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-equinox.properties 2010-02-13 11:27:48 UTC (rev 100929)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-equinox.properties 2010-02-13 12:09:55 UTC (rev 100930)
@@ -14,6 +14,27 @@
# Hot Deployement
org.jboss.osgi.hotdeploy.scandir=${osgi.server.home}/deploy
+# Extra System Packages
+org.osgi.framework.system.packages.extra=\
+ org.apache.log4j;version=1.2, \
+ 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, \
+ org.jboss.osgi.deployment.interceptor;version=1.0, \
+ org.jboss.osgi.spi;version=1.0, \
+ org.jboss.osgi.spi.capability;version=1.0, \
+ org.jboss.osgi.spi.framework;version=1.0, \
+ 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.virtual;version=2.1, \
+ org.jboss.virtual.plugins.registry;version=2.1, \
+ org.jboss.virtual.plugins.context.jar;version=2.1, \
+ 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=\
file://${osgi.home}/server/minimal/deploy/org.eclipse.osgi.services.jar \
Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-felix.properties
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-felix.properties 2010-02-13 11:27:48 UTC (rev 100929)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-felix.properties 2010-02-13 12:09:55 UTC (rev 100930)
@@ -14,6 +14,27 @@
# Hot Deployement
org.jboss.osgi.hotdeploy.scandir=${osgi.server.home}/deploy
+# Extra System Packages
+org.osgi.framework.system.packages.extra=\
+ org.apache.log4j;version=1.2, \
+ 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, \
+ org.jboss.osgi.deployment.interceptor;version=1.0, \
+ org.jboss.osgi.spi;version=1.0, \
+ org.jboss.osgi.spi.capability;version=1.0, \
+ org.jboss.osgi.spi.framework;version=1.0, \
+ 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.virtual;version=2.1, \
+ org.jboss.virtual.plugins.registry;version=2.1, \
+ org.jboss.virtual.plugins.context.jar;version=2.1, \
+ 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=\
file://${osgi.home}/server/minimal/deploy/org.osgi.compendium.jar
Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml 2010-02-13 11:27:48 UTC (rev 100929)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml 2010-02-13 12:09:55 UTC (rev 100930)
@@ -22,18 +22,17 @@
<!-- [JBOSGI-145] JAXB classes are loaded from the system classpath -->
com.sun.xml.internal.bind.v2,
- <!-- loging -->
+ <!-- logging -->
org.apache.log4j;version=1.2,
- org.slf4j;version=1.5,
+ org.jboss.logging;version=2.1,
<!-- jboss -->
- org.jboss.beans.metadata.plugins;version=2.0,
- org.jboss.beans.metadata.plugins.builder;version=2.0,
- org.jboss.beans.metadata.spi;version=2.0,
- org.jboss.beans.metadata.spi.builder;version=2.0,
- org.jboss.dependency.spi;version=2.0,
- org.jboss.kernel.spi.dependency;version=2.0,
- org.jboss.logging;version=2.0,
+ org.jboss.beans.metadata.plugins;version=2.2,
+ org.jboss.beans.metadata.plugins.builder;version=2.2,
+ org.jboss.beans.metadata.spi;version=2.2,
+ org.jboss.beans.metadata.spi.builder;version=2.2,
+ org.jboss.dependency.spi;version=2.2,
+ org.jboss.kernel.spi.dependency;version=2.2,
<!-- jboss-osgi -->
org.jboss.osgi.spi;version=1.0,
@@ -42,6 +41,7 @@
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.osgi.testing;version=1.0
</value></entry>
<!-- Hot Deployment -->
<entry><key>org.jboss.osgi.hotdeploy.scandir</key><value>${osgi.server.home}/deploy</value></entry>
Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-extra-all.properties
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-extra-all.properties 2010-02-13 11:27:48 UTC (rev 100929)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-extra-all.properties 2010-02-13 12:09:55 UTC (rev 100930)
@@ -27,23 +27,3 @@
# JTA ObjectStore
com.arjuna.ats.arjuna.objectstore.objectStoreDir=${osgi.server.home}/data/ObjectStore
-
-# Extra System Packages
-org.osgi.framework.system.packages.extra=\
- org.apache.log4j;version=1.2, \
- org.jboss.logging, \
- org.jboss.net.protocol, \
- org.jboss.osgi.deployment.deployer;version=1.0, \
- org.jboss.osgi.deployment.interceptor;version=1.0, \
- org.jboss.osgi.deployment.internal;version=1.0, \
- org.jboss.osgi.spi;version=1.0, \
- org.jboss.osgi.spi.capability;version=1.0, \
- org.jboss.osgi.spi.framework;version=1.0, \
- 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.virtual;version=2.1, \
- org.jboss.virtual.plugins.registry;version=2.1, \
- org.jboss.virtual.plugins.context.jar;version=2.1, \
- org.jboss.virtual.plugins.vfs.helpers;version=2.1, \
- org.jboss.virtual.protocol;version=2.1
\ No newline at end of file
Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-extra-default.properties
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-extra-default.properties 2010-02-13 11:27:48 UTC (rev 100929)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-extra-default.properties 2010-02-13 12:09:55 UTC (rev 100930)
@@ -19,23 +19,4 @@
org.jboss.osgi.husky.runtime.connector.host=${jboss.bind.address}
org.jboss.osgi.husky.runtime.connector.port=5401
-# Extra System Packages
-org.osgi.framework.system.packages.extra=\
- org.apache.log4j;version=1.2, \
- org.jboss.logging, \
- org.jboss.net.protocol, \
- org.jboss.osgi.deployment.deployer;version=1.0, \
- org.jboss.osgi.deployment.interceptor;version=1.0, \
- org.jboss.osgi.spi;version=1.0, \
- org.jboss.osgi.spi.capability;version=1.0, \
- org.jboss.osgi.spi.framework;version=1.0, \
- 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.virtual;version=2.1, \
- org.jboss.virtual.plugins.registry;version=2.1, \
- org.jboss.virtual.plugins.context.jar;version=2.1, \
- org.jboss.virtual.plugins.vfs.helpers;version=2.1, \
- org.jboss.virtual.protocol;version=2.1
-
\ No newline at end of file
Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-extra-minimal.properties
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-extra-minimal.properties 2010-02-13 11:27:48 UTC (rev 100929)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-extra-minimal.properties 2010-02-13 12:09:55 UTC (rev 100930)
@@ -6,16 +6,4 @@
#
#######################################################################################
-# Extra System Packages
-org.osgi.framework.system.packages.extra=\
- org.apache.log4j;version=1.2, \
- org.jboss.logging, \
- org.jboss.osgi.deployment.deployer;version=1.0, \
- org.jboss.osgi.deployment.interceptor;version=1.0, \
- org.jboss.osgi.spi;version=1.0, \
- org.jboss.osgi.spi.capability;version=1.0, \
- org.jboss.osgi.spi.framework;version=1.0, \
- org.jboss.osgi.spi.management;version=1.0, \
- org.jboss.osgi.spi.service;version=1.0, \
- org.jboss.osgi.spi.util;version=1.0
\ No newline at end of file
Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-extra-web.properties
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-extra-web.properties 2010-02-13 11:27:48 UTC (rev 100929)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-extra-web.properties 2010-02-13 12:09:55 UTC (rev 100930)
@@ -25,21 +25,3 @@
org.jboss.osgi.husky.runtime.connector.host=${jboss.bind.address}
org.jboss.osgi.husky.runtime.connector.port=5401
-# Extra System Packages
-org.osgi.framework.system.packages.extra=\
- org.apache.log4j;version=1.2, \
- org.jboss.logging, \
- org.jboss.net.protocol, \
- org.jboss.osgi.deployment.deployer;version=1.0, \
- org.jboss.osgi.deployment.interceptor;version=1.0, \
- org.jboss.osgi.spi;version=1.0, \
- org.jboss.osgi.spi.capability;version=1.0, \
- org.jboss.osgi.spi.framework;version=1.0, \
- 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.virtual;version=2.1, \
- org.jboss.virtual.plugins.registry;version=2.1, \
- org.jboss.virtual.plugins.context.jar;version=2.1, \
- org.jboss.virtual.plugins.vfs.helpers;version=2.1, \
- org.jboss.virtual.protocol;version=2.1
Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2010-02-13 11:27:48 UTC (rev 100929)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2010-02-13 12:09:55 UTC (rev 100930)
@@ -19,21 +19,18 @@
<entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry>
<entry><key>org.osgi.framework.system.packages.extra</key><value>
- <!-- loging -->
+ <!-- logging -->
org.apache.log4j;version=1.2,
- org.slf4j;version=1.5,
+ org.jboss.logging;version=2.1,
<!-- jboss -->
- org.jboss.beans.metadata.plugins;version=2.0,
- org.jboss.beans.metadata.plugins.builder;version=2.0,
- org.jboss.beans.metadata.spi;version=2.0,
- org.jboss.beans.metadata.spi.builder;version=2.0,
- org.jboss.dependency.spi;version=2.0,
- org.jboss.kernel.spi.dependency;version=2.0,
- org.jboss.logging;version=2.0,
- org.jboss.reflect.spi;version=2.0,
- org.jboss.util;version=2.2,
-
+ org.jboss.beans.metadata.plugins;version=2.2,
+ org.jboss.beans.metadata.plugins.builder;version=2.2,
+ org.jboss.beans.metadata.spi;version=2.2,
+ org.jboss.beans.metadata.spi.builder;version=2.2,
+ org.jboss.dependency.spi;version=2.2,
+ org.jboss.kernel.spi.dependency;version=2.2,
+
<!-- jboss-osgi -->
org.jboss.osgi.spi;version=1.0,
org.jboss.osgi.spi.capability;version=1.0,
@@ -41,6 +38,7 @@
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.osgi.testing;version=1.0
</value></entry>
</map>
</property>
Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/log4j.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/log4j.xml 2010-02-13 11:27:48 UTC (rev 100929)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/log4j.xml 2010-02-13 12:09:55 UTC (rev 100930)
@@ -9,7 +9,7 @@
<appender name="FILE" class="org.apache.log4j.FileAppender">
<param name="File" value="${log4j.output.dir}/test.log"/>
- <param name="Append" value="false"/>
+ <param name="Append" value="true"/>
<layout class="org.apache.log4j.PatternLayout">
<!-- The default pattern: Date Priority [Category] Message\n -->
<param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2010-02-13 11:27:48 UTC (rev 100929)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2010-02-13 12:09:55 UTC (rev 100930)
@@ -19,18 +19,17 @@
<entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry>
<entry><key>org.osgi.framework.system.packages.extra</key><value>
- <!-- loging -->
+ <!-- logging -->
org.apache.log4j;version=1.2,
- org.slf4j;version=1.5,
+ org.jboss.logging;version=2.1,
<!-- jboss -->
- org.jboss.beans.metadata.plugins;version=2.0,
- org.jboss.beans.metadata.plugins.builder;version=2.0,
- org.jboss.beans.metadata.spi;version=2.0,
- org.jboss.beans.metadata.spi.builder;version=2.0,
- org.jboss.dependency.spi;version=2.0,
- org.jboss.kernel.spi.dependency;version=2.0,
- org.jboss.logging;version=2.0,
+ org.jboss.beans.metadata.plugins;version=2.2,
+ org.jboss.beans.metadata.plugins.builder;version=2.2,
+ org.jboss.beans.metadata.spi;version=2.2,
+ org.jboss.beans.metadata.spi.builder;version=2.2,
+ org.jboss.dependency.spi;version=2.2,
+ org.jboss.kernel.spi.dependency;version=2.2,
<!-- jboss-osgi -->
org.jboss.osgi.spi;version=1.0,
@@ -39,7 +38,7 @@
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.osgi.testing,
+ org.jboss.osgi.testing;version=1.0
</value></entry>
</map>
</property>
Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/log4j.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/log4j.xml 2010-02-13 11:27:48 UTC (rev 100929)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/log4j.xml 2010-02-13 12:09:55 UTC (rev 100930)
@@ -9,7 +9,7 @@
<appender name="FILE" class="org.apache.log4j.FileAppender">
<param name="File" value="${log4j.output.dir}/test.log"/>
- <param name="Append" value="false"/>
+ <param name="Append" value="true"/>
<layout class="org.apache.log4j.PatternLayout">
<!-- The default pattern: Date Priority [Category] Message\n -->
<param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
14 years, 4 months
- 1
- 0
JBoss-OSGI SVN: r100928 - in projects/jboss-osgi/projects/bundles/blueprint/trunk: scripts and 3 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-02-13 04:32:40 -0500 (Sat, 13 Feb 2010)
New Revision: 100928
Added:
projects/jboss-osgi/projects/bundles/blueprint/trunk/src/main/java/org/jboss/osgi/blueprint/internal/
projects/jboss-osgi/projects/bundles/blueprint/trunk/src/main/java/org/jboss/osgi/blueprint/internal/BlueprintActivator.java
Removed:
projects/jboss-osgi/projects/bundles/blueprint/trunk/src/main/java/org/jboss/osgi/blueprint/extender/
projects/jboss-osgi/projects/bundles/blueprint/trunk/src/main/java/org/osgi/
Modified:
projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml
projects/jboss-osgi/projects/bundles/blueprint/trunk/scripts/assembly-bundles.xml
projects/jboss-osgi/projects/bundles/blueprint/trunk/src/main/java/org/jboss/osgi/blueprint/BlueprintCapability.java
Log:
WIP
Modified: projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml 2010-02-12 20:56:12 UTC (rev 100927)
+++ projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml 2010-02-13 09:32:40 UTC (rev 100928)
@@ -67,9 +67,15 @@
<!-- Provided Dependencies -->
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
- <artifactId>org.apache.aries.blueprint</artifactId>
+ <artifactId>org.apache.aries.blueprint.api</artifactId>
<version>${version.apache.aries.blueprint}</version>
<scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.blueprint</groupId>
+ <artifactId>org.apache.aries.blueprint.core</artifactId>
+ <version>${version.apache.aries.blueprint}</version>
+ <scope>provided</scope>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
@@ -140,19 +146,36 @@
<configuration>
<instructions>
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
- <Bundle-Activator>org.jboss.osgi.blueprint.extender.BlueprintActivator</Bundle-Activator>
- <Private-Package>
- org.jboss.osgi.blueprint.*
- </Private-Package>
+ <Bundle-Activator>org.jboss.osgi.blueprint.internal.BlueprintActivator</Bundle-Activator>
<Export-Package>
org.jboss.osgi.blueprint;version=${version},
+ org.osgi.service.blueprint*;version="1.0"
</Export-Package>
<Import-Package>
- org.jboss.osgi.spi.capability;version=1.0,
+ javax.xml.parsers,
+ javax.xml.transform*,
+ javax.xml.validation,
+
+ org.apache.aries.util.tracker;version="[1.0,1.1)",
+ org.jboss.osgi.spi*;version="[1.0,1.1)",
org.osgi.framework,
- org.osgi.service.blueprint.container;version=1.0,
- org.osgi.service.blueprint.reflect;version=1.0,
+ org.osgi.service.event,
+ org.osgi.util.tracker,
+
+ org.slf4j,
+ org.w3c.dom,
+ org.xml.sax,
+
+ !net.sf.cglib*,
+ !org.objectweb*,
</Import-Package>
+ <Embed-Dependency>
+ org.apache.aries.blueprint.api;inline=false,
+ org.apache.aries.blueprint.core;inline=false,
+ </Embed-Dependency>
+ <_exportcontents>
+ org.osgi.service.blueprint*;version=1.0
+ </_exportcontents>
</instructions>
</configuration>
</plugin>
Modified: projects/jboss-osgi/projects/bundles/blueprint/trunk/scripts/assembly-bundles.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/blueprint/trunk/scripts/assembly-bundles.xml 2010-02-12 20:56:12 UTC (rev 100927)
+++ projects/jboss-osgi/projects/bundles/blueprint/trunk/scripts/assembly-bundles.xml 2010-02-13 09:32:40 UTC (rev 100928)
@@ -19,7 +19,6 @@
<include>*:jboss-osgi-husky:jar</include>
<include>*:jboss-osgi-jmx:jar</include>
<include>*:jboss-osgi-jndi:jar</include>
- <include>*:org.apache.aries.blueprint:jar</include>
<include>*:org.apache.aries.util:jar</include>
</includes>
<useStrictFiltering>true</useStrictFiltering>
Modified: projects/jboss-osgi/projects/bundles/blueprint/trunk/src/main/java/org/jboss/osgi/blueprint/BlueprintCapability.java
===================================================================
--- projects/jboss-osgi/projects/bundles/blueprint/trunk/src/main/java/org/jboss/osgi/blueprint/BlueprintCapability.java 2010-02-12 20:56:12 UTC (rev 100927)
+++ projects/jboss-osgi/projects/bundles/blueprint/trunk/src/main/java/org/jboss/osgi/blueprint/BlueprintCapability.java 2010-02-13 09:32:40 UTC (rev 100928)
@@ -43,7 +43,6 @@
super(BlueprintService.class.getName());
addBundle("bundles/org.apache.aries.util.jar");
- addBundle("bundles/org.apache.aries.blueprint.jar");
addBundle("bundles/jboss-osgi-blueprint.jar");
}
}
\ No newline at end of file
Copied: projects/jboss-osgi/projects/bundles/blueprint/trunk/src/main/java/org/jboss/osgi/blueprint/internal/BlueprintActivator.java (from rev 100556, projects/jboss-osgi/projects/bundles/blueprint/trunk/src/main/java/org/jboss/osgi/blueprint/extender/BlueprintActivator.java)
===================================================================
--- projects/jboss-osgi/projects/bundles/blueprint/trunk/src/main/java/org/jboss/osgi/blueprint/internal/BlueprintActivator.java (rev 0)
+++ projects/jboss-osgi/projects/bundles/blueprint/trunk/src/main/java/org/jboss/osgi/blueprint/internal/BlueprintActivator.java 2010-02-13 09:32:40 UTC (rev 100928)
@@ -0,0 +1,57 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.blueprint.internal;
+
+//$Id$
+
+import org.apache.aries.blueprint.container.BlueprintExtender;
+import org.jboss.osgi.blueprint.BlueprintService;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The Blueprint activator registeres the {@link BlueprintService}
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 13-May-2009
+ */
+public class BlueprintActivator implements BundleActivator
+{
+ BundleActivator ariesActivator;
+
+
+ public void start(BundleContext context) throws Exception
+ {
+ // Register the marker service
+ BlueprintService service = new BlueprintService(){};
+ context.registerService(BlueprintService.class.getName(), service, null);
+
+ ariesActivator = new BlueprintExtender();
+ ariesActivator.start(context);
+ }
+
+ public void stop(BundleContext context) throws Exception
+ {
+ if (ariesActivator != null)
+ ariesActivator.stop(context);
+ }
+}
\ No newline at end of file
14 years, 4 months
- 1
- 0
JBoss-OSGI SVN: r100867 - projects/jboss-osgi/trunk/testsuite.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-02-11 09:40:58 -0500 (Thu, 11 Feb 2010)
New Revision: 100867
Modified:
projects/jboss-osgi/trunk/testsuite/pom.xml
Log:
Fix slf4j version conflict
Modified: projects/jboss-osgi/trunk/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/pom.xml 2010-02-11 14:36:28 UTC (rev 100866)
+++ projects/jboss-osgi/trunk/testsuite/pom.xml 2010-02-11 14:40:58 UTC (rev 100867)
@@ -61,6 +61,12 @@
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint</artifactId>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
14 years, 4 months
- 1
- 0
JBoss-OSGI SVN: r100866 - in projects/jboss-osgi: projects/bundles/blueprint/trunk/src/main/java/org/jboss/osgi/blueprint and 2 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-02-11 09:36:28 -0500 (Thu, 11 Feb 2010)
New Revision: 100866
Removed:
projects/jboss-osgi/projects/bundles/blueprint/trunk/src/main/java/org/jboss/osgi/blueprint/parser/
projects/jboss-osgi/projects/bundles/blueprint/trunk/src/main/java/org/osgi/service/blueprint/
Modified:
projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml
projects/jboss-osgi/trunk/pom.xml
Log:
Explicitly define slf4j version
Modified: projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml 2010-02-11 14:26:29 UTC (rev 100865)
+++ projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml 2010-02-11 14:36:28 UTC (rev 100866)
@@ -20,13 +20,13 @@
<artifactId>jboss-osgi-blueprint</artifactId>
<packaging>bundle</packaging>
- <version>1.0.1.Beta1-SNAPSHOT</version>
+ <version>1.0.0.Beta2-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 -->
@@ -40,11 +40,11 @@
<properties>
<version.apache.aries.blueprint>1.0.0.20100120</version.apache.aries.blueprint>
<version.apache.aries.util>1.0.0.20100120</version.apache.aries.util>
- <version.jboss.osgi.common>1.0.3</version.jboss.osgi.common>
+ <version.jboss.osgi.common>1.0.4-SNAPSHOT</version.jboss.osgi.common>
<version.jboss.osgi.framework>1.0.0.Alpha3</version.jboss.osgi.framework>
- <version.jboss.osgi.husky>1.0.3</version.jboss.osgi.husky>
- <version.jboss.osgi.jmx>1.0.3</version.jboss.osgi.jmx>
- <version.jboss.osgi.spi>1.0.4</version.jboss.osgi.spi>
+ <version.jboss.osgi.husky>1.0.4-SNAPSHOT</version.jboss.osgi.husky>
+ <version.jboss.osgi.jmx>1.0.4-SNAPSHOT</version.jboss.osgi.jmx>
+ <version.jboss.osgi.spi>1.0.5-SNAPSHOT</version.jboss.osgi.spi>
<version.osgi>4.2.0</version.osgi>
<surefire.jpda.args />
@@ -70,12 +70,24 @@
<artifactId>org.apache.aries.blueprint</artifactId>
<version>${version.apache.aries.blueprint}</version>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
<version>${version.apache.aries.util}</version>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
@@ -117,11 +129,6 @@
</dependency>
<!-- Test Dependencies -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<!-- Build -->
@@ -254,7 +261,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/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml 2010-02-11 14:26:29 UTC (rev 100865)
+++ projects/jboss-osgi/trunk/pom.xml 2010-02-11 14:36:28 UTC (rev 100866)
@@ -54,8 +54,8 @@
<version.izpack>4.3.1</version.izpack>
<version.javax.servlet>2.5</version.javax.servlet>
<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.blueprint>1.0.0.Beta2-SNAPSHOT</version.jboss.osgi.blueprint>
+ <version.jboss.osgi.common>1.0.4-SNAPSHOT</version.jboss.osgi.common>
<version.jboss.osgi.common.core>2.2.13.GA</version.jboss.osgi.common.core>
<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>
14 years, 4 months
- 1
- 0
JBoss-OSGI SVN: r100865 - projects/jboss-osgi/projects/bundles/common/trunk.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-02-11 09:26:29 -0500 (Thu, 11 Feb 2010)
New Revision: 100865
Modified:
projects/jboss-osgi/projects/bundles/common/trunk/pom.xml
Log:
Explicitly define slf4j version
Modified: projects/jboss-osgi/projects/bundles/common/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/common/trunk/pom.xml 2010-02-11 11:46:29 UTC (rev 100864)
+++ projects/jboss-osgi/projects/bundles/common/trunk/pom.xml 2010-02-11 14:26:29 UTC (rev 100865)
@@ -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>
<!-- SCM -->
@@ -39,7 +39,8 @@
<!-- Properties -->
<properties>
- <version.jboss.osgi.spi>1.0.3</version.jboss.osgi.spi>
+ <version.jboss.osgi.spi>1.0.5-SNAPSHOT</version.jboss.osgi.spi>
+ <version.slf4j>1.5.8</version.slf4j>
<version.osgi>4.2.0</version.osgi>
</properties>
@@ -53,10 +54,12 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
+ <version>${version.slf4j}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
+ <version>${version.slf4j}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
14 years, 4 months
- 1
- 0
JBoss-OSGI SVN: r100864 - in projects/jboss-osgi: projects/bundles/apache-xerces/trunk/src/main/java/org/jboss/osgi/xml and 38 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)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(a)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>
14 years, 4 months
- 1
- 0
JBoss-OSGI SVN: r100859 - projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-02-11 03:45:48 -0500 (Thu, 11 Feb 2010)
New Revision: 100859
Modified:
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml
Log:
Fix references to DeploymentRegistry in Runtime
Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml 2010-02-11 08:00:27 UTC (rev 100858)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml 2010-02-11 08:45:48 UTC (rev 100859)
@@ -100,7 +100,10 @@
<constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
</bean>
<bean name="OSGiServiceManager" class="org.jboss.osgi.framework.bundle.ServiceManagerPluginImpl">
- <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
+ <constructor>
+ <parameter><inject bean="OSGiBundleManager" /></parameter>
+ <parameter><inject bean="OSGiDeploymentRegistry" /></parameter>
+ </constructor>
</bean>
<bean name="OSGiStoragePlugin" class="org.jboss.osgi.framework.plugins.internal.BundleStoragePluginImpl">
<constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor>
14 years, 4 months
- 1
- 0
JBoss-OSGI SVN: r100858 - in projects/jboss-osgi/trunk: testsuite/example/src/test/resources/META-INF and 1 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-02-11 03:00:27 -0500 (Thu, 11 Feb 2010)
New Revision: 100858
Modified:
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml
projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml
projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml
Log:
Fix references to DeploymentRegistry
Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml 2010-02-11 07:27:14 UTC (rev 100857)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml 2010-02-11 08:00:27 UTC (rev 100858)
@@ -93,7 +93,7 @@
<bean name="OSGiControllerContextPlugin" class="org.jboss.osgi.framework.bundle.ControllerContextPluginImpl">
<constructor>
<parameter><inject bean="OSGiBundleManager" /></parameter>
- <parameter><inject bean="DeploymentRegistry" /></parameter>
+ <parameter><inject bean="OSGiDeploymentRegistry" /></parameter>
</constructor>
</bean>
<bean name="OSGiFrameworkEventsPlugin" class="org.jboss.osgi.framework.plugins.internal.FrameworkEventsPluginImpl">
@@ -160,7 +160,7 @@
</bean>
<!-- The deployment registry -->
- <bean name="DeploymentRegistry" class="org.jboss.deployers.structure.spi.helpers.AbstractDeploymentRegistry"/>
+ <bean name="OSGiDeploymentRegistry" class="org.jboss.deployers.structure.spi.helpers.AbstractDeploymentRegistry"/>
<!-- The holder for deployers that determine structure -->
<bean name="StructuralDeployers" class="org.jboss.deployers.vfs.plugins.structure.VFSStructuralDeployersImpl">
@@ -195,7 +195,7 @@
<constructor>
<parameter class="org.jboss.dependency.spi.Controller"><inject bean="jboss.kernel:service=KernelController" /></parameter>
</constructor>
- <property name="deploymentRegistry"><inject bean="DeploymentRegistry"/></property>
+ <property name="deploymentRegistry"><inject bean="OSGiDeploymentRegistry"/></property>
</bean>
<!-- OSGI Deployment -->
Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2010-02-11 07:27:14 UTC (rev 100857)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2010-02-11 08:00:27 UTC (rev 100858)
@@ -78,7 +78,7 @@
<bean name="OSGiControllerContextPlugin" class="org.jboss.osgi.framework.bundle.ControllerContextPluginImpl">
<constructor>
<parameter><inject bean="OSGiBundleManager" /></parameter>
- <parameter><inject bean="DeploymentRegistry" /></parameter>
+ <parameter><inject bean="OSGiDeploymentRegistry" /></parameter>
</constructor>
</bean>
<bean name="OSGiFrameworkEventsPlugin" class="org.jboss.osgi.framework.plugins.internal.FrameworkEventsPluginImpl">
@@ -148,7 +148,7 @@
</bean>
<!-- The deployment registry -->
- <bean name="DeploymentRegistry" class="org.jboss.deployers.structure.spi.helpers.AbstractDeploymentRegistry"/>
+ <bean name="OSGiDeploymentRegistry" class="org.jboss.deployers.structure.spi.helpers.AbstractDeploymentRegistry"/>
<!-- The holder for deployers that determine structure -->
<bean name="StructuralDeployers" class="org.jboss.deployers.vfs.plugins.structure.VFSStructuralDeployersImpl">
@@ -183,7 +183,7 @@
<constructor>
<parameter class="org.jboss.dependency.spi.Controller"><inject bean="jboss.kernel:service=KernelController" /></parameter>
</constructor>
- <property name="deploymentRegistry"><inject bean="DeploymentRegistry"/></property>
+ <property name="deploymentRegistry"><inject bean="OSGiDeploymentRegistry"/></property>
</bean>
<!-- OSGI Deployment -->
Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2010-02-11 07:27:14 UTC (rev 100857)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2010-02-11 08:00:27 UTC (rev 100858)
@@ -63,7 +63,7 @@
<bean name="OSGiControllerContextPlugin" class="org.jboss.osgi.framework.bundle.ControllerContextPluginImpl">
<constructor>
<parameter><inject bean="OSGiBundleManager" /></parameter>
- <parameter><inject bean="DeploymentRegistry" /></parameter>
+ <parameter><inject bean="OSGiDeploymentRegistry" /></parameter>
</constructor>
</bean>
<bean name="OSGiFrameworkEventsPlugin" class="org.jboss.osgi.framework.plugins.internal.FrameworkEventsPluginImpl">
@@ -121,7 +121,7 @@
</bean>
<!-- The deployment registry -->
- <bean name="DeploymentRegistry" class="org.jboss.deployers.structure.spi.helpers.AbstractDeploymentRegistry"/>
+ <bean name="OSGiDeploymentRegistry" class="org.jboss.deployers.structure.spi.helpers.AbstractDeploymentRegistry"/>
<!-- The holder for deployers that determine structure -->
<bean name="StructuralDeployers" class="org.jboss.deployers.vfs.plugins.structure.VFSStructuralDeployersImpl">
@@ -156,7 +156,7 @@
<constructor>
<parameter class="org.jboss.dependency.spi.Controller"><inject bean="jboss.kernel:service=KernelController" /></parameter>
</constructor>
- <property name="deploymentRegistry"><inject bean="DeploymentRegistry"/></property>
+ <property name="deploymentRegistry"><inject bean="OSGiDeploymentRegistry"/></property>
</bean>
<!-- OSGI Deployment -->
14 years, 4 months
- 1
- 0
JBoss-OSGI SVN: r100827 - in projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/osgi/jmx: service and 1 other directory.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-02-10 17:28:37 -0500 (Wed, 10 Feb 2010)
New Revision: 100827
Removed:
projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/osgi/jmx/Item.java
projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/osgi/jmx/JmxConstants.java
projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/osgi/jmx/framework/
projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/osgi/jmx/package.html
projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/osgi/jmx/packageinfo
projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/osgi/jmx/service/cm/
projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/osgi/jmx/service/permissionadmin/
projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/osgi/jmx/service/provisioning/
projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/osgi/jmx/service/useradmin/
Log:
Remove spec API
Deleted: projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/osgi/jmx/Item.java
===================================================================
--- projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/osgi/jmx/Item.java 2010-02-10 22:28:33 UTC (rev 100826)
+++ projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/osgi/jmx/Item.java 2010-02-10 22:28:37 UTC (rev 100827)
@@ -1,164 +0,0 @@
-package org.osgi.jmx;
-
-import java.util.Arrays;
-import java.util.LinkedHashSet;
-import java.util.Set;
-
-import javax.management.openmbean.ArrayType;
-import javax.management.openmbean.CompositeType;
-import javax.management.openmbean.OpenDataException;
-import javax.management.openmbean.OpenType;
-import javax.management.openmbean.TabularType;
-
-/**
- * The item class enables the definition of open types in the appropriate
- * interfaces.
- *
- * This class contains a number of methods that make it possible to create open
- * types for {@link CompositeType}, {@link TabularType}, and {@link ArrayType}.
- * The normal creation throws a checked exception, making it impossible to use
- * them in a static initializer. They constructors are also not very suitable
- * for static construction.
- *
- *
- * An Item instance describes an item in a Composite Type. It groups the triplet
- * of name, description, and Open Type. These Item instances allows the
- * definitions of an item to stay together.
- *
- * @version $Revision$
- * @Immutable
- */
-public class Item {
-
- /**
- * The name of this item.
- */
- private final String name;
-
- /**
- * The description of this item.
- */
- private final String description;
-
- /**
- * The type of this item.
- */
- private final OpenType type;
-
- /**
- * Create a triple of name, description, and type. This triplet is used in
- * the creation of a Composite Type.
- *
- * @param name The name of the item.
- * @param description The description of the item.
- * @param type The Open Type of this item.
- * @param restrictions Ignored, contains list of restrictions
- */
- public Item(String name, String description, OpenType type,
- String... restrictions) {
- this.name = name;
- this.description = description;
- this.type = type;
- }
-
- /**
- *
- */
-
- /**
- * Create a Tabular Type.
- *
- * @param name The name of the Tabular Type.
- * @param description The description of the Tabular Type.
- * @param rowType The Open Type for a row
- * @param index The names of the items that form the index .
- * @return A new Tabular Type composed from the parameters.
- * @throws RuntimeException when the Tabular Type throws an
- * OpenDataException
- */
- static public TabularType tabularType(String name, String description,
- CompositeType rowType, String... index) {
- try {
- return new TabularType(name, description, rowType, index);
- }
- catch (OpenDataException e) {
- throw new RuntimeException(e);
- }
- }
-
- /**
- * Create a Composite Type
- *
- * @param name The name of the Tabular Type.
- * @param description The description of the Tabular Type.
- * @param items The items that describe the composite type.
- * @return a new Composite Type
- * @throws RuntimeException when the Tabular Type throws an
- * OpenDataException
- */
- static public CompositeType compositeType(String name, String description,
- Item... items) {
- return extend(null, name, description, items);
- }
-
- /**
- * Return a new Array Type.
- *
- * @param dim The dimension
- * @param elementType The element type
- * @return A new Array Type
- */
- public static ArrayType arrayType(int dim, OpenType elementType) {
- try {
- return new ArrayType(dim, elementType);
- }
- catch (OpenDataException e) {
- throw new RuntimeException(e);
- }
- }
-
- /**
- * Extend a Composite Type by adding new items. Items can override items in
- * the parent type.
- *
- * @param parent The parent type, can be <code>null</code>
- * @param name The name of the type
- * @param description The description of the type
- * @param items The items that should be added/override to the parent type
- * @return A new Composite Type that extends the parent type
- * @throws RuntimeException when an OpenDataException is thrown
- */
- public static CompositeType extend(CompositeType parent, String name,
- String description, Item... items) {
- Set<Item> all = new LinkedHashSet<Item>();
-
- if (parent != null) {
- for (Object nm : parent.keySet()) {
- String key = (String) nm;
- all.add(new Item((String) nm, parent.getDescription(key),
- parent.getType(key)));
- }
- }
-
- all.addAll(Arrays.asList(items));
-
- String names[] = new String[all.size()];
- String descriptions[] = new String[all.size()];
- OpenType types[] = new OpenType[all.size()];
-
- for (int n = 0; n < types.length; n++) {
- names[n] = items[n].name;
- descriptions[n] = items[n].description;
- types[n] = items[n].type;
- }
-
- try {
- return new CompositeType(name, description, names, descriptions,
- types);
- }
- catch (OpenDataException e) {
- throw new RuntimeException(e);
- }
- }
-
-}
Deleted: projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/osgi/jmx/JmxConstants.java
===================================================================
--- projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/osgi/jmx/JmxConstants.java 2010-02-10 22:28:33 UTC (rev 100826)
+++ projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/osgi/jmx/JmxConstants.java 2010-02-10 22:28:37 UTC (rev 100827)
@@ -1,317 +0,0 @@
-/*
- * Copyright (c) OSGi Alliance (2009). All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.osgi.jmx;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.management.openmbean.ArrayType;
-import javax.management.openmbean.CompositeType;
-import javax.management.openmbean.SimpleType;
-import javax.management.openmbean.TabularType;
-
-/**
- * Constants for OSGi JMX Specification.
- *
- * Additionally, this class contains a number of utility types that are used in
- * different places in the specification. These are {@link #LONG_ARRAY_TYPE},
- * {@link #STRING_ARRAY_TYPE}, and {@link #PROPERTIES_TYPE}.
- *
- * @version $Revision$
- * @Immutable
- */
-public class JmxConstants {
-
- /*
- * Empty constructor to make sure this is not used as an object.
- */
- private JmxConstants() {
- // empty
- }
-
- /**
- * The MBean Open type for an array of strings
- */
- public static final ArrayType STRING_ARRAY_TYPE = Item
- .arrayType(
- 1,
- SimpleType.STRING);
- /**
- * The MBean Open type for an array of longs
- */
- public static final ArrayType LONG_ARRAY_TYPE = Item
- .arrayType(
- 1,
- SimpleType.LONG);
-
- /**
- * For an encoded array we need to start with ARRAY_OF. This must be
- * followed by one of the names in {@link #SCALAR}.
- *
- */
- public final static String ARRAY_OF = "Array of ";
-
- /**
- * For an encoded vector we need to start with ARRAY_OF. This must be
- * followed by one of the names in {@link #SCALAR}.
- */
- public final static String VECTOR_OF = "Vector of ";
-
- /**
- * Value for {@link #PROPERTY_TYPE} <code>Type</code> value in the case of
- * {@link java.lang.String}
- */
- public static final String STRING = "String";
- /**
- * Value for {@link #PROPERTY_TYPE} <code>Type</code> value in the case of
- * {@link java.lang.Integer}
- */
- public static final String INTEGER = "Integer";
- /**
- * Value for {@link #PROPERTY_TYPE} <code>Type</code> value in the case of
- * {@link java.lang.Long}
- */
- public static final String LONG = "Long";
- /**
- * Value for {@link #PROPERTY_TYPE} <code>Type</code> value in the case of
- * {@link java.lang.Float}
- */
- public static final String FLOAT = "Float";
- /**
- * Value for {@link #PROPERTY_TYPE} <code>Type</code> value in the case of
- * {@link java.lang.Double}
- */
- public static final String DOUBLE = "Double";
- /**
- * Value for {@link #PROPERTY_TYPE} <code>Type</code> value in the case of
- * {@link java.lang.Byte}
- */
- public static final String BYTE = "Byte";
- /**
- * Value for {@link #PROPERTY_TYPE} <code>Type</code> value in the case of
- * {@link java.lang.Short}
- */
- public static final String SHORT = "Short";
- /**
- * Value for {@link #PROPERTY_TYPE} <code>Type</code> value in the case of
- * {@link java.lang.Character}
- */
- public static final String CHARACTER = "Character";
- /**
- * Value for {@link #PROPERTY_TYPE} <code>Type</code> value in the case of
- * {@link java.lang.Boolean}
- */
- public static final String BOOLEAN = "Boolean";
- /**
- * Value for {@link #PROPERTY_TYPE} <code>Type</code> value in the case of
- * {@link java.math.BigDecimal}
- */
- public static final String BIGDECIMAL = "BigDecimal";
- /**
- * Value for {@link #PROPERTY_TYPE} <code>Type</code> value in the case of
- * {@link java.math.BigInteger}
- */
- public static final String BIGINTEGER = "BigInteger";
- /**
- * Value for {@link #PROPERTY_TYPE} <code>Type</code> value in the case of
- * the <code>double</code> primitive type.
- */
- public static final String P_DOUBLE = "double";
- /**
- * Value for {@link #PROPERTY_TYPE} <code>Type</code> value in the case of
- * the <code>float</code> primitive type.
- */
- public static final String P_FLOAT = "float";
- /**
- * Value for {@link #PROPERTY_TYPE} <code>Type</code> value in the case of
- * the <code>long</code> primitive type.
- */
- public static final String P_LONG = "long";
- /**
- * Value for {@link #PROPERTY_TYPE} <code>Type</code> value in the case of
- * the <code>int</code> primitive type.
- */
- public static final String P_INT = "int";
- /**
- * Value for {@link #PROPERTY_TYPE} <code>Type</code> value in the case of
- * the <code>short</code> primitive type.
- */
- public static final String P_SHORT = "short";
- /**
- * Value for {@link #PROPERTY_TYPE} <code>Type</code> value in the case of
- * the <code>byte</code> primitive type.
- */
- public static final String P_BYTE = "byte";
- /**
- * Value for {@link #PROPERTY_TYPE} <code>Type</code> value in the case of
- * the <code>char</code> primitive type.
- */
- public static final String P_CHAR = "char";
- /**
- * Value for {@link #PROPERTY_TYPE} <code>Type</code> value in the case of
- * the <code>boolean</code> primitive type.
- */
- public static final String P_BOOLEAN = "boolean";
-
- /**
- * A set of all scalars that can be used in the {@link #TYPE} property of a
- * {@link #PROPERTIES_TYPE}. This contains the following names:
- * <ul>
- * <li>{@link #BIGDECIMAL}</li>
- * <li>{@link #BIGINTEGER}</li>
- * <li>{@link #BOOLEAN}</li>
- * <li>{@link #BYTE}</li>
- * <li>{@link #CHARACTER}</li>
- * <li>{@link #DOUBLE}</li>
- * <li>{@link #FLOAT}</li>
- * <li>{@link #INTEGER}</li>
- * <li>{@link #LONG}</li>
- * <li>{@link #SHORT}</li>
- * <li>{@link #STRING}</li>
- * <li>{@link #P_BYTE}</li>
- * <li>{@link #P_CHAR}</li>
- * <li>{@link #P_DOUBLE}</li>
- * <li>{@link #P_FLOAT}</li>
- * <li>{@link #P_INT}</li>
- * <li>{@link #P_LONG}</li>
- * <li>{@link #P_SHORT}</li>
- */
- public final static Set<String> SCALAR = new HashSet<String>(
- Arrays
- .asList(
- STRING,
- INTEGER,
- LONG,
- FLOAT,
- DOUBLE,
- BYTE,
- SHORT,
- CHARACTER,
- BOOLEAN,
- BIGDECIMAL,
- BIGINTEGER,
- P_BYTE,
- P_CHAR,
- P_SHORT,
- P_INT,
- P_LONG,
- P_DOUBLE,
- P_FLOAT));
- /**
- * The key KEY.
- */
- public static final String KEY = "Key";
- /**
- * The key of a property. The key is {@link #KEY} and the type is
- * {@link SimpleType#STRING}.
- */
- public static final Item KEY_ITEM = new Item(
- KEY,
- "The key of the property",
- SimpleType.STRING);
-
- /**
- * The key VALUE.
- */
- public static final String VALUE = "Value";
-
- /**
- * The value of a property. The key is {@link #VALUE} and the type is
- * {@link SimpleType#STRING}. A value will be encoded by the string given in
- * {@link #TYPE}. The syntax for this type is given in {@link #TYPE_ITEM}.
- */
- public static final Item VALUE_ITEM = new Item(
- VALUE,
- "The value of the property",
- SimpleType.STRING);
-
- /**
- * The key PROPERTY_TYPE.
- *
- * ### can we call this value PropertyType and service type ServiceType?
- */
- public static final String TYPE = "Type";
-
- /**
- * The type of the property. The key is {@link #TYPE} and the type is
- * {@link SimpleType#STRING}. This string must follow the following syntax:
- *
- * TYPE ::= ( 'Array of ' | 'Vector of ' )? {@link #SCALAR}
- *
- * ### why can't we just use the class name?
- *
- * ### why do we have to distinguish between primitives and wrappers?
- */
- public static final Item TYPE_ITEM = new Item(
- TYPE,
- "The type of the property",
- SimpleType.STRING, //
- STRING,
- INTEGER,
- LONG,
- FLOAT,
- DOUBLE,
- BYTE,
- SHORT,
- CHARACTER,
- BOOLEAN,
- BIGDECIMAL,
- BIGINTEGER,
- P_DOUBLE,
- P_FLOAT,
- P_LONG,
- P_INT,
- P_SHORT,
- P_CHAR,
- P_BYTE,
- P_BOOLEAN);
-
- /**
- * A Composite Type describing a a single property. A property consists of
- * the following items {@link #KEY_ITEM}, {@link #VALUE_ITEM}, and
- * {@link #TYPE_ITEM}.
- */
- public static final CompositeType PROPERTY_TYPE = Item
- .compositeType(
- "PROPERTY",
- "This type encapsulates a key/value pair",
- KEY_ITEM,
- VALUE_ITEM,
- TYPE_ITEM);
-
- /**
- * Describes a map with properties. The row type is {@link #PROPERTY_TYPE}.
- * The index is defined to the {@link #KEY} of the property.
- */
- public static final TabularType PROPERTIES_TYPE = Item
- .tabularType(
- "PROPERTIES",
- "A table of PROPERTY",
- PROPERTY_TYPE,
- KEY);
-
- /**
- * The domain name of the core OSGi MBeans
- */
- public static final String OSGI_CORE = "osgi.core";
-
- /**
- * The domain name of the selected OSGi compendium MBeans
- */
- public static final String OSGI_COMPENDIUM = "osgi.compendium";
-}
Deleted: projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/osgi/jmx/package.html
===================================================================
--- projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/osgi/jmx/package.html 2010-02-10 22:28:33 UTC (rev 100826)
+++ projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/osgi/jmx/package.html 2010-02-10 22:28:37 UTC (rev 100827)
@@ -1,11 +0,0 @@
-<!-- $Revision: 8212 $ -->
-<BODY>
-<p>OSGi JMX Package Version 1.0.</p>
-<p>Bundles wishing to use this package must list the package
-in the Import-Package header of the bundle's manifest.
-For example:</p>
-<pre>
-Import-Package: org.osgi.jmx; version="[1.0,2.0)"
-</pre>
-</BODY>
-
Deleted: projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/osgi/jmx/packageinfo
===================================================================
--- projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/osgi/jmx/packageinfo 2010-02-10 22:28:33 UTC (rev 100826)
+++ projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/osgi/jmx/packageinfo 2010-02-10 22:28:37 UTC (rev 100827)
@@ -1 +0,0 @@
-version 1.0
14 years, 4 months
- 1
- 0