[jboss-cvs] JBossAS SVN: r84485 - in trunk: component-matrix and 6 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Feb 19 19:14:14 EST 2009
Author: david.lloyd at jboss.com
Date: 2009-02-19 19:14:13 -0500 (Thu, 19 Feb 2009)
New Revision: 84485
Added:
trunk/server/src/etc/conf/default/bootstrap/logging.xml
Modified:
trunk/build/build-distr.xml
trunk/component-matrix/pom.xml
trunk/main/pom.xml
trunk/main/src/main/org/jboss/Main.java
trunk/main/src/main/org/jboss/system/server/ServerLoader.java
trunk/server/src/etc/conf/default/bootstrap.xml
trunk/thirdparty/pom.xml
Log:
JBAS-6475 - Integrate jboss-logmanager and logbridge components; add logbridge to bootstrap; make sure java.util.logging.manager sys property is _always_ set properly
Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml 2009-02-19 23:46:00 UTC (rev 84484)
+++ trunk/build/build-distr.xml 2009-02-20 00:14:13 UTC (rev 84485)
@@ -1951,6 +1951,12 @@
<fileset dir="${jboss.common.logging.jdk.lib}">
<exclude name="*-sources.jar"/>
</fileset>
+ <fileset dir="${org.jboss.logbridge.lib}">
+ <include name="logbridge.jar"/>
+ </fileset>
+ <fileset dir="${org.jboss.logmanager.lib}">
+ <include name="jboss-logmanager.jar"/>
+ </fileset>
<fileset dir="${jboss.jbossxb.lib}">
<include name="jboss-xml-binding.jar"/>
</fileset>
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2009-02-19 23:46:00 UTC (rev 84484)
+++ trunk/component-matrix/pom.xml 2009-02-20 00:14:13 UTC (rev 84485)
@@ -60,6 +60,8 @@
<version.org.jboss.jpa>1.0.0-Beta6</version.org.jboss.jpa>
<version.org.jboss.reflect>2.0.2.GA</version.org.jboss.reflect>
<version.org.jboss.vfs>2.2.0-SNAPSHOT</version.org.jboss.vfs>
+ <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.mdr>2.0.1.GA</version.org.jboss.mdr>
<version.org.jboss.man>2.1.0.CR1</version.org.jboss.man>
<version.org.jboss.microcontainer>2.2.0-SNAPSHOT</version.org.jboss.microcontainer>
@@ -594,8 +596,26 @@
</exclusion>
</exclusions>
</dependency>
-
+
<dependency>
+ <groupId>org.jboss.logbridge</groupId>
+ <artifactId>logbridge</artifactId>
+ <version>${version.org.jboss.logbridge}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.logmanager</groupId>
+ <artifactId>jboss-logmanager</artifactId>
+ <version>${version.org.jboss.logmanager}</version>
+ </dependency>
+
+ <dependency>
<groupId>jboss</groupId>
<artifactId>jboss-j2ee</artifactId>
<version>4.0.2</version>
Modified: trunk/main/pom.xml
===================================================================
--- trunk/main/pom.xml 2009-02-19 23:46:00 UTC (rev 84484)
+++ trunk/main/pom.xml 2009-02-20 00:14:13 UTC (rev 84485)
@@ -173,6 +173,10 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.logbridge</groupId>
+ <artifactId>logbridge</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: trunk/main/src/main/org/jboss/Main.java
===================================================================
--- trunk/main/src/main/org/jboss/Main.java 2009-02-19 23:46:00 UTC (rev 84484)
+++ trunk/main/src/main/org/jboss/Main.java 2009-02-20 00:14:13 UTC (rev 84485)
@@ -117,6 +117,13 @@
// First process the command line to pickup custom props/settings
processCommandLine(args);
+ // Initialize the JDK logmanager
+ String name = System.getProperty("java.util.logging.manager");
+ if (name == null) {
+ System.setProperty("java.util.logging.manager",
+ "org.jboss.logmanager.LogManager");
+ }
+
// Auto set HOME_DIR to ../bin/run.jar if not set
String homeDir = props.getProperty(ServerConfig.HOME_DIR);
if (homeDir == null)
@@ -495,15 +502,7 @@
if( arg.equalsIgnoreCase("log4j") )
logPlugin = "org.jboss.logging.Log4jLoggerPlugin";
else if( arg.equalsIgnoreCase("jdk") )
- {
logPlugin = "org.jboss.logging.JDK14LoggerPlugin";
- String name = System.getProperty("java.util.logging.manager");
- if (name == null) {
- // Also override the jdk LogManager
- System.setProperty("java.util.logging.manager",
- "org.jboss.logging.jdk.JDKLogManager");
- }
- }
System.setProperty("org.jboss.logging.Logger.pluginClass", logPlugin);
break;
}
Modified: trunk/main/src/main/org/jboss/system/server/ServerLoader.java
===================================================================
--- trunk/main/src/main/org/jboss/system/server/ServerLoader.java 2009-02-19 23:46:00 UTC (rev 84484)
+++ trunk/main/src/main/org/jboss/system/server/ServerLoader.java 2009-02-20 00:14:13 UTC (rev 84485)
@@ -87,7 +87,9 @@
"jboss-logging-spi.jar",
"jboss-logging-log4j.jar",
"jboss-logging-jdk.jar",
- // Common jars
+ "jboss-logmanager.jar",
+ "logbridge.jar",
+ // Common jars
"jboss-common-core.jar",
"jboss-xml-binding.jar",
"jaxb-api.jar",
Added: trunk/server/src/etc/conf/default/bootstrap/logging.xml
===================================================================
--- trunk/server/src/etc/conf/default/bootstrap/logging.xml (rev 0)
+++ trunk/server/src/etc/conf/default/bootstrap/logging.xml 2009-02-20 00:14:13 UTC (rev 84485)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ The Logging Subsystem
+-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="LogBridgeHandler" class="org.jboss.logbridge.LogBridgeHandler"/>
+
+</deployment>
\ No newline at end of file
Modified: trunk/server/src/etc/conf/default/bootstrap.xml
===================================================================
--- trunk/server/src/etc/conf/default/bootstrap.xml 2009-02-19 23:46:00 UTC (rev 84484)
+++ trunk/server/src/etc/conf/default/bootstrap.xml 2009-02-20 00:14:13 UTC (rev 84485)
@@ -5,6 +5,7 @@
-->
<bootstrap xmlns="urn:jboss:bootstrap:1.0">
+ <url>bootstrap/logging.xml</url>
<url>bootstrap/vfs.xml</url>
<url>bootstrap/classloader.xml</url>
<url>bootstrap/aop.xml</url>
Modified: trunk/thirdparty/pom.xml
===================================================================
--- trunk/thirdparty/pom.xml 2009-02-19 23:46:00 UTC (rev 84484)
+++ trunk/thirdparty/pom.xml 2009-02-20 00:14:13 UTC (rev 84485)
@@ -1346,6 +1346,14 @@
<artifactId>jboss-logging-spi</artifactId>
</dependency>
<dependency>
+ <groupId>org.jboss.logbridge</groupId>
+ <artifactId>logbridge</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logmanager</groupId>
+ <artifactId>jboss-logmanager</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jboss.integration</groupId>
<artifactId>jboss-classloading-spi</artifactId>
</dependency>
More information about the jboss-cvs-commits
mailing list