[jboss-cvs] JBossAS SVN: r90270 - in branches/dml-log-service-integration: client and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jun 16 16:06:19 EDT 2009
Author: david.lloyd at jboss.com
Date: 2009-06-16 16:06:19 -0400 (Tue, 16 Jun 2009)
New Revision: 90270
Modified:
branches/dml-log-service-integration/build/build.xml
branches/dml-log-service-integration/client/pom.xml
branches/dml-log-service-integration/cluster/pom.xml
branches/dml-log-service-integration/component-matrix/pom.xml
branches/dml-log-service-integration/hibernate-int/pom.xml
branches/dml-log-service-integration/thirdparty/pom.xml
branches/dml-log-service-integration/tomcat/pom.xml
Log:
Point commit - does not start due to classpath issue
Modified: branches/dml-log-service-integration/build/build.xml
===================================================================
--- branches/dml-log-service-integration/build/build.xml 2009-06-16 20:02:08 UTC (rev 90269)
+++ branches/dml-log-service-integration/build/build.xml 2009-06-16 20:06:19 UTC (rev 90270)
@@ -411,7 +411,7 @@
<include name="*-client.jar"/>
<include name="asm.jar"/>
<include name="cglib-2.1.1.jar"/>
- <include name="commons-logging.jar"/>
+ <include name="jcl-over-slf4j.jar"/>
<include name="concurrent.jar"/>
<include name="ejb3-persistence.jar"/>
<include name="hibernate-annotations.jar"/>
@@ -1957,11 +1957,11 @@
<fileset refid="org.jboss.security:jbosssx:jar"/>
<fileset refid="org.jboss.security:jbossxacml:jar"/>
<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="quartz:quartz:jar"/>
- <fileset refid="commons-logging:commons-logging:jar"/>
<fileset refid="jaxen:jaxen:jar"/>
<fileset refid="org.jboss.cluster:jboss-ha-client:jar"/>
<fileset refid="org.jboss.cluster:jboss-ha-server-api:jar"/>
@@ -2094,7 +2094,6 @@
<mkdir dir="${install.client}"/>
<copy todir="${install.client}" filtering="no">
<fileset refid="antlr:antlr:jar"/>
- <fileset refid="commons-logging:commons-logging:jar"/>
<fileset refid="org.apache:xmlsec:jar"/>
<fileset refid="wsdl4j:wsdl4j:jar"/>
<fileset refid="javassist:javassist:jar"/>
@@ -2103,6 +2102,7 @@
<fileset refid="org.jboss.logging:jboss-logging-jdk:jar"/>
<fileset refid="org.jboss.logging:jboss-logging-log4j: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"/>
<fileset refid="org.jboss.integration:jboss-integration:jar"/>
<fileset refid="org.jboss.ejb3:jboss-ejb3-ext-api:jar"/>
Modified: branches/dml-log-service-integration/client/pom.xml
===================================================================
--- branches/dml-log-service-integration/client/pom.xml 2009-06-16 20:02:08 UTC (rev 90269)
+++ branches/dml-log-service-integration/client/pom.xml 2009-06-16 20:06:19 UTC (rev 90270)
@@ -14,12 +14,8 @@
<url>http://www.jboss.org/jbossas</url>
<dependencies>
+
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
-
- <dependency>
<groupId>oswego-concurrent</groupId>
<artifactId>concurrent</artifactId>
</dependency>
@@ -245,6 +241,11 @@
<artifactId>slf4j-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
+
</dependencies>
</project>
Modified: branches/dml-log-service-integration/cluster/pom.xml
===================================================================
--- branches/dml-log-service-integration/cluster/pom.xml 2009-06-16 20:02:08 UTC (rev 90269)
+++ branches/dml-log-service-integration/cluster/pom.xml 2009-06-16 20:06:19 UTC (rev 90270)
@@ -132,10 +132,10 @@
<dependencies>
<!-- Compile (global dependencies) -->
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-common-core</artifactId>
Modified: branches/dml-log-service-integration/component-matrix/pom.xml
===================================================================
--- branches/dml-log-service-integration/component-matrix/pom.xml 2009-06-16 20:02:08 UTC (rev 90269)
+++ branches/dml-log-service-integration/component-matrix/pom.xml 2009-06-16 20:06:19 UTC (rev 90270)
@@ -227,12 +227,6 @@
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.0.jboss</version>
- </dependency>
-
- <dependency>
<groupId>apache-myfaces</groupId>
<artifactId>myfaces-impl</artifactId>
<version>1.1.3</version>
@@ -1107,6 +1101,12 @@
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>${version.org.slf4j}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.jboss.slf4j</groupId>
<artifactId>slf4j-jboss-logging</artifactId>
<version>${version.org.jboss.slf4j}</version>
Modified: branches/dml-log-service-integration/hibernate-int/pom.xml
===================================================================
--- branches/dml-log-service-integration/hibernate-int/pom.xml 2009-06-16 20:02:08 UTC (rev 90269)
+++ branches/dml-log-service-integration/hibernate-int/pom.xml 2009-06-16 20:06:19 UTC (rev 90270)
@@ -70,8 +70,8 @@
<dependencies>
<!-- Compile (global dependencies) -->
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
Modified: branches/dml-log-service-integration/thirdparty/pom.xml
===================================================================
--- branches/dml-log-service-integration/thirdparty/pom.xml 2009-06-16 20:02:08 UTC (rev 90269)
+++ branches/dml-log-service-integration/thirdparty/pom.xml 2009-06-16 20:06:19 UTC (rev 90270)
@@ -974,13 +974,6 @@
</mapping>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <mapping>
- <componentId>apache-logging</componentId>
- </mapping>
- </dependency>
- <dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
<mapping>
@@ -1085,10 +1078,6 @@
<artifactId>log4j</artifactId>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
<groupId>apache-myfaces</groupId>
<artifactId>myfaces-impl</artifactId>
</dependency>
@@ -1258,6 +1247,10 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jboss.slf4j</groupId>
<artifactId>slf4j-jboss-logging</artifactId>
</dependency>
Modified: branches/dml-log-service-integration/tomcat/pom.xml
===================================================================
--- branches/dml-log-service-integration/tomcat/pom.xml 2009-06-16 20:02:08 UTC (rev 90269)
+++ branches/dml-log-service-integration/tomcat/pom.xml 2009-06-16 20:06:19 UTC (rev 90270)
@@ -159,10 +159,6 @@
<dependencies>
<!-- Compile (global dependencies) -->
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
<groupId>apache-xerces</groupId>
<artifactId>xml-apis</artifactId>
</dependency>
@@ -373,6 +369,10 @@
<artifactId>ejb3-persistence</artifactId>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
+ <dependency>
<groupId>net.jcip</groupId>
<artifactId>jcip-annotations</artifactId>
</dependency>
More information about the jboss-cvs-commits
mailing list