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

[jboss-cvs-commits at lists.jboss.org]

Author: david.lloyd at jboss.com
Date: 2009-07-09 23:22:19 -0400 (Thu, 09 Jul 2009)
New Revision: 91042

Modified:
   branches/dml-log-service-integration/build/build.xml
   branches/dml-log-service-integration/component-matrix/pom.xml
   branches/dml-log-service-integration/thirdparty/pom.xml
Log:
Add in the new log stuff

Modified: branches/dml-log-service-integration/build/build.xml
===================================================================
--- branches/dml-log-service-integration/build/build.xml	2009-07-10 03:19:56 UTC (rev 91041)
+++ branches/dml-log-service-integration/build/build.xml	2009-07-10 03:22:19 UTC (rev 91042)
@@ -275,6 +275,7 @@
     <copy todir="${install.minimal.deployers}" overwrite="true">
        <fileset dir="${install.default.deployers}">
           <include name="jboss-threads.deployer/**"/>
+          <include name="jboss-logging.deployer/**"/>
        </fileset>
     </copy>
     <copy todir="${install.minimal.deploy}" overwrite="true">
@@ -321,6 +322,7 @@
         <include name="metadata-deployer-jboss-beans.xml"/>
         <include name="security-deployer-jboss-beans.xml"/>
         <include name="jboss-threads.deployer/**"/>
+        <include name="jboss-logging.deployer/**"/>
       </fileset>
     </copy>
     <copy todir="${install.web.deploy}">
@@ -1472,6 +1474,10 @@
       <fileset dir="${varia.module.output}/resources/threads"/>
     </copy>
 
+    <copy todir="${install.server}/all/deployers/jboss-logging.deployer/META-INF">
+      <fileset dir="${varia.module.output}/resources/logging"/>
+    </copy>
+
     <copy todir="${install.server}/all/deploy/xnio-provider.jar/META-INF">
       <fileset dir="${varia.module.output}/resources/xnio">
         <include name="xnio-jboss-beans.xml"/>
@@ -1963,6 +1969,7 @@
       <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="quartz:quartz:jar"/>
       <fileset refid="jaxen:jaxen:jar"/>
       <fileset refid="org.jboss.cluster:jboss-ha-client:jar"/>
@@ -2292,6 +2299,13 @@
       <mapper refid="remove-versions" />
     </copy>
 
+    <!-- copy the logging deployer files into their proper places -->
+    <mkdir dir="${install.server}/all/deployers/jboss-logging.deployer/META-INF"/>
+    <copy todir="${install.server}/all/deployers/jboss-logging.deployer">
+      <fileset refid="org.jboss.logging:logging-service-metadata:jar"/>
+      <mapper refid="remove-versions" />
+    </copy>
+
     <!-- copy the xnio deployer files into their proper places -->
     <mkdir dir="${install.server}/all/deploy/xnio-provider.jar/META-INF"/>
     <copy todir="${install.server}/all/deploy/xnio-provider.jar">

Modified: branches/dml-log-service-integration/component-matrix/pom.xml
===================================================================
--- branches/dml-log-service-integration/component-matrix/pom.xml	2009-07-10 03:19:56 UTC (rev 91041)
+++ branches/dml-log-service-integration/component-matrix/pom.xml	2009-07-10 03:22:19 UTC (rev 91042)
@@ -82,7 +82,7 @@
     <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.logging>2.1.0.GA</version.org.jboss.logging>
-    <version.org.jboss.logmanager>1.1.0.CR3</version.org.jboss.logmanager>
+    <version.org.jboss.logmanager>1.1.0.CR4</version.org.jboss.logmanager>
     <version.org.jboss.man>2.1.1.CR1</version.org.jboss.man>
     <version.org.jboss.mdr>2.0.2.GA</version.org.jboss.mdr>
     <version.org.jboss.metadata>1.0.1.GA</version.org.jboss.metadata>
@@ -567,12 +567,24 @@
       </dependency>
 
       <dependency>
+        <groupId>org.jboss.logging</groupId>
+        <artifactId>logging-service-metadata</artifactId>
+        <version>1.0.0.CR1</version>
+      </dependency>
+
+      <dependency>
         <groupId>org.jboss.logmanager</groupId>
         <artifactId>jboss-logmanager</artifactId>
         <version>${version.org.jboss.logmanager}</version>
       </dependency>
 
       <dependency>
+        <groupId>org.jboss.logmanager</groupId>
+        <artifactId>jboss-logmanager-log4j</artifactId>
+        <version>1.0.0.CR2</version>
+      </dependency>
+
+      <dependency>
         <groupId>jboss</groupId>
         <artifactId>jboss-j2ee</artifactId>
         <version>4.0.2</version>

Modified: branches/dml-log-service-integration/thirdparty/pom.xml
===================================================================
--- branches/dml-log-service-integration/thirdparty/pom.xml	2009-07-10 03:19:56 UTC (rev 91041)
+++ branches/dml-log-service-integration/thirdparty/pom.xml	2009-07-10 03:22:19 UTC (rev 91042)
@@ -1432,15 +1432,23 @@
       <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.logging</groupId>
+      <artifactId>jboss-logging-logmanager</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.logging</groupId>
+      <artifactId>logging-service-metadata</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.jboss.logmanager</groupId>
       <artifactId>jboss-logmanager</artifactId>
     </dependency>
     <dependency>
+      <groupId>org.jboss.logmanager</groupId>
+      <artifactId>jboss-logmanager-log4j</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.jboss.integration</groupId>
       <artifactId>jboss-classloading-spi</artifactId>
     </dependency>