[jboss-osgi-commits] JBoss-OSGI SVN: r89494 - in projects/jboss-osgi/trunk: 3rdparty/apache-xerces/src/main/java/org/jboss/osgi/apache/xerces/internal and 29 other directories.

Author: thomas.diesler(a)jboss.com Date: 2009-05-28 08:41:59 -0400 (Thu, 28 May 2009) New Revision: 89494 Added: projects/jboss-osgi/trunk/bundles/common/src/main/java/org/jboss/osgi/common/log/LogServiceTracker.java Removed: projects/jboss-osgi/trunk/bundles/common/src/main/java/org/jboss/osgi/common/LogServiceTracker.java projects/jboss-osgi/trunk/bundles/logging/bin/.settings/ projects/jboss-osgi/trunk/bundles/logging/bin/src/ Modified: projects/jboss-osgi/trunk/3rdparty/apache-xerces/pom.xml projects/jboss-osgi/trunk/3rdparty/apache-xerces/src/main/java/org/jboss/osgi/apache/xerces/internal/XercesParserActivator.java projects/jboss-osgi/trunk/3rdparty/jbossxb/pom.xml projects/jboss-osgi/trunk/3rdparty/jbossxb/src/main/java/org/jboss/osgi/jbossxb/internal/XMLBindingActivator.java projects/jboss-osgi/trunk/blueprint/impl/pom.xml projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/extender/BlueprintExtender.java projects/jboss-osgi/trunk/bundles/common/pom.xml projects/jboss-osgi/trunk/bundles/hotdeploy/pom.xml projects/jboss-osgi/trunk/bundles/hotdeploy/src/main/java/org/jboss/osgi/service/hotdeploy/internal/DeploymentScannerImpl.java projects/jboss-osgi/trunk/bundles/hotdeploy/src/main/java/org/jboss/osgi/service/hotdeploy/internal/ScannerThread.java projects/jboss-osgi/trunk/bundles/jmx/pom.xml projects/jboss-osgi/trunk/bundles/jmx/src/main/java/org/jboss/osgi/jmx/internal/JMXConnectorService.java projects/jboss-osgi/trunk/bundles/jmx/src/main/java/org/jboss/osgi/jmx/internal/MBeanServerService.java projects/jboss-osgi/trunk/bundles/jmx/src/main/java/org/jboss/osgi/jmx/internal/MBeanServerServiceActivator.java projects/jboss-osgi/trunk/bundles/jndi/pom.xml projects/jboss-osgi/trunk/bundles/jndi/src/main/java/org/jboss/osgi/jndi/internal/InitialContextServiceActivator.java projects/jboss-osgi/trunk/bundles/jndi/src/main/java/org/jboss/osgi/jndi/internal/JNPServer.java projects/jboss-osgi/trunk/bundles/microcontainer/pom.xml projects/jboss-osgi/trunk/bundles/microcontainer/src/main/java/org/jboss/osgi/microcontainer/internal/EmbeddedBeansDeployer.java projects/jboss-osgi/trunk/bundles/microcontainer/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerServiceImpl.java projects/jboss-osgi/trunk/distribution/runtime/conf/jboss-osgi-felix.properties projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/log/bundle/ServiceA.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi37/bundleA/ServiceA.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi37/bundleB/ServiceB.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi41/bundleA/ServiceA.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi41/bundleA/ServiceB.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/startlevel/bundle/ServiceActivator.java projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/java/org/jboss/test/osgi/trailblazer/frontend/HttpRenderServlet.java projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/java/org/jboss/test/osgi/trailblazer/frontend/ServiceActivator.java projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/java/org/jboss/test/osgi/trailblazer/mall/ServiceActivator.java projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/java/org/jboss/test/osgi/trailblazer/pay/creditcard/ServiceActivator.java projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/java/org/jboss/test/osgi/trailblazer/pay/paypal/ServiceActivator.java projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/java/org/jboss/test/osgi/trailblazer/shop/pets/ServiceActivator.java projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/java/org/jboss/test/osgi/trailblazer/shop/sports/ServiceActivator.java projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/resources/trailblazer/frontend.bnd projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/resources/trailblazer/mall.bnd projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/resources/trailblazer/pay-creditcard.bnd projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/resources/trailblazer/pay-paypal.bnd projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/resources/trailblazer/shop-pets.bnd projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/resources/trailblazer/shop-sports.bnd Log: Move LogServiceTracker to common.log Modified: projects/jboss-osgi/trunk/3rdparty/apache-xerces/pom.xml =================================================================== --- projects/jboss-osgi/trunk/3rdparty/apache-xerces/pom.xml 2009-05-28 12:23:40 UTC (rev 89493) +++ projects/jboss-osgi/trunk/3rdparty/apache-xerces/pom.xml 2009-05-28 12:41:59 UTC (rev 89494) @@ -85,7 +85,7 @@ org.xml.sax*, <!-- import --> - org.jboss.osgi.common;version=1.0, + org.jboss.osgi.common.log;version=1.0, org.osgi.framework, org.osgi.service.log, org.osgi.util.xml, Modified: projects/jboss-osgi/trunk/3rdparty/apache-xerces/src/main/java/org/jboss/osgi/apache/xerces/internal/XercesParserActivator.java =================================================================== --- projects/jboss-osgi/trunk/3rdparty/apache-xerces/src/main/java/org/jboss/osgi/apache/xerces/internal/XercesParserActivator.java 2009-05-28 12:23:40 UTC (rev 89493) +++ projects/jboss-osgi/trunk/3rdparty/apache-xerces/src/main/java/org/jboss/osgi/apache/xerces/internal/XercesParserActivator.java 2009-05-28 12:41:59 UTC (rev 89494) @@ -26,7 +26,7 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.SAXParserFactory; -import org.jboss.osgi.common.LogServiceTracker; +import org.jboss.osgi.common.log.LogServiceTracker; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; import org.osgi.service.log.LogService; Modified: projects/jboss-osgi/trunk/3rdparty/jbossxb/pom.xml =================================================================== --- projects/jboss-osgi/trunk/3rdparty/jbossxb/pom.xml 2009-05-28 12:23:40 UTC (rev 89493) +++ projects/jboss-osgi/trunk/3rdparty/jbossxb/pom.xml 2009-05-28 12:41:59 UTC (rev 89494) @@ -78,7 +78,7 @@ com.wutka.dtd, org.apache.xerces.*, org.jboss.logging, - org.jboss.osgi.common;version=1.0, + org.jboss.osgi.common.log;version=1.0, org.jboss.util*, org.osgi.framework, org.osgi.service.log, Modified: projects/jboss-osgi/trunk/3rdparty/jbossxb/src/main/java/org/jboss/osgi/jbossxb/internal/XMLBindingActivator.java =================================================================== --- projects/jboss-osgi/trunk/3rdparty/jbossxb/src/main/java/org/jboss/osgi/jbossxb/internal/XMLBindingActivator.java 2009-05-28 12:23:40 UTC (rev 89493) +++ projects/jboss-osgi/trunk/3rdparty/jbossxb/src/main/java/org/jboss/osgi/jbossxb/internal/XMLBindingActivator.java 2009-05-28 12:41:59 UTC (rev 89494) @@ -26,7 +26,7 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.SAXParserFactory; -import org.jboss.osgi.common.LogServiceTracker; +import org.jboss.osgi.common.log.LogServiceTracker; import org.jboss.xb.binding.parser.sax.SaxJBossXBParser; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; Modified: projects/jboss-osgi/trunk/blueprint/impl/pom.xml =================================================================== --- projects/jboss-osgi/trunk/blueprint/impl/pom.xml 2009-05-28 12:23:40 UTC (rev 89493) +++ projects/jboss-osgi/trunk/blueprint/impl/pom.xml 2009-05-28 12:41:59 UTC (rev 89494) @@ -65,7 +65,7 @@ <Import-Package> org.apache.xerces.dom, org.jboss.osgi.spi, - org.jboss.osgi.common;version=1.0, + org.jboss.osgi.common.log;version=1.0, org.jboss.xb.*, org.osgi.framework, org.osgi.service.log, Modified: projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/extender/BlueprintExtender.java =================================================================== --- projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/extender/BlueprintExtender.java 2009-05-28 12:23:40 UTC (rev 89493) +++ projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/extender/BlueprintExtender.java 2009-05-28 12:41:59 UTC (rev 89494) @@ -29,7 +29,7 @@ import org.jboss.osgi.blueprint.context.BlueprintContextImpl; import org.jboss.osgi.blueprint.parser.BlueprintParser; import org.jboss.osgi.blueprint.reflect.Blueprint; -import org.jboss.osgi.common.LogServiceTracker; +import org.jboss.osgi.common.log.LogServiceTracker; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.BundleEvent; Modified: projects/jboss-osgi/trunk/bundles/common/pom.xml =================================================================== --- projects/jboss-osgi/trunk/bundles/common/pom.xml 2009-05-28 12:23:40 UTC (rev 89493) +++ projects/jboss-osgi/trunk/bundles/common/pom.xml 2009-05-28 12:41:59 UTC (rev 89494) @@ -47,7 +47,6 @@ <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName> <Bundle-Activator>org.jboss.osgi.common.internal.CommonServicesActivator</Bundle-Activator> <Export-Package> - org.jboss.osgi.common;version=${version}, org.jboss.osgi.common.service;version=${version}, org.jboss.osgi.common.log;version=${version} </Export-Package> Deleted: projects/jboss-osgi/trunk/bundles/common/src/main/java/org/jboss/osgi/common/LogServiceTracker.java =================================================================== --- projects/jboss-osgi/trunk/bundles/common/src/main/java/org/jboss/osgi/common/LogServiceTracker.java 2009-05-28 12:23:40 UTC (rev 89493) +++ projects/jboss-osgi/trunk/bundles/common/src/main/java/org/jboss/osgi/common/LogServiceTracker.java 2009-05-28 12:41:59 UTC (rev 89494) @@ -1,86 +0,0 @@ -/* - * 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.common; - -//$Id$ - -import org.jboss.osgi.common.service.SystemLogService; -import org.osgi.framework.BundleContext; -import org.osgi.framework.ServiceReference; -import org.osgi.service.log.LogService; -import org.osgi.util.tracker.ServiceTracker; - -/** - * A combined ServiceTracker/LogService that bundles can use to access the registered LogService. - * - * If a LogService is registered, the LogServiceTracker delegates to that LogService. - * If there is no LogService registered, the LogServiceTracker delegates to the {@link SystemLogService} - * - * - * @author thomas.diesler(a)jboss.com - * @since 11-Apr-2009 - */ -public class LogServiceTracker extends ServiceTracker implements LogService -{ - private LogService log; - - public LogServiceTracker(BundleContext context) - { - super(context, LogService.class.getName(), null); - log = new SystemLogService(context); - open(); - } - - @Override - public Object addingService(ServiceReference reference) - { - log = (LogService)super.addingService(reference); - return log; - } - - @Override - public void removedService(ServiceReference reference, Object service) - { - super.removedService(reference, service); - log = new SystemLogService(context); - } - - public void log(int level, String message) - { - log.log(level, message); - } - - public void log(int level, String message, Throwable exception) - { - log.log(level, message, exception); - } - - public void log(ServiceReference sr, int level, String message) - { - log.log(sr, level, message); - } - - public void log(ServiceReference sr, int level, String message, Throwable exception) - { - log.log(sr, level, message, exception); - } -} \ No newline at end of file Copied: projects/jboss-osgi/trunk/bundles/common/src/main/java/org/jboss/osgi/common/log/LogServiceTracker.java (from rev 89492, projects/jboss-osgi/trunk/bundles/common/src/main/java/org/jboss/osgi/common/LogServiceTracker.java) =================================================================== --- projects/jboss-osgi/trunk/bundles/common/src/main/java/org/jboss/osgi/common/log/LogServiceTracker.java (rev 0) +++ projects/jboss-osgi/trunk/bundles/common/src/main/java/org/jboss/osgi/common/log/LogServiceTracker.java 2009-05-28 12:41:59 UTC (rev 89494) @@ -0,0 +1,86 @@ +/* + * 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.common.log; + +//$Id$ + +import org.jboss.osgi.common.service.SystemLogService; +import org.osgi.framework.BundleContext; +import org.osgi.framework.ServiceReference; +import org.osgi.service.log.LogService; +import org.osgi.util.tracker.ServiceTracker; + +/** + * A combined ServiceTracker/LogService that bundles can use to access the registered LogService. + * + * If a LogService is registered, the LogServiceTracker delegates to that LogService. + * If there is no LogService registered, the LogServiceTracker delegates to the {@link SystemLogService} + * + * + * @author thomas.diesler(a)jboss.com + * @since 11-Apr-2009 + */ +public class LogServiceTracker extends ServiceTracker implements LogService +{ + private LogService log; + + public LogServiceTracker(BundleContext context) + { + super(context, LogService.class.getName(), null); + log = new SystemLogService(context); + open(); + } + + @Override + public Object addingService(ServiceReference reference) + { + log = (LogService)super.addingService(reference); + return log; + } + + @Override + public void removedService(ServiceReference reference, Object service) + { + super.removedService(reference, service); + log = new SystemLogService(context); + } + + public void log(int level, String message) + { + log.log(level, message); + } + + public void log(int level, String message, Throwable exception) + { + log.log(level, message, exception); + } + + public void log(ServiceReference sr, int level, String message) + { + log.log(sr, level, message); + } + + public void log(ServiceReference sr, int level, String message, Throwable exception) + { + log.log(sr, level, message, exception); + } +} \ No newline at end of file Modified: projects/jboss-osgi/trunk/bundles/hotdeploy/pom.xml =================================================================== --- projects/jboss-osgi/trunk/bundles/hotdeploy/pom.xml 2009-05-28 12:23:40 UTC (rev 89493) +++ projects/jboss-osgi/trunk/bundles/hotdeploy/pom.xml 2009-05-28 12:41:59 UTC (rev 89494) @@ -52,7 +52,7 @@ <Bundle-Activator>org.jboss.osgi.service.hotdeploy.internal.DeploymentScannerActivator</Bundle-Activator> <Private-Package>org.jboss.osgi.service.hotdeploy.internal</Private-Package> <Import-Package> - org.jboss.osgi.common;version="1.0", + org.jboss.osgi.common.log;version="1.0", org.jboss.osgi.common.service;version="1.0", org.osgi.framework, org.osgi.service.log, Modified: projects/jboss-osgi/trunk/bundles/hotdeploy/src/main/java/org/jboss/osgi/service/hotdeploy/internal/DeploymentScannerImpl.java =================================================================== --- projects/jboss-osgi/trunk/bundles/hotdeploy/src/main/java/org/jboss/osgi/service/hotdeploy/internal/DeploymentScannerImpl.java 2009-05-28 12:23:40 UTC (rev 89493) +++ projects/jboss-osgi/trunk/bundles/hotdeploy/src/main/java/org/jboss/osgi/service/hotdeploy/internal/DeploymentScannerImpl.java 2009-05-28 12:41:59 UTC (rev 89494) @@ -36,7 +36,7 @@ import java.util.jar.JarFile; import java.util.jar.Manifest; -import org.jboss.osgi.common.LogServiceTracker; +import org.jboss.osgi.common.log.LogServiceTracker; import org.jboss.osgi.common.service.DeploymentScanner; import org.jboss.osgi.common.service.DeploymentScanner.BundleInfo.State; import org.osgi.framework.Bundle; Modified: projects/jboss-osgi/trunk/bundles/hotdeploy/src/main/java/org/jboss/osgi/service/hotdeploy/internal/ScannerThread.java =================================================================== --- projects/jboss-osgi/trunk/bundles/hotdeploy/src/main/java/org/jboss/osgi/service/hotdeploy/internal/ScannerThread.java 2009-05-28 12:23:40 UTC (rev 89493) +++ projects/jboss-osgi/trunk/bundles/hotdeploy/src/main/java/org/jboss/osgi/service/hotdeploy/internal/ScannerThread.java 2009-05-28 12:41:59 UTC (rev 89494) @@ -23,7 +23,7 @@ //$Id$ -import org.jboss.osgi.common.LogServiceTracker; +import org.jboss.osgi.common.log.LogServiceTracker; import org.jboss.osgi.common.service.DeploymentScanner; import org.osgi.framework.BundleContext; import org.osgi.service.log.LogService; Modified: projects/jboss-osgi/trunk/bundles/jmx/pom.xml =================================================================== --- projects/jboss-osgi/trunk/bundles/jmx/pom.xml 2009-05-28 12:23:40 UTC (rev 89493) +++ projects/jboss-osgi/trunk/bundles/jmx/pom.xml 2009-05-28 12:41:59 UTC (rev 89494) @@ -66,7 +66,7 @@ javax.naming.spi, <!-- jboss-osgi --> - org.jboss.osgi.common;version="1.0", + org.jboss.osgi.common.log;version="1.0", <!-- osgi --> org.osgi.framework;version=1.4, Modified: projects/jboss-osgi/trunk/bundles/jmx/src/main/java/org/jboss/osgi/jmx/internal/JMXConnectorService.java =================================================================== --- projects/jboss-osgi/trunk/bundles/jmx/src/main/java/org/jboss/osgi/jmx/internal/JMXConnectorService.java 2009-05-28 12:23:40 UTC (rev 89493) +++ projects/jboss-osgi/trunk/bundles/jmx/src/main/java/org/jboss/osgi/jmx/internal/JMXConnectorService.java 2009-05-28 12:41:59 UTC (rev 89494) @@ -36,7 +36,7 @@ import javax.management.remote.JMXServiceURL; import org.jboss.net.sockets.DefaultSocketFactory; -import org.jboss.osgi.common.LogServiceTracker; +import org.jboss.osgi.common.log.LogServiceTracker; import org.osgi.framework.BundleContext; import org.osgi.service.log.LogService; Modified: projects/jboss-osgi/trunk/bundles/jmx/src/main/java/org/jboss/osgi/jmx/internal/MBeanServerService.java =================================================================== --- projects/jboss-osgi/trunk/bundles/jmx/src/main/java/org/jboss/osgi/jmx/internal/MBeanServerService.java 2009-05-28 12:23:40 UTC (rev 89493) +++ projects/jboss-osgi/trunk/bundles/jmx/src/main/java/org/jboss/osgi/jmx/internal/MBeanServerService.java 2009-05-28 12:41:59 UTC (rev 89494) @@ -28,7 +28,7 @@ import javax.management.MBeanServer; import javax.management.MBeanServerFactory; -import org.jboss.osgi.common.LogServiceTracker; +import org.jboss.osgi.common.log.LogServiceTracker; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; import org.osgi.service.log.LogService; Modified: projects/jboss-osgi/trunk/bundles/jmx/src/main/java/org/jboss/osgi/jmx/internal/MBeanServerServiceActivator.java =================================================================== --- projects/jboss-osgi/trunk/bundles/jmx/src/main/java/org/jboss/osgi/jmx/internal/MBeanServerServiceActivator.java 2009-05-28 12:23:40 UTC (rev 89493) +++ projects/jboss-osgi/trunk/bundles/jmx/src/main/java/org/jboss/osgi/jmx/internal/MBeanServerServiceActivator.java 2009-05-28 12:41:59 UTC (rev 89494) @@ -31,7 +31,7 @@ import javax.naming.Reference; import javax.naming.StringRefAddr; -import org.jboss.osgi.common.LogServiceTracker; +import org.jboss.osgi.common.log.LogServiceTracker; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; Modified: projects/jboss-osgi/trunk/bundles/jndi/pom.xml =================================================================== --- projects/jboss-osgi/trunk/bundles/jndi/pom.xml 2009-05-28 12:23:40 UTC (rev 89493) +++ projects/jboss-osgi/trunk/bundles/jndi/pom.xml 2009-05-28 12:41:59 UTC (rev 89494) @@ -65,7 +65,7 @@ javax.net, org.jboss.logging, org.jboss.net.sockets, - org.jboss.osgi.common;version="1.0", + org.jboss.osgi.common.log;version="1.0", org.jboss.util.naming, org.jboss.util.threadpool, org.osgi.framework, Modified: projects/jboss-osgi/trunk/bundles/jndi/src/main/java/org/jboss/osgi/jndi/internal/InitialContextServiceActivator.java =================================================================== --- projects/jboss-osgi/trunk/bundles/jndi/src/main/java/org/jboss/osgi/jndi/internal/InitialContextServiceActivator.java 2009-05-28 12:23:40 UTC (rev 89493) +++ projects/jboss-osgi/trunk/bundles/jndi/src/main/java/org/jboss/osgi/jndi/internal/InitialContextServiceActivator.java 2009-05-28 12:41:59 UTC (rev 89494) @@ -25,7 +25,7 @@ import javax.naming.InitialContext; -import org.jboss.osgi.common.LogServiceTracker; +import org.jboss.osgi.common.log.LogServiceTracker; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceRegistration; Modified: projects/jboss-osgi/trunk/bundles/jndi/src/main/java/org/jboss/osgi/jndi/internal/JNPServer.java =================================================================== --- projects/jboss-osgi/trunk/bundles/jndi/src/main/java/org/jboss/osgi/jndi/internal/JNPServer.java 2009-05-28 12:23:40 UTC (rev 89493) +++ projects/jboss-osgi/trunk/bundles/jndi/src/main/java/org/jboss/osgi/jndi/internal/JNPServer.java 2009-05-28 12:41:59 UTC (rev 89494) @@ -33,7 +33,7 @@ import javax.naming.NamingException; import org.jboss.net.sockets.DefaultSocketFactory; -import org.jboss.osgi.common.LogServiceTracker; +import org.jboss.osgi.common.log.LogServiceTracker; import org.jnp.interfaces.Naming; import org.jnp.server.Main; import org.jnp.server.NamingBean; Modified: projects/jboss-osgi/trunk/bundles/microcontainer/pom.xml =================================================================== --- projects/jboss-osgi/trunk/bundles/microcontainer/pom.xml 2009-05-28 12:23:40 UTC (rev 89493) +++ projects/jboss-osgi/trunk/bundles/microcontainer/pom.xml 2009-05-28 12:41:59 UTC (rev 89494) @@ -104,7 +104,7 @@ org.jboss.deployers.*, org.jboss.joinpoint.*, org.jboss.logging, - org.jboss.osgi.common;version="1.0", + org.jboss.osgi.common.log;version="1.0", org.jboss.osgi.common.service;version="1.0", org.jboss.osgi.spi;version="1.0", org.jboss.osgi.spi.management;version="1.0", Modified: projects/jboss-osgi/trunk/bundles/microcontainer/src/main/java/org/jboss/osgi/microcontainer/internal/EmbeddedBeansDeployer.java =================================================================== --- projects/jboss-osgi/trunk/bundles/microcontainer/src/main/java/org/jboss/osgi/microcontainer/internal/EmbeddedBeansDeployer.java 2009-05-28 12:23:40 UTC (rev 89493) +++ projects/jboss-osgi/trunk/bundles/microcontainer/src/main/java/org/jboss/osgi/microcontainer/internal/EmbeddedBeansDeployer.java 2009-05-28 12:41:59 UTC (rev 89494) @@ -27,7 +27,7 @@ import org.jboss.kernel.plugins.bootstrap.basic.BasicBootstrap; import org.jboss.kernel.plugins.deployment.xml.BasicXMLDeployer; -import org.jboss.osgi.common.LogServiceTracker; +import org.jboss.osgi.common.log.LogServiceTracker; import org.osgi.framework.BundleContext; import org.osgi.service.log.LogService; Modified: projects/jboss-osgi/trunk/bundles/microcontainer/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerServiceImpl.java =================================================================== --- projects/jboss-osgi/trunk/bundles/microcontainer/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerServiceImpl.java 2009-05-28 12:23:40 UTC (rev 89493) +++ projects/jboss-osgi/trunk/bundles/microcontainer/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerServiceImpl.java 2009-05-28 12:41:59 UTC (rev 89494) @@ -48,7 +48,7 @@ import org.jboss.kernel.Kernel; import org.jboss.kernel.spi.dependency.KernelController; import org.jboss.kernel.spi.dependency.KernelControllerContext; -import org.jboss.osgi.common.LogServiceTracker; +import org.jboss.osgi.common.log.LogServiceTracker; import org.jboss.osgi.common.service.MicrocontainerService; import org.jboss.osgi.microcontainer.MicrocontainerServiceMBean; import org.jboss.virtual.VFS; Modified: projects/jboss-osgi/trunk/distribution/runtime/conf/jboss-osgi-felix.properties =================================================================== --- projects/jboss-osgi/trunk/distribution/runtime/conf/jboss-osgi-felix.properties 2009-05-28 12:23:40 UTC (rev 89493) +++ projects/jboss-osgi/trunk/distribution/runtime/conf/jboss-osgi-felix.properties 2009-05-28 12:41:59 UTC (rev 89494) @@ -74,6 +74,7 @@ file://${osgi.home}/bundles/jboss-osgi-common.jar \ file://${osgi.home}/bundles/jboss-osgi-common-core.jar \ file://${osgi.home}/bundles/jboss-osgi-jmx.jar \ + file://${osgi.home}/bundles/jboss-osgi-jaxb.jar \ file://${osgi.home}/bundles/jboss-osgi-apache-xerces.jar \ file://${osgi.home}/bundles/jboss-osgi-xml-binding.jar \ file://${osgi.home}/bundles/jboss-osgi-microcontainer.jar \ Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/log/bundle/ServiceA.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/log/bundle/ServiceA.java 2009-05-28 12:23:40 UTC (rev 89493) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/log/bundle/ServiceA.java 2009-05-28 12:41:59 UTC (rev 89494) @@ -25,7 +25,7 @@ import static org.osgi.service.log.LogService.LOG_INFO; -import org.jboss.osgi.common.LogServiceTracker; +import org.jboss.osgi.common.log.LogServiceTracker; import org.osgi.framework.BundleContext; import org.osgi.service.log.LogService; Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi37/bundleA/ServiceA.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi37/bundleA/ServiceA.java 2009-05-28 12:23:40 UTC (rev 89493) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi37/bundleA/ServiceA.java 2009-05-28 12:41:59 UTC (rev 89494) @@ -23,7 +23,7 @@ //$Id: ServiceA.java 87351 2009-04-15 14:25:32Z thomas.diesler(a)jboss.com $ -import org.jboss.osgi.common.LogServiceTracker; +import org.jboss.osgi.common.log.LogServiceTracker; import org.jboss.test.osgi.jbosgi37.subA.PojoA; import org.osgi.framework.BundleContext; import org.osgi.service.log.LogService; Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi37/bundleB/ServiceB.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi37/bundleB/ServiceB.java 2009-05-28 12:23:40 UTC (rev 89493) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi37/bundleB/ServiceB.java 2009-05-28 12:41:59 UTC (rev 89494) @@ -23,7 +23,7 @@ //$Id: ServiceB.java 87351 2009-04-15 14:25:32Z thomas.diesler(a)jboss.com $ -import org.jboss.osgi.common.LogServiceTracker; +import org.jboss.osgi.common.log.LogServiceTracker; import org.jboss.test.osgi.jbosgi37.subB.PojoB; import org.osgi.framework.BundleContext; import org.osgi.service.log.LogService; Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi41/bundleA/ServiceA.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi41/bundleA/ServiceA.java 2009-05-28 12:23:40 UTC (rev 89493) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi41/bundleA/ServiceA.java 2009-05-28 12:41:59 UTC (rev 89494) @@ -28,7 +28,7 @@ import java.io.IOException; import java.io.OutputStreamWriter; -import org.jboss.osgi.common.LogServiceTracker; +import org.jboss.osgi.common.log.LogServiceTracker; import org.osgi.framework.BundleContext; import org.osgi.service.log.LogService; Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi41/bundleA/ServiceB.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi41/bundleA/ServiceB.java 2009-05-28 12:23:40 UTC (rev 89493) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi41/bundleA/ServiceB.java 2009-05-28 12:41:59 UTC (rev 89494) @@ -27,7 +27,7 @@ import java.util.Dictionary; import java.util.Hashtable; -import org.jboss.osgi.common.LogServiceTracker; +import org.jboss.osgi.common.log.LogServiceTracker; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; import org.osgi.service.cm.Configuration; Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/startlevel/bundle/ServiceActivator.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/startlevel/bundle/ServiceActivator.java 2009-05-28 12:23:40 UTC (rev 89493) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/startlevel/bundle/ServiceActivator.java 2009-05-28 12:41:59 UTC (rev 89494) @@ -23,7 +23,7 @@ //$Id: ServiceActivator.java 87336 2009-04-15 11:31:26Z thomas.diesler(a)jboss.com $ -import org.jboss.osgi.common.LogServiceTracker; +import org.jboss.osgi.common.log.LogServiceTracker; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; import org.osgi.service.log.LogService; Modified: projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/java/org/jboss/test/osgi/trailblazer/frontend/HttpRenderServlet.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/java/org/jboss/test/osgi/trailblazer/frontend/HttpRenderServlet.java 2009-05-28 12:23:40 UTC (rev 89493) +++ projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/java/org/jboss/test/osgi/trailblazer/frontend/HttpRenderServlet.java 2009-05-28 12:41:59 UTC (rev 89494) @@ -34,7 +34,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.jboss.osgi.common.LogServiceTracker; +import org.jboss.osgi.common.log.LogServiceTracker; import org.jboss.test.osgi.trailblazer.ShoppingMall; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; Modified: projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/java/org/jboss/test/osgi/trailblazer/frontend/ServiceActivator.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/java/org/jboss/test/osgi/trailblazer/frontend/ServiceActivator.java 2009-05-28 12:23:40 UTC (rev 89493) +++ projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/java/org/jboss/test/osgi/trailblazer/frontend/ServiceActivator.java 2009-05-28 12:41:59 UTC (rev 89494) @@ -23,7 +23,7 @@ //$Id$ -import org.jboss.osgi.common.LogServiceTracker; +import org.jboss.osgi.common.log.LogServiceTracker; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; Modified: projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/java/org/jboss/test/osgi/trailblazer/mall/ServiceActivator.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/java/org/jboss/test/osgi/trailblazer/mall/ServiceActivator.java 2009-05-28 12:23:40 UTC (rev 89493) +++ projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/java/org/jboss/test/osgi/trailblazer/mall/ServiceActivator.java 2009-05-28 12:41:59 UTC (rev 89494) @@ -23,7 +23,7 @@ //$Id$ -import org.jboss.osgi.common.LogServiceTracker; +import org.jboss.osgi.common.log.LogServiceTracker; import org.jboss.test.osgi.trailblazer.ShoppingMall; import org.jboss.test.osgi.trailblazer.frontend.HttpRenderServlet; import org.osgi.framework.BundleActivator; Modified: projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/java/org/jboss/test/osgi/trailblazer/pay/creditcard/ServiceActivator.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/java/org/jboss/test/osgi/trailblazer/pay/creditcard/ServiceActivator.java 2009-05-28 12:23:40 UTC (rev 89493) +++ projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/java/org/jboss/test/osgi/trailblazer/pay/creditcard/ServiceActivator.java 2009-05-28 12:41:59 UTC (rev 89494) @@ -25,7 +25,7 @@ import java.util.Hashtable; -import org.jboss.osgi.common.LogServiceTracker; +import org.jboss.osgi.common.log.LogServiceTracker; import org.jboss.test.osgi.trailblazer.PaymentService; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; Modified: projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/java/org/jboss/test/osgi/trailblazer/pay/paypal/ServiceActivator.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/java/org/jboss/test/osgi/trailblazer/pay/paypal/ServiceActivator.java 2009-05-28 12:23:40 UTC (rev 89493) +++ projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/java/org/jboss/test/osgi/trailblazer/pay/paypal/ServiceActivator.java 2009-05-28 12:41:59 UTC (rev 89494) @@ -25,7 +25,7 @@ import java.util.Hashtable; -import org.jboss.osgi.common.LogServiceTracker; +import org.jboss.osgi.common.log.LogServiceTracker; import org.jboss.test.osgi.trailblazer.PaymentService; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; Modified: projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/java/org/jboss/test/osgi/trailblazer/shop/pets/ServiceActivator.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/java/org/jboss/test/osgi/trailblazer/shop/pets/ServiceActivator.java 2009-05-28 12:23:40 UTC (rev 89493) +++ projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/java/org/jboss/test/osgi/trailblazer/shop/pets/ServiceActivator.java 2009-05-28 12:41:59 UTC (rev 89494) @@ -23,7 +23,7 @@ //$Id$ -import org.jboss.osgi.common.LogServiceTracker; +import org.jboss.osgi.common.log.LogServiceTracker; import org.jboss.test.osgi.trailblazer.Shop; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; Modified: projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/java/org/jboss/test/osgi/trailblazer/shop/sports/ServiceActivator.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/java/org/jboss/test/osgi/trailblazer/shop/sports/ServiceActivator.java 2009-05-28 12:23:40 UTC (rev 89493) +++ projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/java/org/jboss/test/osgi/trailblazer/shop/sports/ServiceActivator.java 2009-05-28 12:41:59 UTC (rev 89494) @@ -23,7 +23,7 @@ //$Id$ -import org.jboss.osgi.common.LogServiceTracker; +import org.jboss.osgi.common.log.LogServiceTracker; import org.jboss.test.osgi.trailblazer.Shop; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; Modified: projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/resources/trailblazer/frontend.bnd =================================================================== --- projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/resources/trailblazer/frontend.bnd 2009-05-28 12:23:40 UTC (rev 89493) +++ projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/resources/trailblazer/frontend.bnd 2009-05-28 12:41:59 UTC (rev 89494) @@ -14,7 +14,7 @@ org.osgi.service.http, \ org.osgi.service.log, \ org.osgi.util.tracker, \ - org.jboss.osgi.common + org.jboss.osgi.common.log Include-Resource: \ style/osgishop.css=../META-INF/style/osgishop.css, \ Modified: projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/resources/trailblazer/mall.bnd =================================================================== --- projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/resources/trailblazer/mall.bnd 2009-05-28 12:23:40 UTC (rev 89493) +++ projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/resources/trailblazer/mall.bnd 2009-05-28 12:41:59 UTC (rev 89494) @@ -9,6 +9,6 @@ Import-Package: \ org.osgi.framework, \ org.osgi.service.log, \ - org.jboss.osgi.common, \ + org.jboss.osgi.common.log, \ org.jboss.test.osgi.trailblazer \ No newline at end of file Modified: projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/resources/trailblazer/pay-creditcard.bnd =================================================================== --- projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/resources/trailblazer/pay-creditcard.bnd 2009-05-28 12:23:40 UTC (rev 89493) +++ projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/resources/trailblazer/pay-creditcard.bnd 2009-05-28 12:41:59 UTC (rev 89494) @@ -8,5 +8,5 @@ Import-Package: \ org.osgi.framework, \ org.osgi.service.log, \ - org.jboss.osgi.common, \ + org.jboss.osgi.common.log, \ org.jboss.test.osgi.trailblazer Modified: projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/resources/trailblazer/pay-paypal.bnd =================================================================== --- projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/resources/trailblazer/pay-paypal.bnd 2009-05-28 12:23:40 UTC (rev 89493) +++ projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/resources/trailblazer/pay-paypal.bnd 2009-05-28 12:41:59 UTC (rev 89494) @@ -8,5 +8,5 @@ Import-Package: \ org.osgi.framework, \ org.osgi.service.log, \ - org.jboss.osgi.common, \ + org.jboss.osgi.common.log, \ org.jboss.test.osgi.trailblazer Modified: projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/resources/trailblazer/shop-pets.bnd =================================================================== --- projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/resources/trailblazer/shop-pets.bnd 2009-05-28 12:23:40 UTC (rev 89493) +++ projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/resources/trailblazer/shop-pets.bnd 2009-05-28 12:41:59 UTC (rev 89494) @@ -8,5 +8,5 @@ Import-Package: \ org.osgi.framework, \ org.osgi.service.log, \ - org.jboss.osgi.common, \ + org.jboss.osgi.common.log, \ org.jboss.test.osgi.trailblazer Modified: projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/resources/trailblazer/shop-sports.bnd =================================================================== --- projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/resources/trailblazer/shop-sports.bnd 2009-05-28 12:23:40 UTC (rev 89493) +++ projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/resources/trailblazer/shop-sports.bnd 2009-05-28 12:41:59 UTC (rev 89494) @@ -10,5 +10,5 @@ org.osgi.framework, \ org.osgi.service.log, \ org.jboss.osgi.jndi, \ - org.jboss.osgi.common, \ + org.jboss.osgi.common.log, \ org.jboss.test.osgi.trailblazer