[jboss-cvs] JBossAS SVN: r85654 - in trunk: component-matrix and 4 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: david.lloyd at jboss.com
Date: 2009-03-09 19:11:15 -0400 (Mon, 09 Mar 2009)
New Revision: 85654

Added:
   trunk/server/src/etc/deployers/logbridge-jboss-beans.xml
Modified:
   trunk/build/build-distr.xml
   trunk/component-matrix/pom.xml
   trunk/main/pom.xml
   trunk/main/src/main/org/jboss/system/server/ServerLoader.java
   trunk/thirdparty/pom.xml
Log:
Update to logbridge 1.0.0.CR3, logmanager 1.0.0.CR2, logging-log4j 2.0.6.GA

Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml	2009-03-09 22:09:49 UTC (rev 85653)
+++ trunk/build/build-distr.xml	2009-03-09 23:11:15 UTC (rev 85654)
@@ -1840,7 +1840,7 @@
         <exclude name="*-sources.jar"/>
       </fileset>
       <fileset dir="${org.jboss.logbridge.lib}">
-        <include name="logbridge.jar"/>
+        <include name="jboss-logbridge.jar"/>
       </fileset>
       <fileset dir="${org.jboss.logmanager.lib}">
         <include name="jboss-logmanager.jar"/>

Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2009-03-09 22:09:49 UTC (rev 85653)
+++ trunk/component-matrix/pom.xml	2009-03-09 23:11:15 UTC (rev 85654)
@@ -71,8 +71,8 @@
     <version.org.jboss.integration>6.0.0.Alpha7</version.org.jboss.integration>
     <version.org.jboss.jbossxb>2.0.0.GA</version.org.jboss.jbossxb>
     <version.org.jboss.jpa>1.0.0-CR1</version.org.jboss.jpa>
-    <version.org.jboss.logbridge>1.0.0.CR1</version.org.jboss.logbridge>
-    <version.org.jboss.logmanager>1.0.0.CR1</version.org.jboss.logmanager>
+    <version.org.jboss.logbridge>1.0.0.CR3</version.org.jboss.logbridge>
+    <version.org.jboss.logmanager>1.0.0.CR2</version.org.jboss.logmanager>
     <version.org.jboss.man>2.1.0.CR3</version.org.jboss.man>
     <version.org.jboss.mdr>2.0.1.GA</version.org.jboss.mdr>
     <version.org.jboss.metadata>1.0.0.CR16</version.org.jboss.metadata>
@@ -596,7 +596,7 @@
       <dependency>
         <groupId>org.jboss.logging</groupId>
         <artifactId>jboss-logging-log4j</artifactId>
-        <version>2.0.5.GA</version>
+        <version>2.0.6.GA</version>
         <exclusions>
           <exclusion>
             <groupId>apache-log4j</groupId>
@@ -607,7 +607,7 @@
 
       <dependency>
         <groupId>org.jboss.logbridge</groupId>
-        <artifactId>logbridge</artifactId>
+        <artifactId>jboss-logbridge</artifactId>
         <version>${version.org.jboss.logbridge}</version>
         <exclusions>
           <exclusion>

Modified: trunk/main/pom.xml
===================================================================
--- trunk/main/pom.xml	2009-03-09 22:09:49 UTC (rev 85653)
+++ trunk/main/pom.xml	2009-03-09 23:11:15 UTC (rev 85654)
@@ -182,7 +182,7 @@
     </dependency>
     <dependency>
       <groupId>org.jboss.logbridge</groupId>
-      <artifactId>logbridge</artifactId>
+      <artifactId>jboss-logbridge</artifactId>
     </dependency>
   </dependencies>
   

Modified: trunk/main/src/main/org/jboss/system/server/ServerLoader.java
===================================================================
--- trunk/main/src/main/org/jboss/system/server/ServerLoader.java	2009-03-09 22:09:49 UTC (rev 85653)
+++ trunk/main/src/main/org/jboss/system/server/ServerLoader.java	2009-03-09 23:11:15 UTC (rev 85654)
@@ -88,7 +88,7 @@
       "jboss-logging-log4j.jar",
       "jboss-logging-jdk.jar",
       "jboss-logmanager.jar",
-      "logbridge.jar",
+      "jboss-logbridge.jar",
       // Common jars
       "jboss-common-core.jar",
       "jboss-xml-binding.jar",

Copied: trunk/server/src/etc/deployers/logbridge-jboss-beans.xml (from rev 85616, branches/Branch_5_x/server/src/etc/deployers/logbridge-jboss-beans.xml)
===================================================================
--- trunk/server/src/etc/deployers/logbridge-jboss-beans.xml	                        (rev 0)
+++ trunk/server/src/etc/deployers/logbridge-jboss-beans.xml	2009-03-09 23:11:15 UTC (rev 85654)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+    Log Bridge support beans
+-->
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+    <!-- JMX notifier to trigger a resync with JDK log levels when the log4j config changes-->
+
+    <bean name="LogBridgeNotifier" class="org.jboss.logbridge.LogNotificationListener">
+        <property name="logBridgeHandler"><inject bean="LogBridgeHandler"/></property>
+        <property name="MBeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
+        <property name="loggingMBeanName">jboss.system:service=Logging,type=Log4jService</property>
+        <depends>jboss.system:service=Logging,type=Log4jService</depends>
+    </bean>
+</deployment>

Modified: trunk/thirdparty/pom.xml
===================================================================
--- trunk/thirdparty/pom.xml	2009-03-09 22:09:49 UTC (rev 85653)
+++ trunk/thirdparty/pom.xml	2009-03-09 23:11:15 UTC (rev 85654)
@@ -1368,7 +1368,7 @@
     </dependency>
     <dependency>
       <groupId>org.jboss.logbridge</groupId>
-      <artifactId>logbridge</artifactId>
+      <artifactId>jboss-logbridge</artifactId>
     </dependency>
     <dependency>
       <groupId>org.jboss.logmanager</groupId>