[jboss-cvs] JBossAS SVN: r89993 - in branches/dml-log-service-integration: client and 11 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jun 9 12:32:05 EDT 2009
Author: david.lloyd at jboss.com
Date: 2009-06-09 12:32:04 -0400 (Tue, 09 Jun 2009)
New Revision: 89993
Removed:
branches/dml-log-service-integration/server/src/etc/conf/all/bootstrap/logging.xml
branches/dml-log-service-integration/server/src/etc/deployers/logbridge-jboss-beans.xml
Modified:
branches/dml-log-service-integration/build/build.xml
branches/dml-log-service-integration/client/pom.xml
branches/dml-log-service-integration/component-matrix/pom.xml
branches/dml-log-service-integration/main/build.xml
branches/dml-log-service-integration/main/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/server/src/etc/conf/all/bootstrap.xml
branches/dml-log-service-integration/server/src/etc/conf/all/jboss-service.xml
branches/dml-log-service-integration/server/src/etc/conf/minimal/jboss-service.xml
branches/dml-log-service-integration/server/src/etc/conf/standard/jboss-service.xml
branches/dml-log-service-integration/server/src/etc/conf/web/jboss-service.xml
branches/dml-log-service-integration/thirdparty/pom.xml
Log:
Initial changes for the new logservice
Modified: branches/dml-log-service-integration/build/build.xml
===================================================================
--- branches/dml-log-service-integration/build/build.xml 2009-06-09 16:28:34 UTC (rev 89992)
+++ branches/dml-log-service-integration/build/build.xml 2009-06-09 16:32:04 UTC (rev 89993)
@@ -775,8 +775,6 @@
<mkdir dir="${install.lib}"/>
<copy file="${main.module.output}/jboss-as-main.jar"
tofile="${install.lib}/jboss-main.jar" filtering="no"/>
- <copy file="${main.module.output}/jboss-as-main-log4j-boot.jar"
- tofile="${install.lib}/log4j-boot.jar" filtering="no"/>
<!-- Copy the generated client -->
<mkdir dir="${install.client}"/>
@@ -1963,7 +1961,6 @@
<fileset refid="org.jboss.security:jbosssx:jar"/>
<fileset refid="org.jboss.security:jbossxacml:jar"/>
<fileset refid="org.slf4j:slf4j-api:jar"/>
- <fileset refid="org.jboss.slf4j:slf4j-jboss-logging:jar"/>
<fileset refid="log4j:log4j:jar"/>
<fileset refid="quartz:quartz:jar"/>
<fileset refid="commons-logging:commons-logging:jar"/>
@@ -2047,9 +2044,6 @@
<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-jdk:jar"/>
- <fileset refid="org.jboss.logging:jboss-logging-log4j:jar"/>
- <fileset refid="org.jboss.logbridge:jboss-logbridge: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/client/pom.xml
===================================================================
--- branches/dml-log-service-integration/client/pom.xml 2009-06-09 16:28:34 UTC (rev 89992)
+++ branches/dml-log-service-integration/client/pom.xml 2009-06-09 16:32:04 UTC (rev 89993)
@@ -244,12 +244,7 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.jboss.slf4j</groupId>
- <artifactId>slf4j-jboss-logging</artifactId>
- </dependency>
-
+
</dependencies>
</project>
Modified: branches/dml-log-service-integration/component-matrix/pom.xml
===================================================================
--- branches/dml-log-service-integration/component-matrix/pom.xml 2009-06-09 16:28:34 UTC (rev 89992)
+++ branches/dml-log-service-integration/component-matrix/pom.xml 2009-06-09 16:32:04 UTC (rev 89993)
@@ -74,11 +74,10 @@
<version.org.jboss.ejb3.security.client>1.0.0</version.org.jboss.ejb3.security.client>
<version.org.jboss.ejb3>1.1.6</version.org.jboss.ejb3>
<version.org.jboss.integration>5.1.0.GA</version.org.jboss.integration>
- <version.org.jboss.jbossxb>2.0.0.GA</version.org.jboss.jbossxb>
+ <version.org.jboss.jbossxb>2.0.1.GA</version.org.jboss.jbossxb>
<version.org.jboss.jpa>1.0.0</version.org.jboss.jpa>
- <version.org.jboss.logbridge>1.0.0.GA</version.org.jboss.logbridge>
<version.org.jboss.logging>2.1.0.GA</version.org.jboss.logging>
- <version.org.jboss.logmanager>1.0.0.GA</version.org.jboss.logmanager>
+ <version.org.jboss.logmanager>1.1.0.CR1</version.org.jboss.logmanager>
<version.org.jboss.man>2.1.1.Beta2</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>
@@ -91,7 +90,6 @@
<version.org.jboss.threads>1.0.0.GA</version.org.jboss.threads>
<version.org.jboss.vfs>2.1.0.GA</version.org.jboss.vfs>
<version.org.jboss.security.negotiation>2.0.3.SP1</version.org.jboss.security.negotiation>
- <version.org.jboss.slf4j>1.0.2.GA</version.org.jboss.slf4j>
<version.org.jboss.xnio.metadata>1.0.0.GA</version.org.jboss.xnio.metadata>
<version.org.jboss.xnio>1.2.0.GA</version.org.jboss.xnio>
<version.org.slf4j>1.5.6</version.org.slf4j>
@@ -573,18 +571,6 @@
</dependency>
<dependency>
- <groupId>org.jboss.logbridge</groupId>
- <artifactId>jboss-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>
@@ -1119,12 +1105,6 @@
</dependency>
<dependency>
- <groupId>org.jboss.slf4j</groupId>
- <artifactId>slf4j-jboss-logging</artifactId>
- <version>${version.org.jboss.slf4j}</version>
- </dependency>
-
- <dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
<version>${version.org.hibernate}</version>
Modified: branches/dml-log-service-integration/main/build.xml
===================================================================
--- branches/dml-log-service-integration/main/build.xml 2009-06-09 16:28:34 UTC (rev 89992)
+++ branches/dml-log-service-integration/main/build.xml 2009-06-09 16:32:04 UTC (rev 89993)
@@ -127,23 +127,6 @@
-->
<target name="module-jars" >
- <!--
- | Build log4j-boot.jar This is a minimal subset of the log4j
- | classes that allow the boot process to use log4j but avoids
- | loading log4j classes that depend on other features like
- | JMS, JDBC, JavaMail, etc.
- -->
-
- <jar jarfile="${build.lib}/log4j-boot.jar">
- <zipfileset src="${apache.log4j.lib}/log4j.jar">
- <include name="org/apache/log4j/*"/>
- <include name="org/apache/log4j/config/*"/>
- <include name="org/apache/log4j/helpers/*"/>
- <include name="org/apache/log4j/or/*"/>
- <include name="org/apache/log4j/spi/*"/>
- </zipfileset>
- </jar>
-
<!-- -->
<jar jarfile="${build.lib}/jboss-main.jar" manifest="${build.etc}/default.mf">
<fileset dir="${build.classes}"/>
Modified: branches/dml-log-service-integration/main/pom.xml
===================================================================
--- branches/dml-log-service-integration/main/pom.xml 2009-06-09 16:28:34 UTC (rev 89992)
+++ branches/dml-log-service-integration/main/pom.xml 2009-06-09 16:32:04 UTC (rev 89993)
@@ -30,7 +30,6 @@
<configuration>
<descriptors>
<descriptor>src/assembly/client.xml</descriptor>
- <descriptor>src/assembly/log4j-boot.xml</descriptor>
</descriptors>
</configuration>
</execution>
@@ -155,10 +154,6 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
- <dependency>
- <groupId>org.jboss.logbridge</groupId>
- <artifactId>jboss-logbridge</artifactId>
- </dependency>
</dependencies>
</project>
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-09 16:28:34 UTC (rev 89992)
+++ branches/dml-log-service-integration/main/src/main/org/jboss/Main.java 2009-06-09 16:32:04 UTC (rev 89993)
@@ -122,6 +122,10 @@
if (name == null) {
System.setProperty("java.util.logging.manager",
"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");
+ }
}
// Auto set HOME_DIR to ../bin/run.jar if not set
@@ -333,7 +337,7 @@
System.out.println(" -g, --partition=<name> HA Partition name (default=DefaultDomain)");
System.out.println(" -m, --mcast_port=<ip> UDP multicast port; only used by JGroups");
System.out.println(" -u, --udp=<ip> UDP multicast address");
- System.out.println(" -l, --log=<log4j|jdk> Specify the logger plugin type");
+ System.out.println(" -l, --log=<jboss|log4j|jdk> Specify the logger plugin type");
System.out.println();
System.exit(0);
break; // for completeness
@@ -504,14 +508,16 @@
{
arg = getopt.getOptarg();
String logPlugin = arg;
- if( arg.equalsIgnoreCase("log4j") )
+ if( arg.equalsIgnoreCase("jboss") )
+ logPlugin = "org.jboss.logmanager.LoggerPluginImpl";
+ else if( arg.equalsIgnoreCase("log4j") )
logPlugin = "org.jboss.logging.Log4jLoggerPlugin";
else if( arg.equalsIgnoreCase("jdk") )
logPlugin = "org.jboss.logging.jdk.JDK14LoggerPlugin";
System.setProperty("org.jboss.logging.Logger.pluginClass", logPlugin);
break;
}
-
+
default:
// this should not happen,
// if it does throw an error so we know about it
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-09 16:28:34 UTC (rev 89992)
+++ branches/dml-log-service-integration/main/src/main/org/jboss/system/server/ServerLoader.java 2009-06-09 16:32:04 UTC (rev 89993)
@@ -83,12 +83,8 @@
*/
public static final String[] DEFAULT_BOOT_LIBRARY_LIST = {
// Logging
- "log4j-boot.jar",
"jboss-logging-spi.jar",
- "jboss-logging-log4j.jar",
- "jboss-logging-jdk.jar",
"jboss-logmanager.jar",
- "jboss-logbridge.jar",
// Common jars
"jboss-common-core.jar",
"jboss-xml-binding.jar",
Deleted: branches/dml-log-service-integration/server/src/etc/conf/all/bootstrap/logging.xml
===================================================================
--- branches/dml-log-service-integration/server/src/etc/conf/all/bootstrap/logging.xml 2009-06-09 16:28:34 UTC (rev 89992)
+++ branches/dml-log-service-integration/server/src/etc/conf/all/bootstrap/logging.xml 2009-06-09 16:32:04 UTC (rev 89993)
@@ -1,10 +0,0 @@
-<?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: branches/dml-log-service-integration/server/src/etc/conf/all/bootstrap.xml
===================================================================
--- branches/dml-log-service-integration/server/src/etc/conf/all/bootstrap.xml 2009-06-09 16:28:34 UTC (rev 89992)
+++ branches/dml-log-service-integration/server/src/etc/conf/all/bootstrap.xml 2009-06-09 16:32:04 UTC (rev 89993)
@@ -5,7 +5,6 @@
-->
<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: branches/dml-log-service-integration/server/src/etc/conf/all/jboss-service.xml
===================================================================
--- branches/dml-log-service-integration/server/src/etc/conf/all/jboss-service.xml 2009-06-09 16:28:34 UTC (rev 89992)
+++ branches/dml-log-service-integration/server/src/etc/conf/all/jboss-service.xml 2009-06-09 16:32:04 UTC (rev 89993)
@@ -45,30 +45,6 @@
</mbean>
<!-- ==================================================================== -->
- <!-- Log4j Initialization -->
- <!-- ==================================================================== -->
-
- <mbean code="org.jboss.logging.Log4jService"
- name="jboss.system:type=Log4jService,service=Logging"
- xmbean-dd="resource:xmdesc/Log4jService-xmbean.xml">
- <attribute name="ConfigurationURL">resource:jboss-log4j.xml</attribute>
- <!-- Set the org.apache.log4j.helpers.LogLog.setQuiteMode. As of log4j1.2.8
- this needs to be set to avoid a possible deadlock on exception at the
- appender level. See bug#696819.
- -->
- <attribute name="Log4jQuietMode">true</attribute>
- <!-- How frequently in seconds the ConfigurationURL is checked for changes -->
- <attribute name="RefreshPeriod">60</attribute>
-
- <!-- The value to assign to system property jboss.server.log.threshold
- if it is not already set. This system property in turn controls
- the logging threshold for the server.log file.
- If the system property is already set when this service is created,
- this value is ignored. -->
- <attribute name="DefaultJBossServerLogThreshold">INFO</attribute>
- </mbean>
-
- <!-- ==================================================================== -->
<!-- Active Alarm Table -->
<!-- ==================================================================== -->
Modified: branches/dml-log-service-integration/server/src/etc/conf/minimal/jboss-service.xml
===================================================================
--- branches/dml-log-service-integration/server/src/etc/conf/minimal/jboss-service.xml 2009-06-09 16:28:34 UTC (rev 89992)
+++ branches/dml-log-service-integration/server/src/etc/conf/minimal/jboss-service.xml 2009-06-09 16:32:04 UTC (rev 89993)
@@ -15,21 +15,6 @@
<classpath codebase="${jboss.server.lib.url}" archives="*"/>
<!-- ==================================================================== -->
- <!-- Log4j Initialization -->
- <!-- ==================================================================== -->
- <mbean code="org.jboss.logging.Log4jService"
- name="jboss.system:type=Log4jService,service=Logging"
- xmbean-dd="resource:xmdesc/Log4jService-xmbean.xml">
- <attribute name="ConfigurationURL">resource:jboss-log4j.xml</attribute>
- <!-- The value to assign to system property jboss.server.log.threshold
- if it is not already set. This system property in turn controls
- the logging threshold for the server.log file.
- If the system property is already set when this service is created,
- this value is ignored. -->
- <attribute name="DefaultJBossServerLogThreshold">INFO</attribute>
- </mbean>
-
- <!-- ==================================================================== -->
<!-- JNDI -->
<!-- ==================================================================== -->
Modified: branches/dml-log-service-integration/server/src/etc/conf/standard/jboss-service.xml
===================================================================
--- branches/dml-log-service-integration/server/src/etc/conf/standard/jboss-service.xml 2009-06-09 16:28:34 UTC (rev 89992)
+++ branches/dml-log-service-integration/server/src/etc/conf/standard/jboss-service.xml 2009-06-09 16:32:04 UTC (rev 89993)
@@ -45,30 +45,6 @@
</mbean>
<!-- ==================================================================== -->
- <!-- Log4j Initialization -->
- <!-- ==================================================================== -->
-
- <mbean code="org.jboss.logging.Log4jService"
- name="jboss.system:type=Log4jService,service=Logging"
- xmbean-dd="resource:xmdesc/Log4jService-xmbean.xml">
- <attribute name="ConfigurationURL">resource:jboss-log4j.xml</attribute>
- <!-- Set the org.apache.log4j.helpers.LogLog.setQuiteMode. As of log4j1.2.8
- this needs to be set to avoid a possible deadlock on exception at the
- appender level. See bug#696819.
- -->
- <attribute name="Log4jQuietMode">true</attribute>
- <!-- How frequently in seconds the ConfigurationURL is checked for changes -->
- <attribute name="RefreshPeriod">60</attribute>
-
- <!-- The value to assign to system property jboss.server.log.threshold
- if it is not already set. This system property in turn controls
- the logging threshold for the server.log file.
- If the system property is already set when this service is created,
- this value is ignored. -->
- <attribute name="DefaultJBossServerLogThreshold">INFO</attribute>
- </mbean>
-
- <!-- ==================================================================== -->
<!-- Active Alarm Table -->
<!-- ==================================================================== -->
Modified: branches/dml-log-service-integration/server/src/etc/conf/web/jboss-service.xml
===================================================================
--- branches/dml-log-service-integration/server/src/etc/conf/web/jboss-service.xml 2009-06-09 16:28:34 UTC (rev 89992)
+++ branches/dml-log-service-integration/server/src/etc/conf/web/jboss-service.xml 2009-06-09 16:32:04 UTC (rev 89993)
@@ -45,30 +45,6 @@
</mbean>
<!-- ==================================================================== -->
- <!-- Log4j Initialization -->
- <!-- ==================================================================== -->
-
- <mbean code="org.jboss.logging.Log4jService"
- name="jboss.system:type=Log4jService,service=Logging"
- xmbean-dd="resource:xmdesc/Log4jService-xmbean.xml">
- <attribute name="ConfigurationURL">resource:jboss-log4j.xml</attribute>
- <!-- Set the org.apache.log4j.helpers.LogLog.setQuiteMode. As of log4j1.2.8
- this needs to be set to avoid a possible deadlock on exception at the
- appender level. See bug#696819.
- -->
- <attribute name="Log4jQuietMode">true</attribute>
- <!-- How frequently in seconds the ConfigurationURL is checked for changes -->
- <attribute name="RefreshPeriod">60</attribute>
-
- <!-- The value to assign to system property jboss.server.log.threshold
- if it is not already set. This system property in turn controls
- the logging threshold for the server.log file.
- If the system property is already set when this service is created,
- this value is ignored. -->
- <attribute name="DefaultJBossServerLogThreshold">INFO</attribute>
- </mbean>
-
- <!-- ==================================================================== -->
<!-- Active Alarm Table -->
<!-- ==================================================================== -->
Deleted: branches/dml-log-service-integration/server/src/etc/deployers/logbridge-jboss-beans.xml
===================================================================
--- branches/dml-log-service-integration/server/src/etc/deployers/logbridge-jboss-beans.xml 2009-06-09 16:28:34 UTC (rev 89992)
+++ branches/dml-log-service-integration/server/src/etc/deployers/logbridge-jboss-beans.xml 2009-06-09 16:32:04 UTC (rev 89993)
@@ -1,17 +0,0 @@
-<?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: branches/dml-log-service-integration/thirdparty/pom.xml
===================================================================
--- branches/dml-log-service-integration/thirdparty/pom.xml 2009-06-09 16:28:34 UTC (rev 89992)
+++ branches/dml-log-service-integration/thirdparty/pom.xml 2009-06-09 16:32:04 UTC (rev 89993)
@@ -1258,10 +1258,6 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.slf4j</groupId>
- <artifactId>slf4j-jboss-logging</artifactId>
- </dependency>
- <dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
</dependency>
@@ -1420,10 +1416,6 @@
<artifactId>jboss-logging-spi</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.logbridge</groupId>
- <artifactId>jboss-logbridge</artifactId>
- </dependency>
- <dependency>
<groupId>org.jboss.logmanager</groupId>
<artifactId>jboss-logmanager</artifactId>
</dependency>
More information about the jboss-cvs-commits
mailing list