[jboss-cvs] JBossAS SVN: r103541 - in trunk: build and 20 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Apr 5 19:22:09 EDT 2010
Author: david.lloyd at jboss.com
Date: 2010-04-05 19:22:08 -0400 (Mon, 05 Apr 2010)
New Revision: 103541
Modified:
trunk/aspects/pom.xml
trunk/build/build.xml
trunk/build/pom.xml
trunk/client/pom.xml
trunk/cluster/pom.xml
trunk/component-matrix/pom.xml
trunk/connector/pom.xml
trunk/connector/src/main/java/org/jboss/resource/connectionmanager/BaseConnectionManager2.java
trunk/ejb3/pom.xml
trunk/hibernate-int/pom.xml
trunk/iiop/pom.xml
trunk/jbossas-remoting/pom.xml
trunk/main/src/main/java/org/jboss/Main.java
trunk/management/pom.xml
trunk/osgi/zip/pom.xml
trunk/profileservice/pom.xml
trunk/system-jmx/pom.xml
trunk/system/pom.xml
trunk/testsuite/build.xml
trunk/testsuite/imports/sections/aop.xml
trunk/testsuite/imports/sections/classloader.xml
trunk/testsuite/pom.xml
trunk/tomcat/pom.xml
trunk/varia/pom.xml
trunk/webservices/pom.xml
Log:
JBAS-7898 - Upgrade JBoss Logging to 3.0.0.Beta2
Modified: trunk/aspects/pom.xml
===================================================================
--- trunk/aspects/pom.xml 2010-04-05 22:41:56 UTC (rev 103540)
+++ trunk/aspects/pom.xml 2010-04-05 23:22:08 UTC (rev 103541)
@@ -108,7 +108,7 @@
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
+ <artifactId>jboss-logging</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.aop</groupId>
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2010-04-05 22:41:56 UTC (rev 103540)
+++ trunk/build/build.xml 2010-04-05 23:22:08 UTC (rev 103541)
@@ -1933,8 +1933,6 @@
<fileset refid="org.slf4j:slf4j-api:jar"/>
<fileset refid="org.slf4j:jcl-over-slf4j:jar"/>
<fileset refid="log4j:log4j:jar"/>
- <fileset refid="org.jboss.logging:jboss-logging-log4j:jar"/>
- <fileset refid="org.jboss.logging:jboss-logging-jdk:jar"/>
<fileset refid="org.jboss.logmanager:jboss-logmanager-log4j:jar"/>
<fileset refid="org.quartz-scheduler:quartz:jar"/>
<fileset refid="jaxen:jaxen:jar"/>
@@ -2089,8 +2087,7 @@
<fileset refid="org.jboss.bootstrap:jboss-bootstrap-impl-mc:jar"/>
<fileset refid="org.jboss.bootstrap:jboss-bootstrap-impl-as: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.logging:jboss-logging:jar"/>
<fileset refid="org.jboss.logmanager:jboss-logmanager:jar"/>
<fileset refid="org.jboss.stdio:jboss-stdio:jar"/>
<fileset refid="org.jboss.integration:jboss-classloading-spi:jar"/>
@@ -2157,9 +2154,7 @@
<fileset refid="javax.enterprise:cdi-api:jar"/>
<fileset refid="javax.inject:javax.inject: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.logging:jboss-logging:jar"/>
<fileset refid="org.slf4j:slf4j-api:jar"/>
<fileset refid="org.slf4j:jcl-over-slf4j:jar"/>
<fileset refid="org.jboss.slf4j:slf4j-jboss-logging:jar"/>
Modified: trunk/build/pom.xml
===================================================================
--- trunk/build/pom.xml 2010-04-05 22:41:56 UTC (rev 103540)
+++ trunk/build/pom.xml 2010-04-05 23:22:08 UTC (rev 103541)
@@ -425,6 +425,16 @@
<artifactId>jboss-aop</artifactId>
<classifier>client</classifier>
<optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.aop</groupId>
@@ -510,50 +520,138 @@
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-transaction-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jboss.ejb3.context</groupId>
<artifactId>jboss-ejb3-context-base</artifactId>
<optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.ejb3.context</groupId>
<artifactId>jboss-ejb3-context-naming</artifactId>
<optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-endpoint-deployer</artifactId>
<optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-mc-int</artifactId>
<optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-metrics-deployer</artifactId>
<optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-proxy-clustered</artifactId>
<classifier>client</classifier>
<optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-proxy-impl</artifactId>
<classifier>client</classifier>
<optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-proxy-spi</artifactId>
<classifier>client</classifier>
<optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.ejb3</groupId>
@@ -573,6 +671,14 @@
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-ejb-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -643,26 +749,11 @@
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-jdk</artifactId>
+ <artifactId>jboss-logging</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-logmanager</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
<artifactId>logging-service-metadata</artifactId>
<optional>true</optional>
</dependency>
Modified: trunk/client/pom.xml
===================================================================
--- trunk/client/pom.xml 2010-04-05 22:41:56 UTC (rev 103540)
+++ trunk/client/pom.xml 2010-04-05 23:22:08 UTC (rev 103541)
@@ -34,6 +34,16 @@
<groupId>org.jboss.aop</groupId>
<artifactId>jboss-aop</artifactId>
<classifier>client</classifier>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -107,7 +117,15 @@
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-jms-api</artifactId>
</exclusion>
- </exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -147,25 +165,63 @@
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-jms-api</artifactId>
</exclusion>
- </exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-proxy-impl</artifactId>
<classifier>client</classifier>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-proxy-spi</artifactId>
<classifier>client</classifier>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-proxy-clustered</artifactId>
<classifier>client</classifier>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -177,7 +233,15 @@
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-jacc-api</artifactId>
</exclusion>
- </exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -270,20 +334,10 @@
<dependency>
<groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-jdk</artifactId>
+ <artifactId>jboss-logging</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-mdr</artifactId>
</dependency>
Modified: trunk/cluster/pom.xml
===================================================================
--- trunk/cluster/pom.xml 2010-04-05 22:41:56 UTC (rev 103540)
+++ trunk/cluster/pom.xml 2010-04-05 23:22:08 UTC (rev 103541)
@@ -143,7 +143,7 @@
<dependency>
<groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
+ <artifactId>jboss-logging</artifactId>
</dependency>
<dependency>
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2010-04-05 22:41:56 UTC (rev 103540)
+++ trunk/component-matrix/pom.xml 2010-04-05 23:22:08 UTC (rev 103541)
@@ -107,8 +107,7 @@
<version.org.jboss.jpa.impl>2.0.0</version.org.jboss.jpa.impl>
<version.org.jboss.jpa.spi>1.0.0</version.org.jboss.jpa.spi>
<version.org.jboss.kernel>2.2.0.Alpha9</version.org.jboss.kernel>
- <version.org.jboss.logging>2.2.0.CR1</version.org.jboss.logging>
- <version.org.jboss.logging.logmanager>2.2.0.CR2</version.org.jboss.logging.logmanager>
+ <version.org.jboss.logging>3.0.0.Beta2</version.org.jboss.logging>
<version.org.jboss.logging-service-metadata>1.0.0.CR8</version.org.jboss.logging-service-metadata>
<version.org.jboss.logmanager>1.2.0.CR1</version.org.jboss.logmanager>
<version.org.jboss.man>2.1.1.SP1</version.org.jboss.man>
@@ -181,6 +180,14 @@
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-dependency</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -197,6 +204,14 @@
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -601,6 +616,14 @@
<groupId>org.jboss.integration</groupId>
<artifactId>jboss-transaction-spi</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -621,41 +644,39 @@
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-kernel</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
+ <artifactId>jboss-logging</artifactId>
<version>${version.org.jboss.logging}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logmanager</groupId>
+ <artifactId>jboss-logmanager</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-jdk</artifactId>
- <version>${version.org.jboss.logging}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- <version>${version.org.jboss.logging}</version>
- <exclusions>
- <exclusion>
- <groupId>apache-log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-logmanager</artifactId>
- <version>${version.org.jboss.logging.logmanager}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.logging</groupId>
<artifactId>logging-service-metadata</artifactId>
<version>${version.org.jboss.logging-service-metadata}</version>
<exclusions>
@@ -663,6 +684,14 @@
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-kernel</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -709,7 +738,15 @@
<groupId>jboss</groupId>
<artifactId>jboss-test</artifactId>
</exclusion>
- </exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -729,7 +766,15 @@
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-jmx</artifactId>
</exclusion>
- </exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -745,6 +790,14 @@
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-dependency</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -752,6 +805,16 @@
<groupId>org.jboss.aop</groupId>
<artifactId>jboss-aop</artifactId>
<version>${version.org.jboss.aop}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -790,6 +853,14 @@
<groupId>jboss</groupId>
<artifactId>jboss-test</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -886,6 +957,16 @@
<groupId>org.jboss.mx</groupId>
<artifactId>jboss-j2se</artifactId>
<version>${version.org.jboss.mx}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -910,6 +991,16 @@
<groupId>org.jboss.mx</groupId>
<artifactId>jboss-jmx</artifactId>
<version>${version.org.jboss.mx}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -960,6 +1051,16 @@
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-client</artifactId>
<version>${version.jboss.jbossws}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -1353,6 +1454,16 @@
<groupId>objectweb-joramtests</groupId>
<artifactId>joramtests</artifactId>
<version>1.6</version>
+ <exclusions>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -1407,6 +1518,16 @@
<groupId>org.jboss.slf4j</groupId>
<artifactId>slf4j-jboss-logging</artifactId>
<version>${version.org.jboss.slf4j}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -1554,6 +1675,16 @@
<groupId>org.jboss</groupId>
<artifactId>jboss-common-core</artifactId>
<version>${version.org.jboss.common.core}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -1603,6 +1734,14 @@
<groupId>org.hibernate</groupId>
<artifactId>ejb3-persistence</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -1635,6 +1774,16 @@
<groupId>org.jboss</groupId>
<artifactId>jboss-reflect</artifactId>
<version>${version.org.jboss.reflect}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -1659,6 +1808,16 @@
<groupId>org.jboss</groupId>
<artifactId>jboss-mdr</artifactId>
<version>${version.org.jboss.mdr}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -1667,6 +1826,14 @@
<version>1.1.6.GA</version>
<exclusions>
<exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>apache-log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
@@ -1745,6 +1912,16 @@
<groupId>org.jboss.integration</groupId>
<artifactId>jboss-transaction-spi</artifactId>
<version>${version.org.jboss.integration}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -1776,6 +1953,14 @@
<groupId>wutka-dtdparser</groupId>
<artifactId>dtdparser121</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -1789,12 +1974,32 @@
<groupId>org.jboss.naming</groupId>
<artifactId>jnp-client</artifactId>
<version>${version.org.jboss.naming}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.naming</groupId>
<artifactId>jnpserver</artifactId>
<version>${version.org.jboss.naming}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -1834,6 +2039,14 @@
<groupId>org.jboss</groupId>
<artifactId>jboss-classloading-spi</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -1846,6 +2059,14 @@
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-dependency</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -1853,24 +2074,64 @@
<groupId>org.jboss.cl</groupId>
<artifactId>jboss-classloading-vfs</artifactId>
<version>${version.org.jboss.cl}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.classpool</groupId>
<artifactId>jboss-classpool</artifactId>
<version>${version.org.jboss.classpool}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.classpool</groupId>
<artifactId>jboss-classpool-scoped</artifactId>
<version>${version.org.jboss.classpool}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.classpool</groupId>
<artifactId>jboss-classpool-jbosscl</artifactId>
<version>${version.org.jboss.classpool}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -1934,6 +2195,14 @@
<groupId>jboss</groupId>
<artifactId>jboss-serialization</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -1989,6 +2258,16 @@
<groupId>org.jboss.deployers</groupId>
<artifactId>jboss-deployers-core</artifactId>
<version>${version.org.jboss.deployers}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -2013,12 +2292,32 @@
<groupId>org.jboss.deployers</groupId>
<artifactId>jboss-deployers-structure-spi</artifactId>
<version>${version.org.jboss.deployers}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.deployers</groupId>
<artifactId>jboss-deployers-vfs</artifactId>
<version>${version.org.jboss.deployers}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -2069,12 +2368,32 @@
<groupId>org.jboss.bootstrap</groupId>
<artifactId>jboss-bootstrap-impl-as</artifactId>
<version>${version.org.jboss.bootstrap}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.bootstrap</groupId>
<artifactId>jboss-bootstrap-impl-base</artifactId>
<version>${version.org.jboss.bootstrap}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -2086,6 +2405,14 @@
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-kernel</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -2093,12 +2420,32 @@
<groupId>org.jboss.bootstrap</groupId>
<artifactId>jboss-bootstrap-spi</artifactId>
<version>${version.org.jboss.bootstrap}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.bootstrap</groupId>
<artifactId>jboss-bootstrap-spi-as</artifactId>
<version>${version.org.jboss.bootstrap}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -2110,6 +2457,14 @@
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-kernel</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -2122,6 +2477,14 @@
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-aop-mc-int</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -2134,6 +2497,14 @@
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-aop-mc-int</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -2141,6 +2512,16 @@
<groupId>org.jboss.jpa</groupId>
<artifactId>jboss-jpa-impl</artifactId>
<version>${version.org.jboss.jpa.impl}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -2152,6 +2533,14 @@
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-aop-mc-int</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -2165,6 +2554,16 @@
<groupId>org.jboss.man</groupId>
<artifactId>jboss-metatype</artifactId>
<version>${version.org.jboss.man}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -2205,12 +2604,32 @@
<groupId>org.jboss.kernel</groupId>
<artifactId>jboss-dependency</artifactId>
<version>${version.org.jboss.kernel}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.kernel</groupId>
<artifactId>jboss-kernel</artifactId>
<version>${version.org.jboss.kernel}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -2226,6 +2645,14 @@
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-dependency</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -2319,6 +2746,16 @@
<groupId>org.picketbox</groupId>
<artifactId>picketbox-bare</artifactId>
<version>${version.org.jboss.security}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -2331,18 +2768,48 @@
<groupId>org.jboss.service.binding</groupId>
<artifactId>jboss-service-binding-core</artifactId>
<version>${version.org.jboss.service.binding}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.service.binding</groupId>
<artifactId>jboss-service-binding-mgmt</artifactId>
<version>${version.org.jboss.service.binding}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.threads</groupId>
<artifactId>jboss-threads</artifactId>
<version>${version.org.jboss.threads}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -2695,6 +3162,7 @@
<searchTransitive>true</searchTransitive>
<excludes>
<exclude>jboss:jboss-common</exclude>
+ <exclude>jboss:jboss-common-core</exclude>
<exclude>javax.el:el-api</exclude>
<exclude>javax.transaction:jta</exclude>
<exclude>javax.security:jacc</exclude>
@@ -2725,7 +3193,7 @@
<exclude>sun-jaxws:jaxws-rt</exclude>
<exclude>sun-jaxb:jaxb-xjc</exclude>
<exclude>sun-jaxws:streambuffer</exclude>
- <!-- JBAS-7531 org.jboss.ejb3:jboss-ejb3-as-int is retired.
+ <!-- JBAS-7531 org.jboss.ejb3:jboss-ejb3-as-int is retired.
Use org.jboss.ejb3:jboss-ejb3_1 instead
-->
<exclude>org.jboss.ejb3:jboss-ejb3-as-int</exclude>
@@ -2753,6 +3221,11 @@
<exclude>jboss.web:jsp-api</exclude>
<exclude>jboss.web:servlet-api</exclude>
<!-- <exclude>jboss.web:servlet-api</exclude> -->
+ <exclude>jboss:jboss-logging-spi</exclude>
+ <exclude>org.jboss.logging:jboss-logging-spi</exclude>
+ <exclude>org.jboss.logging:jboss-logging-log4j</exclude>
+ <exclude>org.jboss.logging:jboss-logging-jdk</exclude>
+ <exclude>org.jboss.logging:jboss-logging-logmanager</exclude>
</excludes>
<includes>
<include>javax.xml.bind:jaxb-api:jar:2.1</include>
Modified: trunk/connector/pom.xml
===================================================================
--- trunk/connector/pom.xml 2010-04-05 22:41:56 UTC (rev 103540)
+++ trunk/connector/pom.xml 2010-04-05 23:22:08 UTC (rev 103541)
@@ -200,7 +200,7 @@
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
+ <artifactId>jboss-logging</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.man</groupId>
Modified: trunk/connector/src/main/java/org/jboss/resource/connectionmanager/BaseConnectionManager2.java
===================================================================
--- trunk/connector/src/main/java/org/jboss/resource/connectionmanager/BaseConnectionManager2.java 2010-04-05 22:41:56 UTC (rev 103540)
+++ trunk/connector/src/main/java/org/jboss/resource/connectionmanager/BaseConnectionManager2.java 2010-04-05 23:22:08 UTC (rev 103541)
@@ -51,7 +51,6 @@
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.logging.Logger;
-import org.jboss.logging.util.LoggerPluginWriter;
import org.jboss.mx.util.JMXExceptionDecoder;
import org.jboss.mx.util.MBeanServerLocator;
import org.jboss.resource.JBossResourceException;
Modified: trunk/ejb3/pom.xml
===================================================================
--- trunk/ejb3/pom.xml 2010-04-05 22:41:56 UTC (rev 103540)
+++ trunk/ejb3/pom.xml 2010-04-05 23:22:08 UTC (rev 103541)
@@ -184,7 +184,7 @@
<dependency>
<groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
+ <artifactId>jboss-logging</artifactId>
</dependency>
<dependency>
@@ -288,6 +288,18 @@
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-jms-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -324,6 +336,14 @@
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-ejb-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
Modified: trunk/hibernate-int/pom.xml
===================================================================
--- trunk/hibernate-int/pom.xml 2010-04-05 22:41:56 UTC (rev 103540)
+++ trunk/hibernate-int/pom.xml 2010-04-05 23:22:08 UTC (rev 103541)
@@ -82,7 +82,7 @@
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
+ <artifactId>jboss-logging</artifactId>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
Modified: trunk/iiop/pom.xml
===================================================================
--- trunk/iiop/pom.xml 2010-04-05 22:41:56 UTC (rev 103540)
+++ trunk/iiop/pom.xml 2010-04-05 23:22:08 UTC (rev 103541)
@@ -196,10 +196,6 @@
<artifactId>jboss-as-server</artifactId>
<exclusions>
<exclusion>
- <groupId>jboss</groupId>
- <artifactId>jboss-common-logging-spi</artifactId>
- </exclusion>
- <exclusion>
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-javaee</artifactId>
</exclusion>
@@ -209,16 +205,6 @@
<dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-security</artifactId>
- <exclusions>
- <exclusion>
- <groupId>jboss</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jboss</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
@@ -232,16 +218,6 @@
</dependency>
<dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.jboss.metadata</groupId>
<artifactId>jboss-metadata-common</artifactId>
<exclusions>
Modified: trunk/jbossas-remoting/pom.xml
===================================================================
--- trunk/jbossas-remoting/pom.xml 2010-04-05 22:41:56 UTC (rev 103540)
+++ trunk/jbossas-remoting/pom.xml 2010-04-05 23:22:08 UTC (rev 103541)
@@ -45,7 +45,7 @@
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
+ <artifactId>jboss-logging</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.remoting</groupId>
Modified: trunk/main/src/main/java/org/jboss/Main.java
===================================================================
--- trunk/main/src/main/java/org/jboss/Main.java 2010-04-05 22:41:56 UTC (rev 103540)
+++ trunk/main/src/main/java/org/jboss/Main.java 2010-04-05 23:22:08 UTC (rev 103541)
@@ -92,9 +92,8 @@
// Concurrent
"concurrent.jar",
// Logging
- "jboss-logging-spi.jar",
+ "jboss-logging.jar",
"jboss-logmanager.jar",
- "jboss-logging-logmanager.jar",
// Common jars
"jboss-common-core.jar",
"resolver.jar",
@@ -515,7 +514,7 @@
{
// set this from a system property or default to jboss
String programName = System.getProperty("program.name", "jboss");
- String sopts = "-:hD:d:p:n:c:Vj::B:L:C:P:b:g:u:m:l:H:N:";
+ String sopts = "-:hD:d:p:n:c:Vj::B:L:C:P:b:g:u:m:H:N:";
LongOpt[] lopts =
{
new LongOpt("help", LongOpt.NO_ARGUMENT, null, 'h'),
@@ -533,7 +532,6 @@
new LongOpt("partition", LongOpt.REQUIRED_ARGUMENT, null, 'g'),
new LongOpt("udp", LongOpt.REQUIRED_ARGUMENT, null, 'u'),
new LongOpt("mcast_port", LongOpt.REQUIRED_ARGUMENT, null, 'm'),
- new LongOpt("log", LongOpt.REQUIRED_ARGUMENT, null, 'l'),
new LongOpt("hostname", LongOpt.REQUIRED_ARGUMENT, null, 'H'),
new LongOpt("nodename", LongOpt.REQUIRED_ARGUMENT, null, 'N'),
};
@@ -579,7 +577,6 @@
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(" -H, --hostname=<name> Set the host name");
System.out.println(" -N, --nodename=<name> Set the node name to use");
System.out.println();
@@ -736,17 +733,6 @@
System.setProperty(udpPortPropName, arg);
break;
- case 'l' : {
- arg = getopt.getOptarg();
- String logPlugin = arg;
- 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;
- }
-
case 'H' : {
arg = getopt.getOptarg();
System.setProperty("jboss.qualified.host.name", arg.trim().toLowerCase());
Modified: trunk/management/pom.xml
===================================================================
--- trunk/management/pom.xml 2010-04-05 22:41:56 UTC (rev 103540)
+++ trunk/management/pom.xml 2010-04-05 23:22:08 UTC (rev 103541)
@@ -111,7 +111,7 @@
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
+ <artifactId>jboss-logging</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
Modified: trunk/osgi/zip/pom.xml
===================================================================
--- trunk/osgi/zip/pom.xml 2010-04-05 22:41:56 UTC (rev 103540)
+++ trunk/osgi/zip/pom.xml 2010-04-05 23:22:08 UTC (rev 103541)
@@ -37,6 +37,16 @@
<groupId>org.jboss.osgi.deployers</groupId>
<artifactId>jboss-osgi-deployers-vfs30</artifactId>
<version>${version.jboss.osgi.deployers}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.osgi.framework</groupId>
@@ -47,6 +57,16 @@
<groupId>org.jboss.osgi.framework</groupId>
<artifactId>jboss-osgi-framework-vfs30</artifactId>
<version>${version.jboss.osgi.framework}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- Apache Aries -->
Modified: trunk/profileservice/pom.xml
===================================================================
--- trunk/profileservice/pom.xml 2010-04-05 22:41:56 UTC (rev 103540)
+++ trunk/profileservice/pom.xml 2010-04-05 23:22:08 UTC (rev 103541)
@@ -143,7 +143,7 @@
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
+ <artifactId>jboss-logging</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.integration</groupId>
@@ -251,6 +251,14 @@
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-ejb-api_3.1</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
</dependencies>
Modified: trunk/system/pom.xml
===================================================================
--- trunk/system/pom.xml 2010-04-05 22:41:56 UTC (rev 103540)
+++ trunk/system/pom.xml 2010-04-05 23:22:08 UTC (rev 103541)
@@ -65,7 +65,7 @@
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
+ <artifactId>jboss-logging</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.integration</groupId>
Modified: trunk/system-jmx/pom.xml
===================================================================
--- trunk/system-jmx/pom.xml 2010-04-05 22:41:56 UTC (rev 103540)
+++ trunk/system-jmx/pom.xml 2010-04-05 23:22:08 UTC (rev 103541)
@@ -49,7 +49,7 @@
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
+ <artifactId>jboss-logging</artifactId>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml 2010-04-05 22:41:56 UTC (rev 103540)
+++ trunk/testsuite/build.xml 2010-04-05 23:22:08 UTC (rev 103541)
@@ -392,9 +392,7 @@
<fileset refid="org.jboss.jbossas:jboss-as-cluster:jar"/>
<path refid="org.jboss.jbossas.cluster.resources"/>
<fileset refid="org.jboss:jboss-common-core:jar"/>
- <fileset refid="org.jboss.logging:jboss-logging-spi:jar"/>
- <fileset refid="org.jboss.logging:jboss-logging-log4j:jar"/>
- <fileset refid="org.jboss.logging:jboss-logging-jdk:jar"/>
+ <fileset refid="org.jboss.logging:jboss-logging:jar"/>
<fileset refid="org.jboss.jbossas:jboss-as-deployment:jar"/>
<fileset refid="org.jboss.jbossas:jboss-as-deployment:jar:jboss-jsr88"/>
<fileset refid="org.jboss.jbossas:jboss-as-hibernate-int:jar"/>
@@ -2377,9 +2375,7 @@
<path refid="trove.classpath"/>
<path refid="org.jboss.aop.classpath"/>
<fileset refid="org.jboss:jboss-common-core:jar"/>
- <fileset refid="org.jboss.logging:jboss-logging-spi:jar"/>
- <fileset refid="org.jboss.logging:jboss-logging-log4j:jar"/>
- <fileset refid="org.jboss.logging:jboss-logging-jdk:jar"/>
+ <fileset refid="org.jboss.logging:jboss-logging:jar"/>
</path>
<aopc compilerclasspathref="aop.task.classpath">
Modified: trunk/testsuite/imports/sections/aop.xml
===================================================================
--- trunk/testsuite/imports/sections/aop.xml 2010-04-05 22:41:56 UTC (rev 103540)
+++ trunk/testsuite/imports/sections/aop.xml 2010-04-05 23:22:08 UTC (rev 103541)
@@ -10,9 +10,7 @@
<fileset refid="trove:trove:jar"/>
<path refid="org.jboss.aop.classpath"/>
<fileset refid="org.jboss:jboss-common-core:jar"/>
- <fileset refid="org.jboss.logging:jboss-logging-spi:jar"/>
- <fileset refid="org.jboss.logging:jboss-logging-log4j:jar"/>
- <fileset refid="org.jboss.logging:jboss-logging-jdk:jar"/>
+ <fileset refid="org.jboss.logging:jboss-logging:jar"/>
</path>
<antcall target="compile-aop-annotatations"/>
<!-- build aopest.jar -->
Modified: trunk/testsuite/imports/sections/classloader.xml
===================================================================
--- trunk/testsuite/imports/sections/classloader.xml 2010-04-05 22:41:56 UTC (rev 103540)
+++ trunk/testsuite/imports/sections/classloader.xml 2010-04-05 23:22:08 UTC (rev 103541)
@@ -523,9 +523,7 @@
<fileset refid="trove:trove:jar"/>
<path refid="org.jboss.aop.classpath"/>
<fileset refid="org.jboss:jboss-common-core:jar"/>
- <fileset refid="org.jboss.logging:jboss-logging-spi:jar"/>
- <fileset refid="org.jboss.logging:jboss-logging-log4j:jar"/>
- <fileset refid="org.jboss.logging:jboss-logging-jdk:jar"/>
+ <fileset refid="org.jboss.logging:jboss-logging:jar"/>
<fileset refid="org.jboss.cache:jbosscache-core:jar"/>
<fileset refid="org.jboss.cache:jbosscache-pojo:jar"/>
</path>
Modified: trunk/testsuite/pom.xml
===================================================================
--- trunk/testsuite/pom.xml 2010-04-05 22:41:56 UTC (rev 103540)
+++ trunk/testsuite/pom.xml 2010-04-05 23:22:08 UTC (rev 103541)
@@ -95,6 +95,20 @@
<dependency>
<groupId>objectweb-joramtests</groupId>
<artifactId>joramtests</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>odmg</groupId>
@@ -132,6 +146,10 @@
<groupId>org.jboss.snowdrop</groupId>
<artifactId>snowdrop-facade</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ </dependency>
<dependency>
<groupId>org.hibernate</groupId>
Modified: trunk/tomcat/pom.xml
===================================================================
--- trunk/tomcat/pom.xml 2010-04-05 22:41:56 UTC (rev 103540)
+++ trunk/tomcat/pom.xml 2010-04-05 23:22:08 UTC (rev 103541)
@@ -178,7 +178,7 @@
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
+ <artifactId>jboss-logging</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.security</groupId>
@@ -189,6 +189,10 @@
<artifactId>jboss-serialization</artifactId>
<exclusions>
<exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>jboss</groupId>
<artifactId>jboss-logging-log4j</artifactId>
</exclusion>
@@ -338,6 +342,14 @@
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-transaction-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
Modified: trunk/varia/pom.xml
===================================================================
--- trunk/varia/pom.xml 2010-04-05 22:41:56 UTC (rev 103540)
+++ trunk/varia/pom.xml 2010-04-05 23:22:08 UTC (rev 103541)
@@ -315,15 +315,10 @@
<dependency>
<groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
+ <artifactId>jboss-logging</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.jboss.naming</groupId>
<artifactId>jnp-client</artifactId>
</dependency>
Modified: trunk/webservices/pom.xml
===================================================================
--- trunk/webservices/pom.xml 2010-04-05 22:41:56 UTC (rev 103540)
+++ trunk/webservices/pom.xml 2010-04-05 23:22:08 UTC (rev 103541)
@@ -153,6 +153,14 @@
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-transaction-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -191,8 +199,16 @@
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-transaction-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
</exclusions>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-common</artifactId>
@@ -213,6 +229,14 @@
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-transaction-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<!-- transitive dependencies -->
More information about the jboss-cvs-commits
mailing list