4:28 a.m.
Author: thomas.diesler(a)jboss.com
Date: 2010-01-29 05:28:07 -0500 (Fri, 29 Jan 2010)
New Revision: 100117
Added:
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi161/bundle/LoggingDelegate.java
Modified:
projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi161/OSGi161TestCase.java
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi161/bundle/OSGi161Activator.java
projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi161/jbosgi161-bundle.bnd
Log:
[JBOSGI-279] Update to jboss-cl-2.2.x stable release
Update to 2.2.0.Alpha1
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml 2010-01-29 09:40:50 UTC
(rev 100116)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml 2010-01-29 10:28:07 UTC
(rev 100117)
@@ -47,9 +47,10 @@
<version.apache.felix.log>1.0.0</version.apache.felix.log>
<version.apache.felix.metatype>1.0.2</version.apache.felix.metatype>
<version.drools>5.0.1</version.drools>
- <version.jboss.classloading>2.2.0-SNAPSHOT</version.jboss.classloading>
+ <version.jboss.classloading>2.2.0.Alpha1</version.jboss.classloading>
<version.jboss.deployers>2.2.0.Alpha1</version.jboss.deployers>
<version.jboss.kernel>2.2.0.Alpha2</version.jboss.kernel>
+ <version.jboss.logging>2.1.0.GA</version.jboss.logging>
<version.jboss.osgi.apache.xerces>2.9.1.SP3</version.jboss.osgi.apache.xerces>
<version.jboss.osgi.common>1.0.3</version.jboss.osgi.common>
<version.jboss.osgi.common.core>2.2.13.GA</version.jboss.osgi.common.core>
@@ -116,6 +117,11 @@
<version>${version.jboss.kernel}</version>
</dependency>
<dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ <version>${version.jboss.logging}</version>
+ </dependency>
+ <dependency>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-spi</artifactId>
<version>${version.jboss.osgi.spi}</version>
Modified:
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi161/OSGi161TestCase.java
===================================================================
---
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi161/OSGi161TestCase.java 2010-01-29
09:40:50 UTC (rev 100116)
+++
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi161/OSGi161TestCase.java 2010-01-29
10:28:07 UTC (rev 100117)
@@ -26,7 +26,8 @@
import org.jboss.osgi.spi.capability.LogServiceCapability;
import org.jboss.osgi.testing.OSGiBundle;
import org.jboss.osgi.testing.OSGiRuntime;
-import org.jboss.osgi.testing.OSGiTestHelper;
+import org.jboss.osgi.testing.OSGiTest;
+import org.jboss.test.osgi.jbosgi161.bundle.LoggingDelegate;
import org.junit.Test;
import org.osgi.framework.Bundle;
@@ -38,19 +39,22 @@
* @author thomas.diesler(a)jboss.com
* @since 07-Oct-2009
*/
-public class OSGi161TestCase
+public class OSGi161TestCase extends OSGiTest
{
@Test
public void testClientLogging() throws Exception
{
+ String logmsg = "testClientLogging";
+ LoggingDelegate.assertJBossLogging(logmsg);
+ LoggingDelegate.assertCommonsLogging(logmsg);
+ LoggingDelegate.assertSL4J(logmsg);
}
@Test
public void testFrameworkLogging() throws Exception
{
- OSGiTestHelper helper = new OSGiTestHelper();
- OSGiRuntime runtime = helper.getDefaultRuntime();
+ OSGiRuntime runtime = getDefaultRuntime();
try
{
runtime.addCapability(new LogServiceCapability());
@@ -58,7 +62,7 @@
OSGiBundle bundleA = runtime.installBundle("jbosgi161-bundle.jar");
bundleA.start();
- helper.assertBundleState(Bundle.ACTIVE, bundleA.getState());
+ assertBundleState(Bundle.ACTIVE, bundleA.getState());
bundleA.uninstall();
}
finally
Added:
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi161/bundle/LoggingDelegate.java
===================================================================
---
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi161/bundle/LoggingDelegate.java
(rev 0)
+++
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi161/bundle/LoggingDelegate.java 2010-01-29
10:28:07 UTC (rev 100117)
@@ -0,0 +1,85 @@
+/*
+ * 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.test.osgi.jbosgi161.bundle;
+
+// $Id:$
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class LoggingDelegate
+{
+ public static void assertJBossLogging(String message)
+ {
+ org.jboss.logging.Logger log =
org.jboss.logging.Logger.getLogger(LoggingDelegate.class);
+
+ String loggerClass = log.getClass().getName();
+
+ List<String> expected = new ArrayList<String>();
+ expected.add("org.jboss.logging.Logger");
+
+ if (expected.contains(loggerClass) == false)
+ throw new IllegalStateException("Unexpected logger: " + loggerClass);
+
+ log.info("*******************************************");
+ log.info("* jboss: " + message);
+ log.info("*******************************************");
+ }
+
+ public static void assertCommonsLogging(String message)
+ {
+ org.apache.commons.logging.Log log =
org.apache.commons.logging.LogFactory.getLog(LoggingDelegate.class);
+
+ String loggerClass = log.getClass().getName();
+
+ List<String> expected = new ArrayList<String>();
+ expected.add("org.apache.commons.logging.impl.SLF4JLog");
+ expected.add("org.apache.commons.logging.impl.Log4JLogger");
+ expected.add("org.apache.commons.logging.impl.SLF4JLocationAwareLog");
+
+ if (expected.contains(loggerClass) == false)
+ throw new IllegalStateException("Unexpected logger: " + loggerClass);
+
+ log.info("*******************************************");
+ log.info("* jcl: " + message);
+ log.info("*******************************************");
+ }
+
+ public static void assertSL4J(String message)
+ {
+ org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggingDelegate.class);
+
+ String loggerClass = log.getClass().getName();
+
+ List<String> expected = new ArrayList<String>();
+ expected.add("org.jboss.slf4j.JBossLoggerAdapter");
+ expected.add("org.slf4j.impl.Log4jLoggerAdapter");
+ expected.add("org.slf4j.impl.Slf4jLogger");
+
+ if (expected.contains(loggerClass) == false)
+ throw new IllegalStateException("Unexpected logger: " + loggerClass);
+
+ log.info("*******************************************");
+ log.info("* slf4j: " + message);
+ log.info("*******************************************");
+ }
+}
\ No newline at end of file
Property changes on:
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi161/bundle/LoggingDelegate.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified:
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi161/bundle/OSGi161Activator.java
===================================================================
---
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi161/bundle/OSGi161Activator.java 2010-01-29
09:40:50 UTC (rev 100116)
+++
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi161/bundle/OSGi161Activator.java 2010-01-29
10:28:07 UTC (rev 100117)
@@ -23,64 +23,21 @@
// $Id:$
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class OSGi161Activator implements BundleActivator
{
public void start(BundleContext context) throws Exception
{
- assertCommonsLogging(context);
+ String logmsg = context.getBundle().getSymbolicName();
- assertSL4J(context);
+ LoggingDelegate.assertJBossLogging(logmsg);
+ LoggingDelegate.assertCommonsLogging(logmsg);
+ LoggingDelegate.assertSL4J(logmsg);
}
public void stop(BundleContext context) throws Exception
{
}
-
- private void assertCommonsLogging(BundleContext context)
- {
- Log log = LogFactory.getLog(OSGi161Activator.class);
-
- String loggerClass = log.getClass().getName();
-
- List<String> expected = new ArrayList<String>();
- expected.add("org.apache.commons.logging.impl.SLF4JLog");
- expected.add("org.apache.commons.logging.impl.Log4JLogger");
- expected.add("org.apache.commons.logging.impl.SLF4JLocationAwareLog");
-
- if (expected.contains(loggerClass) == false)
- throw new IllegalStateException("Unexpected logger: " + loggerClass);
-
- log.info("*******************************************");
- log.info("* jcl: " + context.getBundle());
- log.info("*******************************************");
- }
-
- private void assertSL4J(BundleContext context)
- {
- Logger log = LoggerFactory.getLogger(OSGi161Activator.class);
-
- String loggerClass = log.getClass().getName();
-
- List<String> expected = new ArrayList<String>();
- expected.add("org.jboss.slf4j.JBossLoggerAdapter");
- expected.add("org.slf4j.impl.Log4jLoggerAdapter");
- expected.add("org.slf4j.impl.Slf4jLogger");
-
- if (expected.contains(loggerClass) == false)
- throw new IllegalStateException("Unexpected logger: " + loggerClass);
-
- log.info("*******************************************");
- log.info("* slf4j: " + context.getBundle());
- log.info("*******************************************");
- }
}
\ No newline at end of file
Modified:
projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi161/jbosgi161-bundle.bnd
===================================================================
---
projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi161/jbosgi161-bundle.bnd 2010-01-29
09:40:50 UTC (rev 100116)
+++
projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi161/jbosgi161-bundle.bnd 2010-01-29
10:28:07 UTC (rev 100117)
@@ -3,4 +3,4 @@
Bundle-SymbolicName: jbosgi161-bundle
Bundle-Activator: org.jboss.test.osgi.jbosgi161.bundle.OSGi161Activator
Private-Package: org.jboss.test.osgi.jbosgi161.bundle
-Import-Package: org.apache.commons.logging, org.slf4j, org.osgi.framework
+Import-Package: org.apache.commons.logging, org.slf4j, org.jboss.logging,
org.osgi.framework