[jboss-cvs] JBossAS SVN: r111767 - in trunk: varia/src/resources/logging and 1 other directory.

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

Author: jaikiran
Date: 2011-07-16 05:48:11 -0400 (Sat, 16 Jul 2011)
New Revision: 111767

Modified:
   trunk/component-matrix/pom.xml
   trunk/varia/src/resources/logging/logmanager-jboss-beans.xml
Log:
JBAS-8810 JBAS-8811 JBAS-8809 JBAS-8819 JBAS-9407 Bring in many of the logging fixes and upgrades

Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2011-07-15 18:10:34 UTC (rev 111766)
+++ trunk/component-matrix/pom.xml	2011-07-16 09:48:11 UTC (rev 111767)
@@ -63,6 +63,7 @@
     <version.jboss.web>3.0.0-CR1</version.jboss.web>
     <version.jsr181.api>1.0-MR1</version.jsr181.api>
     <version.junit>4.6</version.junit>
+    <version.log4j>1.2.16</version.log4j>
     <version.ops4j.pax.web>0.7.2</version.ops4j.pax.web>
     <version.org.hibernate>3.6.5.Final</version.org.hibernate>
     <version.org.hibernate.commons.annotations>3.2.0.Final</version.org.hibernate.commons.annotations>
@@ -104,9 +105,10 @@
     <version.org.jboss.jpa.mcint>3.0.0-alpha-5</version.org.jboss.jpa.mcint>
     <version.org.jboss.jpa.spi>3.0.0-alpha-5</version.org.jboss.jpa.spi>
     <version.org.jboss.kernel>2.2.0.SP1</version.org.jboss.kernel>
-    <version.org.jboss.logging>3.0.0.Beta4</version.org.jboss.logging>
+    <version.org.jboss.logging>3.0.0.GA</version.org.jboss.logging>
     <version.org.jboss.logging-service-metadata>1.0.0.CR10</version.org.jboss.logging-service-metadata>
-    <version.org.jboss.logmanager>1.2.0.CR9</version.org.jboss.logmanager>
+    <version.org.jboss.logmanager>1.2.0.GA</version.org.jboss.logmanager>
+    <version.org.jboss.logmanager.log4j>1.0.0.GA</version.org.jboss.logmanager.log4j>
     <version.org.jboss.man>2.1.1.SP2</version.org.jboss.man>
     <version.managed.beans.depchain>1.0.0-alpha-6</version.managed.beans.depchain>
     <version.org.jboss.marshalling>1.3.0.CR3</version.org.jboss.marshalling>
@@ -329,7 +331,7 @@
       <dependency>
         <groupId>log4j</groupId>
         <artifactId>log4j</artifactId>
-        <version>1.2.14</version>
+        <version>${version.log4j}</version>
       </dependency>
       
       <dependency>
@@ -1023,7 +1025,7 @@
       <dependency>
         <groupId>org.jboss.logmanager</groupId>
         <artifactId>jboss-logmanager-log4j</artifactId>
-        <version>1.0.0.CR3</version>
+        <version>${version.org.jboss.logmanager.log4j}</version>
       </dependency>
 
       <dependency>

Modified: trunk/varia/src/resources/logging/logmanager-jboss-beans.xml
===================================================================
--- trunk/varia/src/resources/logging/logmanager-jboss-beans.xml	2011-07-15 18:10:34 UTC (rev 111766)
+++ trunk/varia/src/resources/logging/logmanager-jboss-beans.xml	2011-07-16 09:48:11 UTC (rev 111767)
@@ -64,11 +64,12 @@
      ~ enabling this feature may have a performance impact in certain cases, it's started up lazily (on demand)
      ~ when a separate log context is defined in a user deployment.
      -->
-   <bean name="JBossLogManagerClassLoaderContextSelector" class="org.jboss.logmanager.ClassLoaderLogContextSelector"/>
+   <bean name="JBossLogManagerContextSelectorService" class="org.jboss.logmanager.ClassLoaderLogContextSelector"/>
 
-   <bean name="JBossLogManagerContextSelectorService" class="org.jboss.logmanager.LogContextSelectorService" mode="On Demand">
+   <bean name="OnDemandJBossLogManagerContextSelector" class="org.jboss.logmanager.LogContextSelectorService" mode="On Demand">
       <property name="selector">
-         <inject bean="JBossLogManagerClassLoaderContextSelector"/>
+         <inject bean="JBossLogManagerContextSelectorService"/>
       </property>
    </bean>
+    
 </deployment>