[jboss-cvs] JBossAS SVN: r90281 - in branches/dml-log-service-integration: component-matrix and 3 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Wed Jun 17 00:54:41 EDT 2009


Author: david.lloyd at jboss.com
Date: 2009-06-17 00:54:41 -0400 (Wed, 17 Jun 2009)
New Revision: 90281

Modified:
   branches/dml-log-service-integration/build/build.xml
   branches/dml-log-service-integration/component-matrix/pom.xml
   branches/dml-log-service-integration/main/src/main/org/jboss/Main.java
   branches/dml-log-service-integration/main/src/main/org/jboss/system/server/ServerLoader.java
   branches/dml-log-service-integration/thirdparty/pom.xml
Log:
Use CR2 of logmanager, which splits out support projects to fix classpath issues and introduces the bootstrap config mechanism

Modified: branches/dml-log-service-integration/build/build.xml
===================================================================
--- branches/dml-log-service-integration/build/build.xml	2009-06-17 03:47:38 UTC (rev 90280)
+++ branches/dml-log-service-integration/build/build.xml	2009-06-17 04:54:41 UTC (rev 90281)
@@ -1958,6 +1958,7 @@
       <fileset refid="org.jboss.security:jboss-security-spi:jar"/>
       <fileset refid="org.jboss.security:jbosssx:jar"/>
       <fileset refid="org.jboss.security:jbossxacml:jar"/>
+      <fileset refid="org.jboss.slf4j:slf4j-jboss-logmanager:jar"/>
       <fileset refid="org.slf4j:slf4j-api:jar"/>
       <fileset refid="org.slf4j:jcl-over-slf4j:jar"/>
       <fileset refid="log4j:log4j:jar"/>
@@ -2045,6 +2046,7 @@
       <fileset refid="org.jboss.bootstrap:jboss-bootstrap:jar"/>
       <fileset refid="org.jboss:jboss-common-core:jar"/>
       <fileset refid="org.jboss.logging:jboss-logging-spi:jar"/>
+      <fileset refid="org.jboss.logging:jboss-logging-logmanager:jar"/>
       <fileset refid="org.jboss.logmanager:jboss-logmanager:jar"/>
       <fileset refid="org.jboss.integration:jboss-classloading-spi:jar"/>
       <fileset refid="org.jboss.integration:jboss-profileservice-spi:jar"/>

Modified: branches/dml-log-service-integration/component-matrix/pom.xml
===================================================================
--- branches/dml-log-service-integration/component-matrix/pom.xml	2009-06-17 03:47:38 UTC (rev 90280)
+++ branches/dml-log-service-integration/component-matrix/pom.xml	2009-06-17 04:54:41 UTC (rev 90281)
@@ -77,7 +77,7 @@
     <version.org.jboss.jbossxb>2.0.0.GA</version.org.jboss.jbossxb>
     <version.org.jboss.jpa>1.0.0</version.org.jboss.jpa>
     <version.org.jboss.logging>2.1.0.GA</version.org.jboss.logging>
-    <version.org.jboss.logmanager>1.1.0.CR1</version.org.jboss.logmanager>
+    <version.org.jboss.logmanager>1.1.0.CR2</version.org.jboss.logmanager>
     <version.org.jboss.man>2.1.1.CR1</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>
@@ -567,6 +567,12 @@
       </dependency>
 
       <dependency>
+        <groupId>org.jboss.logging</groupId>
+        <artifactId>jboss-logging-logmanager</artifactId>
+        <version>1.0.0.CR1</version>
+      </dependency>
+
+      <dependency>
         <groupId>org.jboss.logmanager</groupId>
         <artifactId>jboss-logmanager</artifactId>
         <version>${version.org.jboss.logmanager}</version>
@@ -1112,8 +1118,14 @@
         <artifactId>slf4j-jboss-logging</artifactId>
         <version>${version.org.jboss.slf4j}</version>
       </dependency>
-      
+
       <dependency>
+        <groupId>org.jboss.slf4j</groupId>
+        <artifactId>slf4j-jboss-logmanager</artifactId>
+        <version>1.0.0.CR1</version>
+      </dependency>
+
+      <dependency>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-core</artifactId>
         <version>${version.org.hibernate}</version>

Modified: branches/dml-log-service-integration/main/src/main/org/jboss/Main.java
===================================================================
--- branches/dml-log-service-integration/main/src/main/org/jboss/Main.java	2009-06-17 03:47:38 UTC (rev 90280)
+++ branches/dml-log-service-integration/main/src/main/org/jboss/Main.java	2009-06-17 04:54:41 UTC (rev 90281)
@@ -124,7 +124,7 @@
             "org.jboss.logmanager.LogManager");
          String pluginClass = System.getProperty("org.jboss.logging.Logger.pluginClass");
          if (pluginClass == null) {
-            System.setProperty("org.jboss.logging.Logger.pluginClass", "org.jboss.logmanager.LoggerPluginImpl");
+            System.setProperty("org.jboss.logging.Logger.pluginClass", "org.jboss.logging.logmanager.LoggerPluginImpl");
          }
       }
 

Modified: branches/dml-log-service-integration/main/src/main/org/jboss/system/server/ServerLoader.java
===================================================================
--- branches/dml-log-service-integration/main/src/main/org/jboss/system/server/ServerLoader.java	2009-06-17 03:47:38 UTC (rev 90280)
+++ branches/dml-log-service-integration/main/src/main/org/jboss/system/server/ServerLoader.java	2009-06-17 04:54:41 UTC (rev 90281)
@@ -84,6 +84,7 @@
    public static final String[] DEFAULT_BOOT_LIBRARY_LIST = {
       // Logging
       "jboss-logging-spi.jar",
+      "jboss-logging-logmanager.jar",
       "jboss-logmanager.jar",
       // Common jars
       "jboss-common-core.jar",

Modified: branches/dml-log-service-integration/thirdparty/pom.xml
===================================================================
--- branches/dml-log-service-integration/thirdparty/pom.xml	2009-06-17 03:47:38 UTC (rev 90280)
+++ branches/dml-log-service-integration/thirdparty/pom.xml	2009-06-17 04:54:41 UTC (rev 90281)
@@ -1255,6 +1255,10 @@
       <artifactId>slf4j-jboss-logging</artifactId>
     </dependency>
     <dependency>
+      <groupId>org.jboss.slf4j</groupId>
+      <artifactId>slf4j-jboss-logmanager</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-core</artifactId>
     </dependency>
@@ -1409,6 +1413,10 @@
       <groupId>org.jboss.logging</groupId>
       <artifactId>jboss-logging-spi</artifactId>
     </dependency>
+     <dependency>
+       <groupId>org.jboss.logging</groupId>
+       <artifactId>jboss-logging-logmanager</artifactId>
+     </dependency>
     <dependency>
       <groupId>org.jboss.logmanager</groupId>
       <artifactId>jboss-logmanager</artifactId>




More information about the jboss-cvs-commits mailing list