[jboss-cvs] JBossAS SVN: r87408 - in projects/jboss-osgi/trunk: build/distribution and 33 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Apr 16 06:17:13 EDT 2009
Author: thomas.diesler at jboss.com
Date: 2009-04-16 06:17:13 -0400 (Thu, 16 Apr 2009)
New Revision: 87408
Added:
projects/jboss-osgi/trunk/spi/
projects/jboss-osgi/trunk/spi/pom.xml
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/service/log/
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/service/log/LogEntryCache.java
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/service/log/LogEntryFilter.java
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/service/log/LogServiceTracker.java
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/service/log/RemoteLogReaderService.java
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/service/log/StringConstants.java
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/service/log/SystemLogService.java
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/service/log/internal/
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/service/log/internal/LogEntryImpl.java
Removed:
projects/jboss-osgi/trunk/bundle/common/
projects/jboss-osgi/trunk/bundle/remotelog/src/main/java/org/jboss/osgi/service/remotelog/RemoteLogReaderService.java
projects/jboss-osgi/trunk/runtime/spi/
projects/jboss-osgi/trunk/runtime/testing/src/main/java/org/jboss/osgi/service/
projects/jboss-osgi/trunk/runtime/testing/src/main/java/org/jboss/osgi/spi/framework/
projects/jboss-osgi/trunk/runtime/testing/src/main/java/org/jboss/osgi/spi/internal/
projects/jboss-osgi/trunk/runtime/testing/src/main/java/org/jboss/osgi/spi/management/
projects/jboss-osgi/trunk/runtime/testing/src/main/java/org/jboss/osgi/spi/service/
projects/jboss-osgi/trunk/spi/pom.xml
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/service/
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/junit/
Modified:
projects/jboss-osgi/trunk/build/distribution/pom.xml
projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/install-definition.xml
projects/jboss-osgi/trunk/bundle/logging/pom.xml
projects/jboss-osgi/trunk/bundle/pom.xml
projects/jboss-osgi/trunk/bundle/remotelog/pom.xml
projects/jboss-osgi/trunk/bundle/remotelog/src/main/java/org/jboss/osgi/service/remotelog/RemoteLogActivator.java
projects/jboss-osgi/trunk/bundle/remotelog/src/main/java/org/jboss/osgi/service/remotelog/internal/RemoteLogReaderServiceImpl.java
projects/jboss-osgi/trunk/pom.xml
projects/jboss-osgi/trunk/runtime/deployer/pom.xml
projects/jboss-osgi/trunk/runtime/equinox/pom.xml
projects/jboss-osgi/trunk/runtime/felix/pom.xml
projects/jboss-osgi/trunk/runtime/felix/scripts/assembly-bundles.xml
projects/jboss-osgi/trunk/runtime/felix/src/main/java/org/jboss/osgi/felix/framework/FelixIntegration.java
projects/jboss-osgi/trunk/runtime/felix/src/main/resources/jboss-osgi-beans.xml
projects/jboss-osgi/trunk/runtime/felix/src/main/resources/osgi-deployers-jboss-beans.xml
projects/jboss-osgi/trunk/runtime/knopflerfish/pom.xml
projects/jboss-osgi/trunk/runtime/pom.xml
projects/jboss-osgi/trunk/runtime/testing/pom.xml
projects/jboss-osgi/trunk/runtime/testing/src/main/java/org/jboss/osgi/spi/junit/IntegrationTest.java
projects/jboss-osgi/trunk/runtime/testing/src/main/java/org/jboss/osgi/spi/junit/IntegrationTestHelper.java
projects/jboss-osgi/trunk/testsuite/example/pom.xml
projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-bundles.xml
projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/log/LogServiceRemoteTestCase.java
projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/log/LogServiceTestCase.java
projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/log/bundle/ServiceA.java
projects/jboss-osgi/trunk/testsuite/functional/pom.xml
projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-bundles.xml
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/service/startlevel/bundle/ServiceActivator.java
Log:
Refactor common log stuff to SPI
Modified: projects/jboss-osgi/trunk/build/distribution/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/build/distribution/pom.xml 2009-04-16 09:06:20 UTC (rev 87407)
+++ projects/jboss-osgi/trunk/build/distribution/pom.xml 2009-04-16 10:17:13 UTC (rev 87408)
@@ -36,11 +36,6 @@
<dependencies>
<dependency>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-common</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-logging</artifactId>
<version>${version}</version>
</dependency>
@@ -63,18 +58,18 @@
</dependency>
<dependency>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-runtime-spi</artifactId>
+ <artifactId>jboss-osgi-spi</artifactId>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-runtime-spi</artifactId>
+ <artifactId>jboss-osgi-spi</artifactId>
<classifier>sources</classifier>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-runtime-spi</artifactId>
+ <artifactId>jboss-osgi-spi</artifactId>
<classifier>javadoc</classifier>
<version>${version}</version>
</dependency>
Modified: projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/install-definition.xml
===================================================================
--- projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/install-definition.xml 2009-04-16 09:06:20 UTC (rev 87407)
+++ projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/install-definition.xml 2009-04-16 10:17:13 UTC (rev 87408)
@@ -108,7 +108,7 @@
</fileset>
<!-- JBossOSGi Docs -->
- <file src="@{deploy.artifacts.dir}/lib/jboss-osgi-runtime-spi-javadoc.jar" targetdir="$INSTALL_PATH/docs/apidocs" unpack="true" override="true" />
+ <file src="@{deploy.artifacts.dir}/lib/jboss-osgi-spi-javadoc.jar" targetdir="$INSTALL_PATH/docs/apidocs" unpack="true" override="true" />
<fileset dir="@{deploy.artifacts.dir}/docs/userguide" targetdir="$INSTALL_PATH/docs/userguide" override="true"/>
<!-- JBossOSGi Examples -->
@@ -116,10 +116,9 @@
<!-- JBossOSGi Lib -->
<fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/lib" override="true">
- <include name="jboss-osgi-common.jar" />
<include name="jboss-osgi-runtime-deployer.jar" />
<include name="jboss-osgi-runtime-felix.jar" />
- <include name="jboss-osgi-runtime-spi.jar" />
+ <include name="jboss-osgi-spi.jar" />
<include name="jboss-osgi-logging.jar" />
<include name="jboss-osgi-webconsole.jar" />
<include name="org.apache.felix.framework.jar" />
@@ -135,7 +134,7 @@
<fileset dir="@{deploy.artifacts.dir}/source" targetdir="$INSTALL_PATH/source" override="true">
<include name="jboss-osgi-runtime-deployer-sources.jar" />
<include name="jboss-osgi-runtime-felix-sources.jar" />
- <include name="jboss-osgi-runtime-spi-sources.jar" />
+ <include name="jboss-osgi-spi-sources.jar" />
<include name="jboss-osgi-logging-sources.jar" />
<include name="jboss-osgi-webconsole-sources.jar" />
</fileset>
@@ -161,7 +160,7 @@
<!-- JBossOSGi Runtime deployers/osgi.deployer -->
<fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/default/deployers/osgi.deployer" override="true">
<include name="jboss-osgi-runtime-deployer.jar" />
- <include name="jboss-osgi-runtime-spi.jar" />
+ <include name="jboss-osgi-spi.jar" />
</fileset>
<!-- JBossOSGi Runtime deploy/osgi -->
@@ -170,7 +169,6 @@
<include name="org.apache.felix.http.jetty.jar" />
<include name="org.apache.felix.log.jar" />
<include name="org.apache.felix.metatype.jar" />
- <include name="jboss-osgi-common.jar" />
<include name="jboss-osgi-logging.jar" />
<include name="jboss-osgi-webconsole.jar" />
</fileset>
@@ -237,7 +235,7 @@
<!-- deployers/osgi.deployer -->
<fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" override="true">
<include name="jboss-osgi-runtime-deployer.jar" />
- <include name="jboss-osgi-runtime-spi.jar" />
+ <include name="jboss-osgi-spi.jar" />
</fileset>
<!-- deploy/osgi -->
@@ -246,7 +244,6 @@
<include name="org.apache.felix.http.jetty.jar" />
<include name="org.apache.felix.log.jar" />
<include name="org.apache.felix.metatype.jar" />
- <include name="jboss-osgi-common.jar" />
<include name="jboss-osgi-logging.jar" />
<include name="jboss-osgi-webconsole.jar" />
</fileset>
Modified: projects/jboss-osgi/trunk/bundle/logging/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/bundle/logging/pom.xml 2009-04-16 09:06:20 UTC (rev 87407)
+++ projects/jboss-osgi/trunk/bundle/logging/pom.xml 2009-04-16 10:17:13 UTC (rev 87408)
@@ -36,11 +36,6 @@
<artifactId>jboss-logging-spi</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-common</artifactId>
- <version>${version}</version>
- </dependency>
</dependencies>
<build>
Modified: projects/jboss-osgi/trunk/bundle/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/bundle/pom.xml 2009-04-16 09:06:20 UTC (rev 87407)
+++ projects/jboss-osgi/trunk/bundle/pom.xml 2009-04-16 10:17:13 UTC (rev 87408)
@@ -13,7 +13,6 @@
<!-- Modules -->
<modules>
- <module>common</module>
<module>logging</module>
<module>remotelog</module>
<module>webconsole</module>
Modified: projects/jboss-osgi/trunk/bundle/remotelog/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/bundle/remotelog/pom.xml 2009-04-16 09:06:20 UTC (rev 87407)
+++ projects/jboss-osgi/trunk/bundle/remotelog/pom.xml 2009-04-16 10:17:13 UTC (rev 87408)
@@ -25,6 +25,11 @@
<!-- Dependencies -->
<dependencies>
<dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-spi</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
@@ -90,7 +95,8 @@
javax.servlet.http;resolution:=optional,
org.apache.log4j,
org.jboss.logging,
- org.jboss.mx.util;resolution:=optional,
+ org.jboss.mx.util;resolution:=optional,
+ org.jboss.osgi.spi.service.log,
org.jboss.remoting;resolution:=optional,
org.jboss.remoting.*;resolution:=optional,
org.jboss.util.*,
Modified: projects/jboss-osgi/trunk/bundle/remotelog/src/main/java/org/jboss/osgi/service/remotelog/RemoteLogActivator.java
===================================================================
--- projects/jboss-osgi/trunk/bundle/remotelog/src/main/java/org/jboss/osgi/service/remotelog/RemoteLogActivator.java 2009-04-16 09:06:20 UTC (rev 87407)
+++ projects/jboss-osgi/trunk/bundle/remotelog/src/main/java/org/jboss/osgi/service/remotelog/RemoteLogActivator.java 2009-04-16 10:17:13 UTC (rev 87408)
@@ -26,6 +26,7 @@
import java.util.Properties;
import org.jboss.osgi.service.remotelog.internal.RemoteLogReaderServiceImpl;
+import org.jboss.osgi.spi.service.log.RemoteLogReaderService;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceRegistration;
Deleted: projects/jboss-osgi/trunk/bundle/remotelog/src/main/java/org/jboss/osgi/service/remotelog/RemoteLogReaderService.java
===================================================================
--- projects/jboss-osgi/trunk/bundle/remotelog/src/main/java/org/jboss/osgi/service/remotelog/RemoteLogReaderService.java 2009-04-16 09:06:20 UTC (rev 87407)
+++ projects/jboss-osgi/trunk/bundle/remotelog/src/main/java/org/jboss/osgi/service/remotelog/RemoteLogReaderService.java 2009-04-16 10:17:13 UTC (rev 87408)
@@ -1,36 +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.service.remotelog;
-
-//$Id$
-
-import org.osgi.service.log.LogReaderService;
-
-/**
- * [TODO]
- *
- * @author thomas.diesler at jboss.com
- * @since 12-Apr-2009
- */
-public interface RemoteLogReaderService extends LogReaderService
-{
-}
\ No newline at end of file
Modified: projects/jboss-osgi/trunk/bundle/remotelog/src/main/java/org/jboss/osgi/service/remotelog/internal/RemoteLogReaderServiceImpl.java
===================================================================
--- projects/jboss-osgi/trunk/bundle/remotelog/src/main/java/org/jboss/osgi/service/remotelog/internal/RemoteLogReaderServiceImpl.java 2009-04-16 09:06:20 UTC (rev 87407)
+++ projects/jboss-osgi/trunk/bundle/remotelog/src/main/java/org/jboss/osgi/service/remotelog/internal/RemoteLogReaderServiceImpl.java 2009-04-16 10:17:13 UTC (rev 87408)
@@ -32,7 +32,7 @@
import org.jboss.osgi.service.remotelog.NotImplementedException;
import org.jboss.osgi.service.remotelog.RemoteLogActivator;
-import org.jboss.osgi.service.remotelog.RemoteLogReaderService;
+import org.jboss.osgi.spi.service.log.RemoteLogReaderService;
import org.jboss.remoting.InvocationRequest;
import org.jboss.remoting.InvokerLocator;
import org.jboss.remoting.ServerInvocationHandler;
Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml 2009-04-16 09:06:20 UTC (rev 87407)
+++ projects/jboss-osgi/trunk/pom.xml 2009-04-16 10:17:13 UTC (rev 87408)
@@ -30,6 +30,7 @@
<modules>
<module>microcontainer</module>
<module>repository</module>
+ <module>spi</module>
<module>bundle</module>
<module>runtime</module>
<module>testsuite</module>
Modified: projects/jboss-osgi/trunk/runtime/deployer/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/deployer/pom.xml 2009-04-16 09:06:20 UTC (rev 87407)
+++ projects/jboss-osgi/trunk/runtime/deployer/pom.xml 2009-04-16 10:17:13 UTC (rev 87408)
@@ -33,7 +33,7 @@
</dependency>
<dependency>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-runtime-spi</artifactId>
+ <artifactId>jboss-osgi-spi</artifactId>
<version>${version}</version>
</dependency>
<dependency>
Modified: projects/jboss-osgi/trunk/runtime/equinox/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/equinox/pom.xml 2009-04-16 09:06:20 UTC (rev 87407)
+++ projects/jboss-osgi/trunk/runtime/equinox/pom.xml 2009-04-16 10:17:13 UTC (rev 87408)
@@ -28,7 +28,7 @@
</dependency>
<dependency>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-runtime-spi</artifactId>
+ <artifactId>jboss-osgi-spi</artifactId>
<version>${version}</version>
</dependency>
<dependency>
Modified: projects/jboss-osgi/trunk/runtime/felix/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/felix/pom.xml 2009-04-16 09:06:20 UTC (rev 87407)
+++ projects/jboss-osgi/trunk/runtime/felix/pom.xml 2009-04-16 10:17:13 UTC (rev 87408)
@@ -23,7 +23,7 @@
<dependencies>
<dependency>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-runtime-spi</artifactId>
+ <artifactId>jboss-osgi-spi</artifactId>
<version>${version}</version>
</dependency>
<dependency>
@@ -47,12 +47,6 @@
</dependency>
<dependency>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-common</artifactId>
- <version>${version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-logging</artifactId>
<version>${version}</version>
<scope>provided</scope>
Modified: projects/jboss-osgi/trunk/runtime/felix/scripts/assembly-bundles.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/felix/scripts/assembly-bundles.xml 2009-04-16 09:06:20 UTC (rev 87407)
+++ projects/jboss-osgi/trunk/runtime/felix/scripts/assembly-bundles.xml 2009-04-16 10:17:13 UTC (rev 87408)
@@ -16,7 +16,6 @@
<outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
<include>*:org.apache.felix.log:jar</include>
- <include>*:jboss-osgi-common:jar</include>
<include>*:jboss-osgi-logging:jar</include>
</includes>
<useStrictFiltering>true</useStrictFiltering>
Modified: projects/jboss-osgi/trunk/runtime/felix/src/main/java/org/jboss/osgi/felix/framework/FelixIntegration.java
===================================================================
--- projects/jboss-osgi/trunk/runtime/felix/src/main/java/org/jboss/osgi/felix/framework/FelixIntegration.java 2009-04-16 09:06:20 UTC (rev 87407)
+++ projects/jboss-osgi/trunk/runtime/felix/src/main/java/org/jboss/osgi/felix/framework/FelixIntegration.java 2009-04-16 10:17:13 UTC (rev 87408)
@@ -35,7 +35,10 @@
import org.jboss.osgi.spi.framework.OSGiFramework;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleEvent;
import org.osgi.framework.BundleException;
+import org.osgi.framework.BundleListener;
+import org.osgi.framework.SynchronousBundleListener;
/**
* An abstraction of an OSGi Framework
@@ -119,50 +122,61 @@
}
public void start()
- {
- // Get system bundle context
- BundleContext context = framework.getBundleContext();
- if (context == null)
- throw new FrameworkException("Cannot obtain system context");
-
- Map<URI, Bundle> autoBundles = new HashMap<URI, Bundle>();
+ {
+ // Get system bundle context
+ BundleContext context = framework.getBundleContext();
+ if (context == null)
+ throw new FrameworkException("Cannot obtain system context");
- // Add the autoStart bundles to autoInstall
- for (URI bundleURI : autoStart)
- {
- autoInstall.add(bundleURI);
- }
+ BundleListener bndListener = new SynchronousBundleListener()
+ {
+ public void bundleChanged(BundleEvent event)
+ {
+ String symName = event.getBundle().getSymbolicName();
+ String evType = bundleEvent(event.getType());
+ //System.out.println("#1 BundleEvent " + symName + " " + evType);
+ }
+ };
+ context.addBundleListener(bndListener);
- // Install autoInstall bundles
- for (URI bundleURI : autoInstall)
- {
- try
+ Map<URI, Bundle> autoBundles = new HashMap<URI, Bundle>();
+
+ // Add the autoStart bundles to autoInstall
+ for (URI bundleURI : autoStart)
{
- Bundle bundle = context.installBundle(bundleURI.toString());
- log.info("Installed bundle: " + bundle.getSymbolicName());
- autoBundles.put(bundleURI, bundle);
+ autoInstall.add(bundleURI);
}
- catch (BundleException ex)
+
+ // Install autoInstall bundles
+ for (URI bundleURI : autoInstall)
{
- log.error("Cannot install bundle: " + bundleURI, ex);
+ try
+ {
+ Bundle bundle = context.installBundle(bundleURI.toString());
+ log.info("Installed bundle: " + bundle.getSymbolicName());
+ autoBundles.put(bundleURI, bundle);
+ }
+ catch (BundleException ex)
+ {
+ log.error("Cannot install bundle: " + bundleURI, ex);
+ }
}
- }
- // Start autoStart bundles
- for (URI bundleURI : autoStart)
- {
- try
+ // Start autoStart bundles
+ for (URI bundleURI : autoStart)
{
- Bundle bundle = autoBundles.get(bundleURI);
- bundle.start();
- log.info("Started bundle: " + bundle.getSymbolicName());
+ try
+ {
+ Bundle bundle = autoBundles.get(bundleURI);
+ bundle.start();
+ log.info("Started bundle: " + bundle.getSymbolicName());
+ }
+ catch (BundleException ex)
+ {
+ log.error("Cannot start bundle: " + bundleURI, ex);
+ }
}
- catch (BundleException ex)
- {
- log.error("Cannot start bundle: " + bundleURI, ex);
- }
- }
- }
+ }
public void stop()
{
@@ -178,4 +192,33 @@
}
}
}
+
+ /*
+ * * Return the string representation of a {@link BundleEvent} type
+ */
+ private String bundleEvent(int eventType)
+ {
+ String retType = "[" + eventType + "]";
+ if (BundleEvent.INSTALLED == eventType)
+ retType = "INSTALLED";
+ else if (BundleEvent.LAZY_ACTIVATION == eventType)
+ retType = "LAZY_ACTIVATION";
+ else if (BundleEvent.RESOLVED == eventType)
+ retType = "RESOLVED";
+ else if (BundleEvent.STARTING == eventType)
+ retType = "STARTING";
+ else if (BundleEvent.STARTED == eventType)
+ retType = "STARTED";
+ else if (BundleEvent.STOPPING == eventType)
+ retType = "STOPPING";
+ else if (BundleEvent.STOPPED == eventType)
+ retType = "STOPPED";
+ else if (BundleEvent.UNINSTALLED == eventType)
+ retType = "UNINSTALLED";
+ else if (BundleEvent.UNRESOLVED == eventType)
+ retType = "UNRESOLVED";
+ else if (BundleEvent.UPDATED == eventType)
+ retType = "UPDATED";
+ return retType;
+ }
}
\ No newline at end of file
Modified: projects/jboss-osgi/trunk/runtime/felix/src/main/resources/jboss-osgi-beans.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/felix/src/main/resources/jboss-osgi-beans.xml 2009-04-16 09:06:20 UTC (rev 87407)
+++ projects/jboss-osgi/trunk/runtime/felix/src/main/resources/jboss-osgi-beans.xml 2009-04-16 10:17:13 UTC (rev 87408)
@@ -11,10 +11,11 @@
<entry>
<key>org.osgi.framework.system.packages</key>
<value>
+ org.jboss.osgi.spi.service.log,
org.osgi.framework; version=1.4,
org.osgi.service.log; version=1.3,
org.osgi.util.tracker; version=1.3,
-
+
<!-- needed by jboss-remoting -->
javax.management,
javax.naming,
@@ -39,7 +40,6 @@
<property name="autoStart">
<list elementClass="java.net.URI">
<value>file://${test.archive.directory}/bundles/org.apache.felix.log.jar</value>
- <value>file://${test.archive.directory}/bundles/jboss-osgi-common.jar</value>
<value>file://${test.archive.directory}/bundles/jboss-osgi-logging.jar</value>
</list>
</property>
Modified: projects/jboss-osgi/trunk/runtime/felix/src/main/resources/osgi-deployers-jboss-beans.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/felix/src/main/resources/osgi-deployers-jboss-beans.xml 2009-04-16 09:06:20 UTC (rev 87407)
+++ projects/jboss-osgi/trunk/runtime/felix/src/main/resources/osgi-deployers-jboss-beans.xml 2009-04-16 10:17:13 UTC (rev 87408)
@@ -16,8 +16,9 @@
javax.management,
javax.xml.parsers,
org.jboss.logging,
+ org.jboss.osgi.spi.management,
+ org.jboss.osgi.spi.service.log,
org.jboss.osgi.spi.service.microcontainer,
- org.jboss.osgi.spi.management,
org.osgi.framework; version=1.4,
org.osgi.service.packageadmin; version=1.2,
org.osgi.service.startlevel; version=1.1,
@@ -50,7 +51,6 @@
<property name="autoStart">
<list elementClass="java.net.URI">
<value>${jboss.server.home.url}/deploy/osgi/org.osgi.compendium.jar</value>
- <value>${jboss.server.home.url}/deploy/osgi/jboss-osgi-common.jar</value>
<value>${jboss.server.home.url}/deploy/osgi/jboss-osgi-logging.jar</value>
</list>
</property>
Modified: projects/jboss-osgi/trunk/runtime/knopflerfish/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/knopflerfish/pom.xml 2009-04-16 09:06:20 UTC (rev 87407)
+++ projects/jboss-osgi/trunk/runtime/knopflerfish/pom.xml 2009-04-16 10:17:13 UTC (rev 87408)
@@ -28,7 +28,7 @@
</dependency>
<dependency>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-runtime-spi</artifactId>
+ <artifactId>jboss-osgi-spi</artifactId>
<version>${version}</version>
</dependency>
<dependency>
Modified: projects/jboss-osgi/trunk/runtime/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/pom.xml 2009-04-16 09:06:20 UTC (rev 87407)
+++ projects/jboss-osgi/trunk/runtime/pom.xml 2009-04-16 10:17:13 UTC (rev 87408)
@@ -12,7 +12,6 @@
</parent>
<modules>
- <module>spi</module>
<module>deployer</module>
<module>testing</module>
<module>equinox</module>
Modified: projects/jboss-osgi/trunk/runtime/testing/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/testing/pom.xml 2009-04-16 09:06:20 UTC (rev 87407)
+++ projects/jboss-osgi/trunk/runtime/testing/pom.xml 2009-04-16 10:17:13 UTC (rev 87408)
@@ -20,21 +20,20 @@
<dependencies>
<dependency>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-runtime-spi</artifactId>
+ <artifactId>jboss-osgi-spi</artifactId>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-common</artifactId>
+ <artifactId>jboss-osgi-remotelog</artifactId>
<version>${version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-remotelog</artifactId>
- <version>${version}</version>
- <scope>provided</scope>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
</dependency>
+
+ <!-- Provided Dependencies -->
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
@@ -45,10 +44,6 @@
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
</dependencies>
<build>
Modified: projects/jboss-osgi/trunk/runtime/testing/src/main/java/org/jboss/osgi/spi/junit/IntegrationTest.java
===================================================================
--- projects/jboss-osgi/trunk/runtime/testing/src/main/java/org/jboss/osgi/spi/junit/IntegrationTest.java 2009-04-16 09:06:20 UTC (rev 87407)
+++ projects/jboss-osgi/trunk/runtime/testing/src/main/java/org/jboss/osgi/spi/junit/IntegrationTest.java 2009-04-16 10:17:13 UTC (rev 87408)
@@ -27,9 +27,9 @@
import javax.management.MBeanServerConnection;
-import org.jboss.osgi.common.log.LogEntryCache;
import org.jboss.osgi.spi.framework.RemoteBundle;
import org.jboss.osgi.spi.framework.RemoteFramework;
+import org.jboss.osgi.spi.service.log.LogEntryCache;
/**
* An integration test case
Modified: projects/jboss-osgi/trunk/runtime/testing/src/main/java/org/jboss/osgi/spi/junit/IntegrationTestHelper.java
===================================================================
--- projects/jboss-osgi/trunk/runtime/testing/src/main/java/org/jboss/osgi/spi/junit/IntegrationTestHelper.java 2009-04-16 09:06:20 UTC (rev 87407)
+++ projects/jboss-osgi/trunk/runtime/testing/src/main/java/org/jboss/osgi/spi/junit/IntegrationTestHelper.java 2009-04-16 10:17:13 UTC (rev 87408)
@@ -36,8 +36,6 @@
import javax.naming.NamingException;
import org.jboss.deployers.client.spi.DeployerClient;
-import org.jboss.osgi.common.log.LogEntryCache;
-import org.jboss.osgi.service.remotelog.RemoteLogReaderService;
import org.jboss.osgi.spi.framework.OSGiBootstrapProvider;
import org.jboss.osgi.spi.framework.OSGiFramework;
import org.jboss.osgi.spi.framework.RemoteBundle;
@@ -47,6 +45,8 @@
import org.jboss.osgi.spi.management.MBeanProxyException;
import org.jboss.osgi.spi.management.ManagedBundleMBean;
import org.jboss.osgi.spi.management.ManagedFrameworkMBean;
+import org.jboss.osgi.spi.service.log.LogEntryCache;
+import org.jboss.osgi.spi.service.log.RemoteLogReaderService;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceReference;
Copied: projects/jboss-osgi/trunk/spi (from rev 87400, projects/jboss-osgi/trunk/runtime/spi)
Property changes on: projects/jboss-osgi/trunk/spi
___________________________________________________________________
Name: svn:ignore
+ target
Name: svn:mergeinfo
+
Deleted: projects/jboss-osgi/trunk/spi/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/spi/pom.xml 2009-04-16 06:09:17 UTC (rev 87400)
+++ projects/jboss-osgi/trunk/spi/pom.xml 2009-04-16 10:17:13 UTC (rev 87408)
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <name>JBossOSGi - Runtime SPI</name>
- <description>JBossOSGi - Runtime SPI</description>
-
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-runtime-spi</artifactId>
- <packaging>jar</packaging>
-
- <!-- Parent -->
- <parent>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-runtime</artifactId>
- <version>1.0.0.Beta1</version>
- </parent>
-
- <!-- Dependencies -->
- <dependencies>
- <dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-common</artifactId>
- <version>${version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-remotelog</artifactId>
- <version>${version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-client-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-vfs</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-kernel</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <quiet>true</quiet>
- <excludePackageNames>*.internal</excludePackageNames>
- </configuration>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
Copied: projects/jboss-osgi/trunk/spi/pom.xml (from rev 87404, projects/jboss-osgi/trunk/runtime/spi/pom.xml)
===================================================================
--- projects/jboss-osgi/trunk/spi/pom.xml (rev 0)
+++ projects/jboss-osgi/trunk/spi/pom.xml 2009-04-16 10:17:13 UTC (rev 87408)
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <name>JBossOSGi - SPI</name>
+ <description>JBossOSGi - SPI</description>
+
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-spi</artifactId>
+ <packaging>jar</packaging>
+
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi</artifactId>
+ <version>1.0.0.Beta1</version>
+ </parent>
+
+ <!-- Dependencies -->
+ <dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-client-spi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-vfs</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <quiet>true</quiet>
+ <excludePackageNames>*.internal</excludePackageNames>
+ </configuration>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Copied: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/service/log/LogEntryCache.java (from rev 87400, projects/jboss-osgi/trunk/bundle/common/src/main/java/org/jboss/osgi/common/log/LogEntryCache.java)
===================================================================
--- projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/service/log/LogEntryCache.java (rev 0)
+++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/service/log/LogEntryCache.java 2009-04-16 10:17:13 UTC (rev 87408)
@@ -0,0 +1,171 @@
+/*
+ * 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.spi.service.log;
+
+//$Id$
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.jboss.osgi.spi.service.log.internal.LogEntryImpl;
+import org.osgi.service.log.LogEntry;
+import org.osgi.service.log.LogListener;
+
+/**
+ * A LogListener that caches LogEntry objects for later retrieval.
+ *
+ * The entries can be filtered with a list of {@link LogEntryFilter} instances.
+ * A log entry is cached if it matches at least one of the registered filters.
+ * If there is no filter registered entries are cached unconditionally.
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 09-Apr-2009
+ */
+public class LogEntryCache implements LogListener
+{
+ private List<LogEntry> entries = new ArrayList<LogEntry>();
+ private List<LogEntryFilter> filters = new ArrayList<LogEntryFilter>();
+
+ /**
+ * Create a LogEntryCache with a single associated filter
+ */
+ public LogEntryCache(LogEntryFilter filter)
+ {
+ filters.add(filter);
+ }
+
+ /**
+ * Create a LogEntryCache with no associated filters
+ */
+ public LogEntryCache()
+ {
+ }
+
+ /**
+ * Add a LogEntryFilter
+ */
+ public void addFilter(LogEntryFilter filter)
+ {
+ filters.add(filter);
+ }
+
+ /**
+ * Clear the list of cached entries.
+ */
+ public void clear()
+ {
+ synchronized (entries)
+ {
+ entries.clear();
+ }
+ }
+
+ /**
+ * Clear the list of registered filters.
+ */
+ public void clearFilters()
+ {
+ // filters.clear() would need synchronization
+ filters = new ArrayList<LogEntryFilter>();
+ }
+
+ /**
+ * Get the list of cached entries.
+ *
+ * Note, that the LogService delivers LogEntries asynchronously.
+ * Client should not rely on a certain LogEntry already beein delivered
+ * when calling this method.
+ */
+ public List<LogEntry> getLog()
+ {
+ return getLog(false);
+ }
+
+ /**
+ * Get the list of cached entries and optionally clears the list.
+ *
+ * Note, that the LogService delivers LogEntries asynchronously.
+ * Client should not rely on a certain LogEntry already beein delivered
+ * when calling this method.
+ */
+ public List<LogEntry> getLog(boolean clear)
+ {
+ synchronized (entries)
+ {
+ ArrayList<LogEntry> retList = new ArrayList<LogEntry>(entries);
+ if (clear == true)
+ entries.clear();
+
+ return retList;
+ }
+ }
+
+ /**
+ * Listener method called for each LogEntry object created.
+ */
+ public void logged(LogEntry entry)
+ {
+ // Replace entry with a unified wrapper
+ entry = new LogEntryImpl(entry);
+
+ List<LogEntryFilter> snapshot = new ArrayList<LogEntryFilter>(filters);
+ synchronized (entries)
+ {
+ if (snapshot.size() == 0)
+ {
+ entries.add(entry);
+ return;
+ }
+
+ // Add the entry if if matches at least one filter
+ for (LogEntryFilter filter : snapshot)
+ {
+ if (match(filter, entry))
+ {
+ entries.add(entry);
+ break;
+ }
+ }
+ }
+ }
+
+ private boolean match(LogEntryFilter filter, LogEntry entry)
+ {
+ boolean match = entry.getLevel() <= filter.getLevel();
+
+ if (match && filter.getBundleRegex() != null)
+ {
+ String entryBnd = entry.getBundle().getSymbolicName();
+ String filterRegex = filter.getBundleRegex();
+ match = entryBnd.matches(filterRegex);
+ }
+
+ if (match && filter.getMessageRegex() != null)
+ {
+ String entryMsg = entry.getMessage();
+ String filterRegex = filter.getMessageRegex();
+ match = entryMsg.matches(filterRegex);
+ }
+
+ return match;
+ }
+}
\ No newline at end of file
Copied: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/service/log/LogEntryFilter.java (from rev 87400, projects/jboss-osgi/trunk/bundle/common/src/main/java/org/jboss/osgi/common/log/LogEntryFilter.java)
===================================================================
--- projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/service/log/LogEntryFilter.java (rev 0)
+++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/service/log/LogEntryFilter.java 2009-04-16 10:17:13 UTC (rev 87408)
@@ -0,0 +1,97 @@
+/*
+ * 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.spi.service.log;
+
+//$Id$
+
+
+/**
+ * A LogEntry filter that can be used with the LogEntryCache
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 09-Apr-2009
+ */
+public class LogEntryFilter
+{
+ private int level;
+ private String bndRegex;
+ private String msgRegex;
+
+ /**
+ * Create a LogEntryFilter with the associated criteria.
+ *
+ * @param bndRegex A regex that matches a Bundle's SymbolicName
+ * @param level The maximum log level accepted by this filter
+ * @param msgRegex A regex that matches the log message
+ */
+ public LogEntryFilter(String bndRegex, int level, String msgRegex)
+ {
+ this.bndRegex = bndRegex;
+ this.msgRegex = msgRegex;
+ this.level = level < 1 ? Integer.MAX_VALUE : level;
+ }
+
+ /**
+ * Create a LogEntryFilter with the associated criteria.
+ *
+ * @param bndRegex A regex that matches a Bundle's SymbolicName
+ * @param level The maximum log level accepted by this filter
+ */
+ public LogEntryFilter(String bndRegex, int level)
+ {
+ this(bndRegex, level, null);
+ }
+
+ /**
+ * Create a LogEntryFilter with the associated criteria.
+ *
+ * @param bndRegex A regex that matches a Bundle's SymbolicName
+ */
+ public LogEntryFilter(String bndRegex)
+ {
+ this(bndRegex, Integer.MAX_VALUE, null);
+ }
+
+ /**
+ * Get the Bundle Symbolic-Name regex.
+ */
+ public String getBundleRegex()
+ {
+ return bndRegex;
+ }
+
+ /**
+ * Get the log message regex.
+ */
+ public String getMessageRegex()
+ {
+ return msgRegex;
+ }
+
+ /**
+ * Get the log entry maximum log level.
+ */
+ public int getLevel()
+ {
+ return level;
+ }
+}
\ No newline at end of file
Copied: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/service/log/LogServiceTracker.java (from rev 87400, projects/jboss-osgi/trunk/bundle/common/src/main/java/org/jboss/osgi/common/log/LogServiceTracker.java)
===================================================================
--- projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/service/log/LogServiceTracker.java (rev 0)
+++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/service/log/LogServiceTracker.java 2009-04-16 10:17:13 UTC (rev 87408)
@@ -0,0 +1,81 @@
+/*
+ * 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.spi.service.log;
+
+//$Id$
+
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+import org.osgi.service.log.LogService;
+import org.osgi.util.tracker.ServiceTracker;
+
+/**
+ * A basic LogService that writes to System.out
+ *
+ * @author thomas.diesler at 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/spi/src/main/java/org/jboss/osgi/spi/service/log/RemoteLogReaderService.java (from rev 87400, projects/jboss-osgi/trunk/bundle/remotelog/src/main/java/org/jboss/osgi/service/remotelog/RemoteLogReaderService.java)
===================================================================
--- projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/service/log/RemoteLogReaderService.java (rev 0)
+++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/service/log/RemoteLogReaderService.java 2009-04-16 10:17:13 UTC (rev 87408)
@@ -0,0 +1,36 @@
+/*
+ * 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.spi.service.log;
+
+//$Id$
+
+import org.osgi.service.log.LogReaderService;
+
+/**
+ * [TODO]
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 12-Apr-2009
+ */
+public interface RemoteLogReaderService extends LogReaderService
+{
+}
\ No newline at end of file
Copied: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/service/log/StringConstants.java (from rev 87400, projects/jboss-osgi/trunk/bundle/common/src/main/java/org/jboss/osgi/common/StringConstants.java)
===================================================================
--- projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/service/log/StringConstants.java (rev 0)
+++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/service/log/StringConstants.java 2009-04-16 10:17:13 UTC (rev 87408)
@@ -0,0 +1,113 @@
+/*
+ * 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.spi.service.log;
+
+//$Id$
+
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleEvent;
+import org.osgi.service.log.LogService;
+
+/**
+ * String representation for common OSGi Constants
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 04-Mar-2009
+ */
+public abstract class StringConstants
+{
+ /**
+ * Return the string representation of a {@link Bundle} state
+ */
+ public static String bundleState(int bundleState)
+ {
+ String retState = "[" + bundleState + "]";
+ if (Bundle.UNINSTALLED == bundleState)
+ retState = "UNINSTALLED";
+ else if (Bundle.INSTALLED == bundleState)
+ retState = "INSTALLED";
+ else if (Bundle.RESOLVED == bundleState)
+ retState = "RESOLVED";
+ else if (Bundle.STARTING == bundleState)
+ retState = "STARTING";
+ else if (Bundle.STOPPING == bundleState)
+ retState = "STOPPING";
+ else if (Bundle.ACTIVE == bundleState)
+ retState = "ACTIVE";
+ return retState;
+ }
+
+ /**
+ * Return the string representation of a {@link BundleEvent} type
+ */
+ public static String bundleEvent(int eventType)
+ {
+ String retType = "[" + eventType + "]";
+ if (BundleEvent.INSTALLED == eventType)
+ retType = "INSTALLED";
+ else if (BundleEvent.LAZY_ACTIVATION == eventType)
+ retType = "LAZY_ACTIVATION";
+ else if (BundleEvent.RESOLVED == eventType)
+ retType = "RESOLVED";
+ else if (BundleEvent.STARTING == eventType)
+ retType = "STARTING";
+ else if (BundleEvent.STARTED == eventType)
+ retType = "STARTED";
+ else if (BundleEvent.STOPPING == eventType)
+ retType = "STOPPING";
+ else if (BundleEvent.STOPPED == eventType)
+ retType = "STOPPED";
+ else if (BundleEvent.UNINSTALLED == eventType)
+ retType = "UNINSTALLED";
+ else if (BundleEvent.UNRESOLVED == eventType)
+ retType = "UNRESOLVED";
+ else if (BundleEvent.UPDATED == eventType)
+ retType = "UPDATED";
+ return retType;
+ }
+
+ /**
+ * Return the string representation of a {@link LogService} level
+ */
+ public static String logLevel(int level)
+ {
+ String logLevel;
+ switch (level)
+ {
+ case LogService.LOG_DEBUG:
+ logLevel = "DEBUG";
+ break;
+ case LogService.LOG_INFO:
+ logLevel = "INFO";
+ break;
+ case LogService.LOG_WARNING:
+ logLevel = "WARN";
+ break;
+ case LogService.LOG_ERROR:
+ logLevel = "ERROR";
+ break;
+ default:
+ logLevel = "Level=" + level;
+ }
+ return logLevel;
+ }
+}
Copied: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/service/log/SystemLogService.java (from rev 87400, projects/jboss-osgi/trunk/bundle/common/src/main/java/org/jboss/osgi/common/log/SystemLogService.java)
===================================================================
--- projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/service/log/SystemLogService.java (rev 0)
+++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/service/log/SystemLogService.java 2009-04-16 10:17:13 UTC (rev 87408)
@@ -0,0 +1,77 @@
+/*
+ * 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.spi.service.log;
+
+//$Id$
+
+import org.jboss.osgi.spi.service.log.internal.LogEntryImpl;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+import org.osgi.service.log.LogService;
+
+/**
+ * A basic LogService that writes to System.out
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 11-Apr-2009
+ */
+public class SystemLogService implements LogService
+{
+ private BundleContext context;
+
+ public SystemLogService(BundleContext context)
+ {
+ this.context = context;
+ }
+
+ public void log(int level, String message)
+ {
+ logInternal(null, level, message, null);
+ }
+
+ public void log(int level, String message, Throwable exception)
+ {
+ logInternal(null, level, message, exception);
+ }
+
+ public void log(ServiceReference sr, int level, String message)
+ {
+ logInternal(sr, level, message, null);
+ }
+
+ public void log(ServiceReference sr, int level, String message, Throwable exception)
+ {
+ logInternal(sr, level, message, exception);
+ }
+
+ private void logInternal(ServiceReference sr, int level, String message, Throwable exception)
+ {
+ long time = System.currentTimeMillis();
+ Bundle bundle = context.getBundle();
+
+ System.out.println(new LogEntryImpl(time, bundle, sr, level, message, exception));
+
+ if (exception != null)
+ exception.printStackTrace(System.out);
+ }
+}
\ No newline at end of file
Copied: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/service/log/internal/LogEntryImpl.java (from rev 87400, projects/jboss-osgi/trunk/bundle/common/src/main/java/org/jboss/osgi/common/log/internal/LogEntryImpl.java)
===================================================================
--- projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/service/log/internal/LogEntryImpl.java (rev 0)
+++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/service/log/internal/LogEntryImpl.java 2009-04-16 10:17:13 UTC (rev 87408)
@@ -0,0 +1,137 @@
+/*
+ * 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.spi.service.log.internal;
+
+// $Id$
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import org.osgi.framework.Bundle;
+import org.osgi.framework.ServiceReference;
+import org.osgi.service.log.LogEntry;
+import org.osgi.service.log.LogService;
+
+/**
+ * A unified implementation of a LogEntry.
+ *
+ * @author thomas.diesler at jboss.com
+ * @since 09-Apr-2009
+ */
+public class LogEntryImpl implements LogEntry
+{
+ private long time;
+ private int level;
+ private Bundle bundle;
+ private ServiceReference sref;
+ private String message;
+ private Throwable exception;
+
+ private String bndStr;
+ private String srefStr;
+
+ public LogEntryImpl(LogEntry le)
+ {
+ this(le.getTime(), le.getBundle(), le.getServiceReference(), le.getLevel(), le.getMessage(), le.getException());
+ }
+
+ public LogEntryImpl(long time, Bundle bundle, ServiceReference sref, int level, String message, Throwable exception)
+ {
+ this.time = time;
+ this.bundle = bundle;
+ this.sref = sref;
+ this.level = level;
+ this.message = message;
+ this.exception = exception;
+
+ if (bundle != null)
+ bndStr = bundle.getSymbolicName();
+
+ if (sref != null && sref.getBundle() != null)
+ srefStr = sref.getBundle().getSymbolicName();
+ }
+
+ public Bundle getBundle()
+ {
+ return bundle;
+ }
+
+ public Throwable getException()
+ {
+ return exception;
+ }
+
+ public int getLevel()
+ {
+ return level;
+ }
+
+ public String getMessage()
+ {
+ return message;
+ }
+
+ public ServiceReference getServiceReference()
+ {
+ return sref;
+ }
+
+ public long getTime()
+ {
+ return time;
+ }
+
+ private String logLevel(int level)
+ {
+ String logLevel;
+ switch (level)
+ {
+ case LogService.LOG_DEBUG:
+ logLevel = "DEBUG";
+ break;
+ case LogService.LOG_INFO:
+ logLevel = "INFO";
+ break;
+ case LogService.LOG_WARNING:
+ logLevel = "WARN";
+ break;
+ case LogService.LOG_ERROR:
+ logLevel = "ERROR";
+ break;
+ default:
+ logLevel = "Level=" + level;
+ }
+ return logLevel;
+ }
+
+ @Override
+ public String toString()
+ {
+ String t = new SimpleDateFormat("dd-MMM-yyyy HH:mm.ss.SSS").format(new Date(time));
+ String l = " " + logLevel(level);
+ String s = srefStr != null ? ",sref=" + srefStr : "";
+ String b = ",bnd=" + bndStr;
+ String m = ",msg=" + message;
+ String e = exception != null ? ",ex=" + exception : "";
+ return "[" + t + l + b + s + m + e + "]";
+ }
+}
\ No newline at end of file
Modified: projects/jboss-osgi/trunk/testsuite/example/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/pom.xml 2009-04-16 09:06:20 UTC (rev 87407)
+++ projects/jboss-osgi/trunk/testsuite/example/pom.xml 2009-04-16 10:17:13 UTC (rev 87408)
@@ -32,7 +32,7 @@
</dependency>
<dependency>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-runtime-spi</artifactId>
+ <artifactId>jboss-osgi-spi</artifactId>
<version>${version}</version>
</dependency>
<dependency>
@@ -63,12 +63,6 @@
</dependency>
<dependency>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-common</artifactId>
- <version>${version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-logging</artifactId>
<version>${version}</version>
<scope>provided</scope>
Modified: projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-bundles.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-bundles.xml 2009-04-16 09:06:20 UTC (rev 87407)
+++ projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-bundles.xml 2009-04-16 10:17:13 UTC (rev 87408)
@@ -16,7 +16,6 @@
<outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
<include>*:org.apache.felix.log:jar</include>
- <include>*:jboss-osgi-common:jar</include>
<include>*:jboss-osgi-logging:jar</include>
<include>*:jboss-osgi-remotelog:jar</include>
</includes>
Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/log/LogServiceRemoteTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/log/LogServiceRemoteTestCase.java 2009-04-16 09:06:20 UTC (rev 87407)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/log/LogServiceRemoteTestCase.java 2009-04-16 10:17:13 UTC (rev 87408)
@@ -25,11 +25,11 @@
import java.util.List;
-import org.jboss.osgi.common.log.LogEntryCache;
-import org.jboss.osgi.common.log.LogEntryFilter;
-import org.jboss.osgi.service.remotelog.RemoteLogReaderService;
import org.jboss.osgi.spi.framework.RemoteBundle;
import org.jboss.osgi.spi.junit.IntegrationTest;
+import org.jboss.osgi.spi.service.log.LogEntryCache;
+import org.jboss.osgi.spi.service.log.LogEntryFilter;
+import org.jboss.osgi.spi.service.log.RemoteLogReaderService;
import org.osgi.framework.Bundle;
import org.osgi.service.log.LogEntry;
import org.osgi.service.log.LogService;
Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/log/LogServiceTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/log/LogServiceTestCase.java 2009-04-16 09:06:20 UTC (rev 87407)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/log/LogServiceTestCase.java 2009-04-16 10:17:13 UTC (rev 87408)
@@ -26,11 +26,11 @@
import java.net.URL;
import java.util.List;
-import org.jboss.osgi.common.log.LogEntryCache;
-import org.jboss.osgi.common.log.LogEntryFilter;
import org.jboss.osgi.spi.framework.OSGiBootstrap;
import org.jboss.osgi.spi.framework.OSGiFramework;
import org.jboss.osgi.spi.junit.OSGiTest;
+import org.jboss.osgi.spi.service.log.LogEntryCache;
+import org.jboss.osgi.spi.service.log.LogEntryFilter;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
@@ -76,11 +76,6 @@
Bundle logServiceBundle = sysContext.installBundle(testURL.toExternalForm());
logServiceBundle.start();
- // Install and start JBossOSGi Common
- testURL = getTestArchiveURL("bundles/jboss-osgi-common.jar");
- Bundle commonBundle = sysContext.installBundle(testURL.toExternalForm());
- commonBundle.start();
-
// Install and start the test bundle
testURL = getTestArchiveURL("example/example-log.jar");
Bundle bundleA = sysContext.installBundle(testURL.toExternalForm());
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-04-16 09:06:20 UTC (rev 87407)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/log/bundle/ServiceA.java 2009-04-16 10:17:13 UTC (rev 87408)
@@ -25,7 +25,7 @@
import static org.osgi.service.log.LogService.LOG_INFO;
-import org.jboss.osgi.common.log.LogServiceTracker;
+import org.jboss.osgi.spi.service.log.LogServiceTracker;
import org.osgi.framework.BundleContext;
import org.osgi.service.log.LogService;
Modified: projects/jboss-osgi/trunk/testsuite/functional/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-04-16 09:06:20 UTC (rev 87407)
+++ projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-04-16 10:17:13 UTC (rev 87408)
@@ -32,7 +32,7 @@
</dependency>
<dependency>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-runtime-spi</artifactId>
+ <artifactId>jboss-osgi-spi</artifactId>
<version>${version}</version>
</dependency>
<dependency>
@@ -63,12 +63,6 @@
</dependency>
<dependency>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-common</artifactId>
- <version>${version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-logging</artifactId>
<version>${version}</version>
<scope>provided</scope>
Modified: projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-bundles.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-bundles.xml 2009-04-16 09:06:20 UTC (rev 87407)
+++ projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-bundles.xml 2009-04-16 10:17:13 UTC (rev 87408)
@@ -16,7 +16,6 @@
<outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
<include>*:org.apache.felix.log:jar</include>
- <include>*:jboss-osgi-common:jar</include>
<include>*:jboss-osgi-logging:jar</include>
<include>*:jboss-osgi-remotelog:jar</include>
</includes>
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-04-16 09:06:20 UTC (rev 87407)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi37/bundleA/ServiceA.java 2009-04-16 10:17:13 UTC (rev 87408)
@@ -23,7 +23,7 @@
//$Id: ServiceA.java 87351 2009-04-15 14:25:32Z thomas.diesler at jboss.com $
-import org.jboss.osgi.common.log.LogServiceTracker;
+import org.jboss.osgi.spi.service.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-04-16 09:06:20 UTC (rev 87407)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi37/bundleB/ServiceB.java 2009-04-16 10:17:13 UTC (rev 87408)
@@ -23,7 +23,7 @@
//$Id: ServiceB.java 87351 2009-04-15 14:25:32Z thomas.diesler at jboss.com $
-import org.jboss.osgi.common.log.LogServiceTracker;
+import org.jboss.osgi.spi.service.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/service/startlevel/bundle/ServiceActivator.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/startlevel/bundle/ServiceActivator.java 2009-04-16 09:06:20 UTC (rev 87407)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/startlevel/bundle/ServiceActivator.java 2009-04-16 10:17:13 UTC (rev 87408)
@@ -23,7 +23,7 @@
//$Id: ServiceActivator.java 87336 2009-04-15 11:31:26Z thomas.diesler at jboss.com $
-import org.jboss.osgi.common.log.LogServiceTracker;
+import org.jboss.osgi.spi.service.log.LogServiceTracker;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
import org.osgi.service.log.LogService;
More information about the jboss-cvs-commits
mailing list