[jboss-osgi-commits] JBoss-OSGI SVN: r87409 - in projects/jboss-osgi/trunk: build/distribution/src/main/resources/installer and 32 other directories.

Author: thomas.diesler(a)jboss.com Date: 2009-04-16 07:05:27 -0400 (Thu, 16 Apr 2009) New Revision: 87409 Added: projects/jboss-osgi/trunk/bundle/common/ projects/jboss-osgi/trunk/bundle/common/.classpath projects/jboss-osgi/trunk/bundle/common/.project projects/jboss-osgi/trunk/bundle/common/.settings/ projects/jboss-osgi/trunk/bundle/common/.settings/org.eclipse.jdt.core.prefs projects/jboss-osgi/trunk/bundle/common/.settings/org.maven.ide.eclipse.prefs projects/jboss-osgi/trunk/bundle/common/pom.xml projects/jboss-osgi/trunk/bundle/common/src/ projects/jboss-osgi/trunk/bundle/common/src/main/ projects/jboss-osgi/trunk/bundle/common/src/main/java/ projects/jboss-osgi/trunk/bundle/common/src/main/java/org/ projects/jboss-osgi/trunk/bundle/common/src/main/java/org/jboss/ projects/jboss-osgi/trunk/bundle/common/src/main/java/org/jboss/osgi/ projects/jboss-osgi/trunk/bundle/common/src/main/java/org/jboss/osgi/common/ projects/jboss-osgi/trunk/bundle/common/src/main/java/org/jboss/osgi/common/log/ projects/jboss-osgi/trunk/bundle/common/src/main/java/org/jboss/osgi/common/log/LogServiceTracker.java 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/logging/ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/logging/LogEntryCache.java projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/logging/LogEntryFilter.java projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/logging/RemoteLogReaderService.java projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/logging/StringConstants.java projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/logging/internal/ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/logging/internal/LogEntryImpl.java Removed: projects/jboss-osgi/trunk/bundle/common/.classpath projects/jboss-osgi/trunk/bundle/common/.project projects/jboss-osgi/trunk/bundle/common/.settings/ projects/jboss-osgi/trunk/bundle/common/.settings/org.eclipse.jdt.core.prefs projects/jboss-osgi/trunk/bundle/common/.settings/org.maven.ide.eclipse.prefs projects/jboss-osgi/trunk/bundle/common/pom.xml projects/jboss-osgi/trunk/bundle/common/src/ projects/jboss-osgi/trunk/bundle/common/src/main/ projects/jboss-osgi/trunk/bundle/common/src/main/java/ projects/jboss-osgi/trunk/bundle/common/src/main/java/org/ projects/jboss-osgi/trunk/bundle/common/src/main/java/org/jboss/ projects/jboss-osgi/trunk/bundle/common/src/main/java/org/jboss/osgi/ projects/jboss-osgi/trunk/bundle/common/src/main/java/org/jboss/osgi/common/ projects/jboss-osgi/trunk/bundle/common/src/main/java/org/jboss/osgi/common/log/ projects/jboss-osgi/trunk/bundle/common/src/main/java/org/jboss/osgi/common/log/LogServiceTracker.java 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/ 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/runtime/felix/pom.xml projects/jboss-osgi/trunk/runtime/felix/scripts/assembly-bundles.xml 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/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: Cleanup dependencie on logging API Modified: projects/jboss-osgi/trunk/build/distribution/pom.xml =================================================================== --- projects/jboss-osgi/trunk/build/distribution/pom.xml 2009-04-16 10:17:13 UTC (rev 87408) +++ projects/jboss-osgi/trunk/build/distribution/pom.xml 2009-04-16 11:05:27 UTC (rev 87409) @@ -36,6 +36,17 @@ <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-common</artifactId> + <classifier>sources</classifier> + <version>${version}</version> + </dependency> + <dependency> + <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-logging</artifactId> <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 10:17:13 UTC (rev 87408) +++ projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/install-definition.xml 2009-04-16 11:05:27 UTC (rev 87409) @@ -119,6 +119,7 @@ <include name="jboss-osgi-runtime-deployer.jar" /> <include name="jboss-osgi-runtime-felix.jar" /> <include name="jboss-osgi-spi.jar" /> + <include name="jboss-osgi-common.jar" /> <include name="jboss-osgi-logging.jar" /> <include name="jboss-osgi-webconsole.jar" /> <include name="org.apache.felix.framework.jar" /> @@ -135,6 +136,7 @@ <include name="jboss-osgi-runtime-deployer-sources.jar" /> <include name="jboss-osgi-runtime-felix-sources.jar" /> <include name="jboss-osgi-spi-sources.jar" /> + <include name="jboss-osgi-common-sources.jar" /> <include name="jboss-osgi-logging-sources.jar" /> <include name="jboss-osgi-webconsole-sources.jar" /> </fileset> @@ -169,6 +171,7 @@ <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> @@ -244,6 +247,7 @@ <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> Copied: projects/jboss-osgi/trunk/bundle/common (from rev 87406, projects/jboss-osgi/trunk/bundle/common) Property changes on: projects/jboss-osgi/trunk/bundle/common ___________________________________________________________________ Name: svn:ignore + target Deleted: projects/jboss-osgi/trunk/bundle/common/.classpath =================================================================== --- projects/jboss-osgi/trunk/bundle/common/.classpath 2009-04-16 08:53:22 UTC (rev 87406) +++ projects/jboss-osgi/trunk/bundle/common/.classpath 2009-04-16 11:05:27 UTC (rev 87409) @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" output="target/classes" path="src/main/java"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> - <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> - <classpathentry kind="output" path="target/classes"/> -</classpath> Copied: projects/jboss-osgi/trunk/bundle/common/.classpath (from rev 87406, projects/jboss-osgi/trunk/bundle/common/.classpath) =================================================================== --- projects/jboss-osgi/trunk/bundle/common/.classpath (rev 0) +++ projects/jboss-osgi/trunk/bundle/common/.classpath 2009-04-16 11:05:27 UTC (rev 87409) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" output="target/classes" path="src/main/java"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> + <classpathentry kind="output" path="target/classes"/> +</classpath> Deleted: projects/jboss-osgi/trunk/bundle/common/.project =================================================================== --- projects/jboss-osgi/trunk/bundle/common/.project 2009-04-16 08:53:22 UTC (rev 87406) +++ projects/jboss-osgi/trunk/bundle/common/.project 2009-04-16 11:05:27 UTC (rev 87409) @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>jboss-osgi-common</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.maven.ide.eclipse.maven2Builder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.jdt.core.javanature</nature> - <nature>org.maven.ide.eclipse.maven2Nature</nature> - </natures> -</projectDescription> Copied: projects/jboss-osgi/trunk/bundle/common/.project (from rev 87406, projects/jboss-osgi/trunk/bundle/common/.project) =================================================================== --- projects/jboss-osgi/trunk/bundle/common/.project (rev 0) +++ projects/jboss-osgi/trunk/bundle/common/.project 2009-04-16 11:05:27 UTC (rev 87409) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>jboss-osgi-common</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.maven.ide.eclipse.maven2Builder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.maven.ide.eclipse.maven2Nature</nature> + </natures> +</projectDescription> Copied: projects/jboss-osgi/trunk/bundle/common/.settings (from rev 87406, projects/jboss-osgi/trunk/bundle/common/.settings) Deleted: projects/jboss-osgi/trunk/bundle/common/.settings/org.eclipse.jdt.core.prefs =================================================================== --- projects/jboss-osgi/trunk/bundle/common/.settings/org.eclipse.jdt.core.prefs 2009-04-16 08:53:22 UTC (rev 87406) +++ projects/jboss-osgi/trunk/bundle/common/.settings/org.eclipse.jdt.core.prefs 2009-04-16 11:05:27 UTC (rev 87409) @@ -1,5 +0,0 @@ -#Tue Apr 14 17:48:49 CEST 2009 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 -org.eclipse.jdt.core.compiler.source=1.5 Copied: projects/jboss-osgi/trunk/bundle/common/.settings/org.eclipse.jdt.core.prefs (from rev 87406, projects/jboss-osgi/trunk/bundle/common/.settings/org.eclipse.jdt.core.prefs) =================================================================== --- projects/jboss-osgi/trunk/bundle/common/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ projects/jboss-osgi/trunk/bundle/common/.settings/org.eclipse.jdt.core.prefs 2009-04-16 11:05:27 UTC (rev 87409) @@ -0,0 +1,5 @@ +#Tue Apr 14 17:48:49 CEST 2009 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.source=1.5 Deleted: projects/jboss-osgi/trunk/bundle/common/.settings/org.maven.ide.eclipse.prefs =================================================================== --- projects/jboss-osgi/trunk/bundle/common/.settings/org.maven.ide.eclipse.prefs 2009-04-16 08:53:22 UTC (rev 87406) +++ projects/jboss-osgi/trunk/bundle/common/.settings/org.maven.ide.eclipse.prefs 2009-04-16 11:05:27 UTC (rev 87409) @@ -1,9 +0,0 @@ -#Tue Apr 14 17:48:48 CEST 2009 -activeProfiles= -eclipse.preferences.version=1 -fullBuildGoals=process-test-resources -includeModules=false -resolveWorkspaceProjects=true -resourceFilterGoals=process-resources resources\:testResources -skipCompilerPlugin=true -version=1 Copied: projects/jboss-osgi/trunk/bundle/common/.settings/org.maven.ide.eclipse.prefs (from rev 87406, projects/jboss-osgi/trunk/bundle/common/.settings/org.maven.ide.eclipse.prefs) =================================================================== --- projects/jboss-osgi/trunk/bundle/common/.settings/org.maven.ide.eclipse.prefs (rev 0) +++ projects/jboss-osgi/trunk/bundle/common/.settings/org.maven.ide.eclipse.prefs 2009-04-16 11:05:27 UTC (rev 87409) @@ -0,0 +1,9 @@ +#Tue Apr 14 17:48:48 CEST 2009 +activeProfiles= +eclipse.preferences.version=1 +fullBuildGoals=process-test-resources +includeModules=false +resolveWorkspaceProjects=true +resourceFilterGoals=process-resources resources\:testResources +skipCompilerPlugin=true +version=1 Deleted: projects/jboss-osgi/trunk/bundle/common/pom.xml =================================================================== --- projects/jboss-osgi/trunk/bundle/common/pom.xml 2009-04-16 08:53:22 UTC (rev 87406) +++ projects/jboss-osgi/trunk/bundle/common/pom.xml 2009-04-16 11:05:27 UTC (rev 87409) @@ -1,59 +0,0 @@ -<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 - Bundle Common</name> - <artifactId>jboss-osgi-common</artifactId> - <packaging>bundle</packaging> - - <parent> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-bundle</artifactId> - <version>1.0.0.Beta1</version> - </parent> - - <!-- Properties --> - <properties> - </properties> - - <!-- 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> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <instructions> - <Bundle-SymbolicName>org.jboss.osgi.common</Bundle-SymbolicName> - <Export-Package> - org.jboss.osgi.common, - org.jboss.osgi.common.log - </Export-Package> - <Private-Package> - org.jboss.osgi.common.log.internal - </Private-Package> - <Import-Package> - org.osgi.framework;version=1.4, - org.osgi.service.log;version=1.3, - org.osgi.util.tracker - </Import-Package> - </instructions> - </configuration> - </plugin> - </plugins> - </build> - -</project> Copied: projects/jboss-osgi/trunk/bundle/common/pom.xml (from rev 87406, projects/jboss-osgi/trunk/bundle/common/pom.xml) =================================================================== --- projects/jboss-osgi/trunk/bundle/common/pom.xml (rev 0) +++ projects/jboss-osgi/trunk/bundle/common/pom.xml 2009-04-16 11:05:27 UTC (rev 87409) @@ -0,0 +1,64 @@ +<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 - Bundle Common</name> + <artifactId>jboss-osgi-common</artifactId> + <packaging>bundle</packaging> + + <parent> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-bundle</artifactId> + <version>1.0.0.Beta1</version> + </parent> + + <!-- Properties --> + <properties> + </properties> + + <!-- Dependencies --> + <dependencies> + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging-spi</artifactId> + <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> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <instructions> + <Bundle-SymbolicName>org.jboss.osgi.common</Bundle-SymbolicName> + <Export-Package> + org.jboss.osgi.common, + org.jboss.osgi.common.log + </Export-Package> + <Private-Package> + org.jboss.osgi.common.log.internal + </Private-Package> + <Import-Package> + org.osgi.framework;version=1.4, + org.osgi.service.log;version=1.3, + org.osgi.util.tracker + </Import-Package> + </instructions> + </configuration> + </plugin> + </plugins> + </build> + +</project> Copied: projects/jboss-osgi/trunk/bundle/common/src (from rev 87406, projects/jboss-osgi/trunk/bundle/common/src) Copied: projects/jboss-osgi/trunk/bundle/common/src/main (from rev 87406, projects/jboss-osgi/trunk/bundle/common/src/main) Copied: projects/jboss-osgi/trunk/bundle/common/src/main/java (from rev 87406, projects/jboss-osgi/trunk/bundle/common/src/main/java) Copied: projects/jboss-osgi/trunk/bundle/common/src/main/java/org (from rev 87406, projects/jboss-osgi/trunk/bundle/common/src/main/java/org) Copied: projects/jboss-osgi/trunk/bundle/common/src/main/java/org/jboss (from rev 87406, projects/jboss-osgi/trunk/bundle/common/src/main/java/org/jboss) Copied: projects/jboss-osgi/trunk/bundle/common/src/main/java/org/jboss/osgi (from rev 87406, projects/jboss-osgi/trunk/bundle/common/src/main/java/org/jboss/osgi) Copied: projects/jboss-osgi/trunk/bundle/common/src/main/java/org/jboss/osgi/common (from rev 87406, projects/jboss-osgi/trunk/bundle/common/src/main/java/org/jboss/osgi/common) Copied: projects/jboss-osgi/trunk/bundle/common/src/main/java/org/jboss/osgi/common/log (from rev 87406, projects/jboss-osgi/trunk/bundle/common/src/main/java/org/jboss/osgi/common/log) Deleted: projects/jboss-osgi/trunk/bundle/common/src/main/java/org/jboss/osgi/common/log/LogServiceTracker.java =================================================================== --- projects/jboss-osgi/trunk/bundle/common/src/main/java/org/jboss/osgi/common/log/LogServiceTracker.java 2009-04-16 08:53:22 UTC (rev 87406) +++ projects/jboss-osgi/trunk/bundle/common/src/main/java/org/jboss/osgi/common/log/LogServiceTracker.java 2009-04-16 11:05:27 UTC (rev 87409) @@ -1,81 +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.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(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/bundle/common/src/main/java/org/jboss/osgi/common/log/LogServiceTracker.java (from rev 87406, projects/jboss-osgi/trunk/bundle/common/src/main/java/org/jboss/osgi/common/log/LogServiceTracker.java) =================================================================== --- projects/jboss-osgi/trunk/bundle/common/src/main/java/org/jboss/osgi/common/log/LogServiceTracker.java (rev 0) +++ projects/jboss-osgi/trunk/bundle/common/src/main/java/org/jboss/osgi/common/log/LogServiceTracker.java 2009-04-16 11:05:27 UTC (rev 87409) @@ -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.common.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(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 Deleted: projects/jboss-osgi/trunk/bundle/common/src/main/java/org/jboss/osgi/common/log/SystemLogService.java =================================================================== --- projects/jboss-osgi/trunk/bundle/common/src/main/java/org/jboss/osgi/common/log/SystemLogService.java 2009-04-16 08:53:22 UTC (rev 87406) +++ projects/jboss-osgi/trunk/bundle/common/src/main/java/org/jboss/osgi/common/log/SystemLogService.java 2009-04-16 11:05:27 UTC (rev 87409) @@ -1,77 +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.log; - -//$Id$ - -import org.jboss.osgi.common.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(a)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/bundle/common/src/main/java/org/jboss/osgi/common/log/SystemLogService.java (from rev 87406, projects/jboss-osgi/trunk/bundle/common/src/main/java/org/jboss/osgi/common/log/SystemLogService.java) =================================================================== --- projects/jboss-osgi/trunk/bundle/common/src/main/java/org/jboss/osgi/common/log/SystemLogService.java (rev 0) +++ projects/jboss-osgi/trunk/bundle/common/src/main/java/org/jboss/osgi/common/log/SystemLogService.java 2009-04-16 11:05:27 UTC (rev 87409) @@ -0,0 +1,115 @@ +/* + * 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 java.text.SimpleDateFormat; +import java.util.Date; + +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(a)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 sref, int level, String message, Throwable exception) + { + long time = System.currentTimeMillis(); + Bundle bundle = context.getBundle(); + + String bndStr = bundle.getSymbolicName(); + + String srefStr = null; + if (sref != null && sref.getBundle() != null) + srefStr = sref.getBundle().getSymbolicName(); + + 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 : ""; + + System.out.println("[" + t + l + b + s + m + e + "]"); + + if (exception != null) + exception.printStackTrace(System.out); + } + + 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; + } +} \ No newline at end of file Modified: projects/jboss-osgi/trunk/bundle/logging/pom.xml =================================================================== --- projects/jboss-osgi/trunk/bundle/logging/pom.xml 2009-04-16 10:17:13 UTC (rev 87408) +++ projects/jboss-osgi/trunk/bundle/logging/pom.xml 2009-04-16 11:05:27 UTC (rev 87409) @@ -22,6 +22,11 @@ <!-- Dependencies --> <dependencies> <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging-spi</artifactId> + <scope>provided</scope> + </dependency> + <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.core</artifactId> <scope>provided</scope> @@ -31,11 +36,6 @@ <artifactId>org.osgi.compendium</artifactId> <scope>provided</scope> </dependency> - <dependency> - <groupId>org.jboss.logging</groupId> - <artifactId>jboss-logging-spi</artifactId> - <scope>provided</scope> - </dependency> </dependencies> <build> Modified: projects/jboss-osgi/trunk/bundle/pom.xml =================================================================== --- projects/jboss-osgi/trunk/bundle/pom.xml 2009-04-16 10:17:13 UTC (rev 87408) +++ projects/jboss-osgi/trunk/bundle/pom.xml 2009-04-16 11:05:27 UTC (rev 87409) @@ -13,6 +13,7 @@ <!-- 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 10:17:13 UTC (rev 87408) +++ projects/jboss-osgi/trunk/bundle/remotelog/pom.xml 2009-04-16 11:05:27 UTC (rev 87409) @@ -84,7 +84,7 @@ org.osgi.framework, org.osgi.service.log, org.osgi.util.tracker, - + javax.crypto;resolution:=optional, javax.crypto.spec;resolution:=optional, javax.management, @@ -96,7 +96,7 @@ org.apache.log4j, org.jboss.logging, org.jboss.mx.util;resolution:=optional, - org.jboss.osgi.spi.service.log, + org.jboss.osgi.spi.logging, 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 10:17:13 UTC (rev 87408) +++ projects/jboss-osgi/trunk/bundle/remotelog/src/main/java/org/jboss/osgi/service/remotelog/RemoteLogActivator.java 2009-04-16 11:05:27 UTC (rev 87409) @@ -26,7 +26,7 @@ import java.util.Properties; import org.jboss.osgi.service.remotelog.internal.RemoteLogReaderServiceImpl; -import org.jboss.osgi.spi.service.log.RemoteLogReaderService; +import org.jboss.osgi.spi.logging.RemoteLogReaderService; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceRegistration; 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 10:17:13 UTC (rev 87408) +++ projects/jboss-osgi/trunk/bundle/remotelog/src/main/java/org/jboss/osgi/service/remotelog/internal/RemoteLogReaderServiceImpl.java 2009-04-16 11:05:27 UTC (rev 87409) @@ -32,7 +32,7 @@ import org.jboss.osgi.service.remotelog.NotImplementedException; import org.jboss.osgi.service.remotelog.RemoteLogActivator; -import org.jboss.osgi.spi.service.log.RemoteLogReaderService; +import org.jboss.osgi.spi.logging.RemoteLogReaderService; import org.jboss.remoting.InvocationRequest; import org.jboss.remoting.InvokerLocator; import org.jboss.remoting.ServerInvocationHandler; Modified: projects/jboss-osgi/trunk/runtime/felix/pom.xml =================================================================== --- projects/jboss-osgi/trunk/runtime/felix/pom.xml 2009-04-16 10:17:13 UTC (rev 87408) +++ projects/jboss-osgi/trunk/runtime/felix/pom.xml 2009-04-16 11:05:27 UTC (rev 87409) @@ -47,6 +47,12 @@ </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 10:17:13 UTC (rev 87408) +++ projects/jboss-osgi/trunk/runtime/felix/scripts/assembly-bundles.xml 2009-04-16 11:05:27 UTC (rev 87409) @@ -16,6 +16,7 @@ <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/resources/jboss-osgi-beans.xml =================================================================== --- projects/jboss-osgi/trunk/runtime/felix/src/main/resources/jboss-osgi-beans.xml 2009-04-16 10:17:13 UTC (rev 87408) +++ projects/jboss-osgi/trunk/runtime/felix/src/main/resources/jboss-osgi-beans.xml 2009-04-16 11:05:27 UTC (rev 87409) @@ -11,7 +11,7 @@ <entry> <key>org.osgi.framework.system.packages</key> <value> - org.jboss.osgi.spi.service.log, + org.jboss.osgi.spi.logging, org.osgi.framework; version=1.4, org.osgi.service.log; version=1.3, org.osgi.util.tracker; version=1.3, @@ -40,6 +40,7 @@ <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 10:17:13 UTC (rev 87408) +++ projects/jboss-osgi/trunk/runtime/felix/src/main/resources/osgi-deployers-jboss-beans.xml 2009-04-16 11:05:27 UTC (rev 87409) @@ -16,8 +16,8 @@ javax.management, javax.xml.parsers, org.jboss.logging, + org.jboss.osgi.spi.logging, org.jboss.osgi.spi.management, - org.jboss.osgi.spi.service.log, org.jboss.osgi.spi.service.microcontainer, org.osgi.framework; version=1.4, org.osgi.service.packageadmin; version=1.2, @@ -51,6 +51,7 @@ <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/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 10:17:13 UTC (rev 87408) +++ projects/jboss-osgi/trunk/runtime/testing/src/main/java/org/jboss/osgi/spi/junit/IntegrationTest.java 2009-04-16 11:05:27 UTC (rev 87409) @@ -29,7 +29,7 @@ import org.jboss.osgi.spi.framework.RemoteBundle; import org.jboss.osgi.spi.framework.RemoteFramework; -import org.jboss.osgi.spi.service.log.LogEntryCache; +import org.jboss.osgi.spi.logging.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 10:17:13 UTC (rev 87408) +++ projects/jboss-osgi/trunk/runtime/testing/src/main/java/org/jboss/osgi/spi/junit/IntegrationTestHelper.java 2009-04-16 11:05:27 UTC (rev 87409) @@ -41,12 +41,12 @@ import org.jboss.osgi.spi.framework.RemoteBundle; import org.jboss.osgi.spi.framework.RemoteFramework; import org.jboss.osgi.spi.framework.RemoteFrameworkException; +import org.jboss.osgi.spi.logging.LogEntryCache; +import org.jboss.osgi.spi.logging.RemoteLogReaderService; import org.jboss.osgi.spi.management.MBeanProxy; 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/src/main/java/org/jboss/osgi/spi/logging/LogEntryCache.java (from rev 87408, 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/logging/LogEntryCache.java (rev 0) +++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/logging/LogEntryCache.java 2009-04-16 11:05:27 UTC (rev 87409) @@ -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.logging; + +//$Id$ + +import java.util.ArrayList; +import java.util.List; + +import org.jboss.osgi.spi.logging.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(a)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/logging/LogEntryFilter.java (from rev 87408, 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/logging/LogEntryFilter.java (rev 0) +++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/logging/LogEntryFilter.java 2009-04-16 11:05:27 UTC (rev 87409) @@ -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.logging; + +//$Id$ + + +/** + * A LogEntry filter that can be used with the LogEntryCache + * + * @author thomas.diesler(a)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/logging/RemoteLogReaderService.java (from rev 87408, 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/logging/RemoteLogReaderService.java (rev 0) +++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/logging/RemoteLogReaderService.java 2009-04-16 11:05:27 UTC (rev 87409) @@ -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.logging; + +//$Id$ + +import org.osgi.service.log.LogReaderService; + +/** + * [TODO] + * + * @author thomas.diesler(a)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/logging/StringConstants.java (from rev 87408, 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/logging/StringConstants.java (rev 0) +++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/logging/StringConstants.java 2009-04-16 11:05:27 UTC (rev 87409) @@ -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.logging; + +//$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(a)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/logging/internal/LogEntryImpl.java (from rev 87408, projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/service/log/internal/LogEntryImpl.java) =================================================================== --- projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/logging/internal/LogEntryImpl.java (rev 0) +++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/logging/internal/LogEntryImpl.java 2009-04-16 11:05:27 UTC (rev 87409) @@ -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.logging.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(a)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 10:17:13 UTC (rev 87408) +++ projects/jboss-osgi/trunk/testsuite/example/pom.xml 2009-04-16 11:05:27 UTC (rev 87409) @@ -63,6 +63,12 @@ </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 10:17:13 UTC (rev 87408) +++ projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-bundles.xml 2009-04-16 11:05:27 UTC (rev 87409) @@ -16,6 +16,7 @@ <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 10:17:13 UTC (rev 87408) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/log/LogServiceRemoteTestCase.java 2009-04-16 11:05:27 UTC (rev 87409) @@ -27,9 +27,9 @@ 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.jboss.osgi.spi.logging.LogEntryCache; +import org.jboss.osgi.spi.logging.LogEntryFilter; +import org.jboss.osgi.spi.logging.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 10:17:13 UTC (rev 87408) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/log/LogServiceTestCase.java 2009-04-16 11:05:27 UTC (rev 87409) @@ -29,8 +29,8 @@ 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.jboss.osgi.spi.logging.LogEntryCache; +import org.jboss.osgi.spi.logging.LogEntryFilter; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; 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 10:17:13 UTC (rev 87408) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/log/bundle/ServiceA.java 2009-04-16 11:05:27 UTC (rev 87409) @@ -25,7 +25,7 @@ import static org.osgi.service.log.LogService.LOG_INFO; -import org.jboss.osgi.spi.service.log.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/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-04-16 10:17:13 UTC (rev 87408) +++ projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-04-16 11:05:27 UTC (rev 87409) @@ -63,6 +63,12 @@ </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 10:17:13 UTC (rev 87408) +++ projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-bundles.xml 2009-04-16 11:05:27 UTC (rev 87409) @@ -16,6 +16,7 @@ <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 10:17:13 UTC (rev 87408) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi37/bundleA/ServiceA.java 2009-04-16 11:05:27 UTC (rev 87409) @@ -23,7 +23,7 @@ //$Id: ServiceA.java 87351 2009-04-15 14:25:32Z thomas.diesler(a)jboss.com $ -import org.jboss.osgi.spi.service.log.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-04-16 10:17:13 UTC (rev 87408) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi37/bundleB/ServiceB.java 2009-04-16 11:05:27 UTC (rev 87409) @@ -23,7 +23,7 @@ //$Id: ServiceB.java 87351 2009-04-15 14:25:32Z thomas.diesler(a)jboss.com $ -import org.jboss.osgi.spi.service.log.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/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 10:17:13 UTC (rev 87408) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/startlevel/bundle/ServiceActivator.java 2009-04-16 11:05:27 UTC (rev 87409) @@ -23,7 +23,7 @@ //$Id: ServiceActivator.java 87336 2009-04-15 11:31:26Z thomas.diesler(a)jboss.com $ -import org.jboss.osgi.spi.service.log.LogServiceTracker; +import org.jboss.osgi.common.log.LogServiceTracker; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; import org.osgi.service.log.LogService;