Author: thomas.diesler(a)jboss.com Date: 2009-10-21 17:26:54 -0400 (Wed, 21 Oct 2009) New Revision: 95344 Modified: projects/jboss-osgi/projects/bundles/hotdeploy/trunk/pom.xml projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml projects/jboss-osgi/projects/bundles/webapp/trunk/pom.xml projects/jboss-osgi/projects/runtime/felix/trunk/src/main/java/org/jboss/osgi/felix/FelixBundleContextWrapper.java projects/jboss-osgi/projects/runtime/felix/trunk/src/main/java/org/jboss/osgi/felix/FelixFrameworkWrapper.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/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.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-felix-all.properties projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-default.properties projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-minimal.properties projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-web.properties projects/jboss-osgi/trunk/reactor/blueprint/impl/pom.xml projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/resources/jboss-osgi-felix.properties 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/resources/jboss-osgi-equinox.properties projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-felix.properties Log: Remove version directive from deployment imports Modified: projects/jboss-osgi/projects/bundles/hotdeploy/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/hotdeploy/trunk/pom.xml 2009-10-21 21:22:43 UTC (rev 95343) +++ projects/jboss-osgi/projects/bundles/hotdeploy/trunk/pom.xml 2009-10-21 21:26:54 UTC (rev 95344) @@ -95,9 +95,9 @@ <Import-Package> javax.management, org.jboss.osgi.common.log;version=1.0, - org.jboss.osgi.deployment.common;version=1.0, - org.jboss.osgi.deployment.deployer;version=1.0, - org.jboss.osgi.deployment.scanner;version=1.0, + org.jboss.osgi.deployment.common, + org.jboss.osgi.deployment.deployer, + org.jboss.osgi.deployment.scanner, org.jboss.osgi.spi.service;version=1.0, org.jboss.osgi.spi.util;version=1.0, org.osgi.framework, Modified: projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml 2009-10-21 21:22:43 UTC (rev 95343) +++ projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml 2009-10-21 21:26:54 UTC (rev 95344) @@ -137,8 +137,8 @@ org.jboss.joinpoint.*, org.jboss.logging, org.jboss.osgi.common.log;version=1.0, - org.jboss.osgi.deployment.common;version=1.0, - org.jboss.osgi.deployment.deployer;version=1.0, + org.jboss.osgi.deployment.common, + org.jboss.osgi.deployment.deployer, org.jboss.osgi.jbossxb;version=2.0, org.jboss.osgi.spi;version=1.0, org.jboss.osgi.spi.management;version=1.0, Modified: projects/jboss-osgi/projects/bundles/webapp/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/webapp/trunk/pom.xml 2009-10-21 21:22:43 UTC (rev 95343) +++ projects/jboss-osgi/projects/bundles/webapp/trunk/pom.xml 2009-10-21 21:26:54 UTC (rev 95344) @@ -101,8 +101,8 @@ javax.servlet.http, javax.xml.parsers, org.apache.commons.logging;version=1.1, - org.jboss.osgi.deployment.common;version=1.0, - org.jboss.osgi.deployment.interceptor;version=1.0, + org.jboss.osgi.deployment.common, + org.jboss.osgi.deployment.interceptor, org.jboss.osgi.spi.capability;version=1.0, org.jboss.virtual, org.ops4j.pax.web.service, Modified: projects/jboss-osgi/projects/runtime/felix/trunk/src/main/java/org/jboss/osgi/felix/FelixBundleContextWrapper.java =================================================================== --- projects/jboss-osgi/projects/runtime/felix/trunk/src/main/java/org/jboss/osgi/felix/FelixBundleContextWrapper.java 2009-10-21 21:22:43 UTC (rev 95343) +++ projects/jboss-osgi/projects/runtime/felix/trunk/src/main/java/org/jboss/osgi/felix/FelixBundleContextWrapper.java 2009-10-21 21:26:54 UTC (rev 95344) @@ -26,7 +26,6 @@ import java.net.MalformedURLException; import java.net.URL; -import org.jboss.logging.Logger; import org.jboss.osgi.deployment.deployer.DeployerService; import org.jboss.osgi.spi.framework.BundleContextWrapper; import org.jboss.osgi.spi.util.BundleInfo; @@ -35,6 +34,8 @@ import org.osgi.framework.BundleException; import org.osgi.framework.ServiceReference; import org.osgi.framework.Version; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * The FelixBundleContextWrapper wrapps the BundleContext provided by the Felix implemenation. @@ -47,7 +48,7 @@ public class FelixBundleContextWrapper extends BundleContextWrapper { // Provide logging - final Logger log = Logger.getLogger(FelixBundleContextWrapper.class); + final Logger log = LoggerFactory.getLogger(FelixBundleContextWrapper.class); public FelixBundleContextWrapper(BundleContext context) { Modified: projects/jboss-osgi/projects/runtime/felix/trunk/src/main/java/org/jboss/osgi/felix/FelixFrameworkWrapper.java =================================================================== --- projects/jboss-osgi/projects/runtime/felix/trunk/src/main/java/org/jboss/osgi/felix/FelixFrameworkWrapper.java 2009-10-21 21:22:43 UTC (rev 95343) +++ projects/jboss-osgi/projects/runtime/felix/trunk/src/main/java/org/jboss/osgi/felix/FelixFrameworkWrapper.java 2009-10-21 21:26:54 UTC (rev 95344) @@ -23,13 +23,14 @@ //$Id$ -import org.jboss.logging.Logger; import org.jboss.osgi.deployment.internal.DeploymentServicesActivator; import org.jboss.osgi.spi.framework.FrameworkWrapper; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; import org.osgi.framework.BundleException; import org.osgi.framework.launch.Framework; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * The FelixFrameworkWrapper wrapps the Framework provided by the Felix implemenation. @@ -40,7 +41,7 @@ class FelixFrameworkWrapper extends FrameworkWrapper { // Provide logging - final Logger log = Logger.getLogger(FelixFrameworkWrapper.class); + final Logger log = LoggerFactory.getLogger(FelixFrameworkWrapper.class); private BundleActivator deploymentServices; 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 2009-10-21 21:22:43 UTC (rev 95343) +++ projects/jboss-osgi/projects/runtime/felix/trunk/src/main/java/org/jboss/osgi/felix/FelixIntegration.java 2009-10-21 21:26:54 UTC (rev 95344) @@ -25,12 +25,13 @@ import java.util.Map; -import org.jboss.logging.Logger; import org.jboss.osgi.spi.framework.FrameworkIntegration; import org.jboss.osgi.spi.util.ServiceLoader; 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. @@ -41,7 +42,7 @@ public class FelixIntegration extends FrameworkIntegration { // Provide logging - final Logger log = Logger.getLogger(FelixIntegration.class); + final Logger log = LoggerFactory.getLogger(FelixIntegration.class); @Override protected Framework createFramework(Map<String, Object> properties) 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 2009-10-21 21:22:43 UTC (rev 95343) +++ projects/jboss-osgi/projects/runtime/felix/trunk/src/main/java/org/jboss/osgi/felix/FelixLogger.java 2009-10-21 21:26:54 UTC (rev 95344) @@ -24,8 +24,9 @@ //$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. @@ -39,7 +40,7 @@ public class FelixLogger extends org.apache.felix.framework.Logger { // Provide logging - final Logger log = Logger.getLogger(FelixLogger.class); + final Logger log = LoggerFactory.getLogger(FelixLogger.class); public FelixLogger() { 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 2009-10-21 21:22:43 UTC (rev 95343) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml 2009-10-21 21:26:54 UTC (rev 95344) @@ -34,6 +34,9 @@ org.apache.log4j;version=1.2, <!-- jboss-osgi --> + org.jboss.osgi.deployment.common, + org.jboss.osgi.deployment.deployer, + org.jboss.osgi.deployment.interceptor, org.jboss.osgi.jbossxb;version=2.0, org.jboss.osgi.microcontainer;version=1.0, org.jboss.osgi.spi;version=1.0, 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 2009-10-21 21:22:43 UTC (rev 95343) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-equinox.properties 2009-10-21 21:26:54 UTC (rev 95344) @@ -61,6 +61,9 @@ org.apache.log4j;version=1.2, \ org.jboss.logging, \ org.jboss.net.protocol, \ + org.jboss.osgi.deployment.common, \ + org.jboss.osgi.deployment.deployer, \ + org.jboss.osgi.deployment.interceptor,\ org.jboss.osgi.spi;version=1.0, \ org.jboss.osgi.spi.capability;version=1.0, \ org.jboss.osgi.spi.logging;version=1.0, \ 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 2009-10-21 21:22:43 UTC (rev 95343) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-felix.properties 2009-10-21 21:26:54 UTC (rev 95344) @@ -22,7 +22,6 @@ org.jboss.osgi.spi.framework.autoStart=\ file://${osgi.home}/server/minimal/deploy/org.apache.felix.log.jar \ file://${osgi.home}/server/minimal/deploy/jboss-osgi-common.jar \ - file://${osgi.home}/server/minimal/deploy/jboss-osgi-deployment.jar \ file://${osgi.home}/server/minimal/deploy/jboss-osgi-hotdeploy.jar \ No newline at end of file Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-all.properties =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-all.properties 2009-10-21 21:22:43 UTC (rev 95343) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-all.properties 2009-10-21 21:26:54 UTC (rev 95344) @@ -30,8 +30,9 @@ org.apache.log4j;version=1.2, \ org.jboss.logging, \ org.jboss.net.protocol, \ - org.jboss.osgi.deployment.common;version=1.0, \ - org.jboss.osgi.deployment.deployer;version=1.0, \ + org.jboss.osgi.deployment.common, \ + org.jboss.osgi.deployment.deployer, \ + org.jboss.osgi.deployment.interceptor, \ org.jboss.osgi.spi;version=1.0, \ org.jboss.osgi.spi.capability;version=1.0, \ org.jboss.osgi.spi.framework;version=1.0, \ Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-default.properties =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-default.properties 2009-10-21 21:22:43 UTC (rev 95343) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-default.properties 2009-10-21 21:26:54 UTC (rev 95344) @@ -24,8 +24,9 @@ org.apache.log4j;version=1.2, \ org.jboss.logging, \ org.jboss.net.protocol, \ - org.jboss.osgi.deployment.common;version=1.0, \ - org.jboss.osgi.deployment.deployer;version=1.0, \ + org.jboss.osgi.deployment.common, \ + org.jboss.osgi.deployment.deployer, \ + org.jboss.osgi.deployment.interceptor, \ org.jboss.osgi.spi;version=1.0, \ org.jboss.osgi.spi.capability;version=1.0, \ org.jboss.osgi.spi.framework;version=1.0, \ Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-minimal.properties =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-minimal.properties 2009-10-21 21:22:43 UTC (rev 95343) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-minimal.properties 2009-10-21 21:26:54 UTC (rev 95344) @@ -10,8 +10,9 @@ org.osgi.framework.system.packages.extra=\ org.apache.log4j;version=1.2, \ org.jboss.logging, \ - org.jboss.osgi.deployment.common;version=1.0, \ - org.jboss.osgi.deployment.deployer;version=1.0, \ + org.jboss.osgi.deployment.common, \ + org.jboss.osgi.deployment.deployer, \ + org.jboss.osgi.deployment.interceptor, \ org.jboss.osgi.spi;version=1.0, \ org.jboss.osgi.spi.capability;version=1.0, \ org.jboss.osgi.spi.framework;version=1.0, \ Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-web.properties =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-web.properties 2009-10-21 21:22:43 UTC (rev 95343) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-web.properties 2009-10-21 21:26:54 UTC (rev 95344) @@ -30,8 +30,9 @@ org.apache.log4j;version=1.2, \ org.jboss.logging, \ org.jboss.net.protocol, \ - org.jboss.osgi.deployment.common;version=1.0, \ - org.jboss.osgi.deployment.deployer;version=1.0, \ + org.jboss.osgi.deployment.common, \ + org.jboss.osgi.deployment.deployer, \ + org.jboss.osgi.deployment.interceptor, \ org.jboss.osgi.spi;version=1.0, \ org.jboss.osgi.spi.capability;version=1.0, \ org.jboss.osgi.spi.framework;version=1.0, \ Modified: projects/jboss-osgi/trunk/reactor/blueprint/impl/pom.xml =================================================================== --- projects/jboss-osgi/trunk/reactor/blueprint/impl/pom.xml 2009-10-21 21:22:43 UTC (rev 95343) +++ projects/jboss-osgi/trunk/reactor/blueprint/impl/pom.xml 2009-10-21 21:26:54 UTC (rev 95344) @@ -76,8 +76,8 @@ org.jboss.dependency.spi*, org.jboss.kernel.spi*, org.jboss.osgi.common.log;version=1.0, - org.jboss.osgi.deployment.common;version=1.0, - org.jboss.osgi.deployment.interceptor;version=1.0, + org.jboss.osgi.deployment.common, + org.jboss.osgi.deployment.interceptor, org.jboss.osgi.jbossxb;version=2.0, org.jboss.osgi.microcontainer;version=1.0, org.jboss.osgi.spi;version=1.0, Modified: projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/resources/jboss-osgi-felix.properties =================================================================== --- projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/resources/jboss-osgi-felix.properties 2009-10-21 21:22:43 UTC (rev 95343) +++ projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/resources/jboss-osgi-felix.properties 2009-10-21 21:26:54 UTC (rev 95344) @@ -18,8 +18,9 @@ org.osgi.framework.system.packages.extra=\ org.apache.log4j;version=1.2, \ org.jboss.logging, \ - org.jboss.osgi.deployment.common;version=1.0, \ - org.jboss.osgi.deployment.deployer;version=1.0, \ + org.jboss.osgi.deployment.common, \ + org.jboss.osgi.deployment.deployer, \ + org.jboss.osgi.deployment.interceptor, \ org.jboss.osgi.spi;version=1.0, \ org.jboss.osgi.spi.capability;version=1.0, \ org.jboss.osgi.spi.logging;version=1.0, \ 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 2009-10-21 21:22:43 UTC (rev 95343) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-equinox.properties 2009-10-21 21:26:54 UTC (rev 95344) @@ -16,8 +16,9 @@ org.apache.log4j;version=1.2, \ org.jboss.logging, \ org.jboss.net.protocol, \ - org.jboss.osgi.deployment.common;version=1.0, \ - org.jboss.osgi.deployment.deployer;version=1.0, \ + org.jboss.osgi.deployment.common, \ + org.jboss.osgi.deployment.deployer, \ + org.jboss.osgi.deployment.interceptor, \ org.jboss.osgi.spi;version=1.0, \ org.jboss.osgi.spi.capability;version=1.0, \ org.jboss.osgi.spi.framework;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 2009-10-21 21:22:43 UTC (rev 95343) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-felix.properties 2009-10-21 21:26:54 UTC (rev 95344) @@ -20,8 +20,9 @@ org.jboss.logging, \ org.jboss.net.protocol, \ org.jboss.osgi.common.log;version=1.0, \ - org.jboss.osgi.deployment.common;version=1.0, \ - org.jboss.osgi.deployment.deployer;version=1.0, \ + org.jboss.osgi.deployment.common, \ + org.jboss.osgi.deployment.deployer, \ + org.jboss.osgi.deployment.interceptor, \ org.jboss.osgi.spi;version=1.0, \ org.jboss.osgi.spi.capability;version=1.0, \ org.jboss.osgi.spi.framework;version=1.0, \ 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 2009-10-21 21:22:43 UTC (rev 95343) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-equinox.properties 2009-10-21 21:26:54 UTC (rev 95344) @@ -17,8 +17,9 @@ org.apache.log4j;version=1.2, \ org.jboss.logging, \ org.jboss.net.protocol, \ - org.jboss.osgi.deployment.common;version=1.0, \ - org.jboss.osgi.deployment.deployer;version=1.0, \ + org.jboss.osgi.deployment.common, \ + org.jboss.osgi.deployment.deployer, \ + org.jboss.osgi.deployment.interceptor, \ org.jboss.osgi.spi;version=1.0, \ org.jboss.osgi.spi.capability;version=1.0, \ org.jboss.osgi.spi.logging;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 2009-10-21 21:22:43 UTC (rev 95343) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-felix.properties 2009-10-21 21:26:54 UTC (rev 95344) @@ -16,8 +16,9 @@ org.apache.log4j;version=1.2, \ org.jboss.logging, \ org.jboss.net.protocol, \ - org.jboss.osgi.deployment.common;version=1.0, \ - org.jboss.osgi.deployment.deployer;version=1.0, \ + org.jboss.osgi.deployment.common, \ + org.jboss.osgi.deployment.deployer, \ + org.jboss.osgi.deployment.interceptor, \ org.jboss.osgi.spi;version=1.0, \ org.jboss.osgi.spi.capability;version=1.0, \ org.jboss.osgi.spi.logging;version=1.0, \