[Jboss-cvs] JBossAS SVN: r56931 - in branches/MC_VDF_WORK: aop aop/docs/reference/reference/en/modules aop/src aspects build cluster connector console deployment ejb3 ejb3x hibernate-int iiop j2ee j2se jbossas jbossas/jmx-remoting jbossas/remoting jmx jmx/src/main/org/jboss/mx/loading jmx-remoting management mbeans messaging naming security server spring-int system system/src/main/org/jboss/system/server system-jmx testsuite testsuite/imports/sections tomcat tools/etc/buildmagic tools/lib transaction varia

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Mon Sep 18 02:04:53 EDT 2006


Author: scott.stark at jboss.org
Date: 2006-09-18 02:04:17 -0400 (Mon, 18 Sep 2006)
New Revision: 56931

Modified:
   branches/MC_VDF_WORK/aop/.classpath
   branches/MC_VDF_WORK/aop/build-retro.xml
   branches/MC_VDF_WORK/aop/build-tests-jdk14.xml
   branches/MC_VDF_WORK/aop/build-tests-jdk50.xml
   branches/MC_VDF_WORK/aop/build.xml
   branches/MC_VDF_WORK/aop/docs/reference/reference/en/modules/annotationcompiler.xml
   branches/MC_VDF_WORK/aop/docs/reference/reference/en/modules/compiling.xml
   branches/MC_VDF_WORK/aop/src/build.xml
   branches/MC_VDF_WORK/aspects/.classpath
   branches/MC_VDF_WORK/aspects/build-retro.xml
   branches/MC_VDF_WORK/aspects/build-test.xml
   branches/MC_VDF_WORK/aspects/build-test50.xml
   branches/MC_VDF_WORK/aspects/build.xml
   branches/MC_VDF_WORK/build/build-distr.xml
   branches/MC_VDF_WORK/build/build-thirdparty.xml
   branches/MC_VDF_WORK/cluster/.classpath
   branches/MC_VDF_WORK/cluster/build.xml
   branches/MC_VDF_WORK/connector/.classpath
   branches/MC_VDF_WORK/connector/build.xml
   branches/MC_VDF_WORK/console/.classpath
   branches/MC_VDF_WORK/console/build.xml
   branches/MC_VDF_WORK/deployment/.classpath
   branches/MC_VDF_WORK/deployment/build.xml
   branches/MC_VDF_WORK/ejb3/.classpath
   branches/MC_VDF_WORK/ejb3/build-test.xml
   branches/MC_VDF_WORK/ejb3/build.xml
   branches/MC_VDF_WORK/ejb3x/.classpath
   branches/MC_VDF_WORK/ejb3x/build.xml
   branches/MC_VDF_WORK/hibernate-int/.classpath
   branches/MC_VDF_WORK/hibernate-int/build.xml
   branches/MC_VDF_WORK/iiop/.classpath
   branches/MC_VDF_WORK/iiop/build.xml
   branches/MC_VDF_WORK/j2ee/.classpath
   branches/MC_VDF_WORK/j2ee/build.xml
   branches/MC_VDF_WORK/j2se/.classpath
   branches/MC_VDF_WORK/j2se/build.xml
   branches/MC_VDF_WORK/jbossas/.classpath
   branches/MC_VDF_WORK/jbossas/jmx-remoting/build.xml
   branches/MC_VDF_WORK/jbossas/remoting/build.xml
   branches/MC_VDF_WORK/jmx-remoting/.classpath
   branches/MC_VDF_WORK/jmx-remoting/build.xml
   branches/MC_VDF_WORK/jmx/.classpath
   branches/MC_VDF_WORK/jmx/build.xml
   branches/MC_VDF_WORK/jmx/src/main/org/jboss/mx/loading/ResourceInfo.java
   branches/MC_VDF_WORK/management/.classpath
   branches/MC_VDF_WORK/management/build.xml
   branches/MC_VDF_WORK/mbeans/.classpath
   branches/MC_VDF_WORK/mbeans/build.xml
   branches/MC_VDF_WORK/messaging/.classpath
   branches/MC_VDF_WORK/messaging/build.xml
   branches/MC_VDF_WORK/naming/.classpath
   branches/MC_VDF_WORK/naming/build.xml
   branches/MC_VDF_WORK/security/.classpath
   branches/MC_VDF_WORK/security/build.xml
   branches/MC_VDF_WORK/server/.classpath
   branches/MC_VDF_WORK/server/build.xml
   branches/MC_VDF_WORK/spring-int/.classpath
   branches/MC_VDF_WORK/system-jmx/.classpath
   branches/MC_VDF_WORK/system-jmx/build-test.xml
   branches/MC_VDF_WORK/system-jmx/build.xml
   branches/MC_VDF_WORK/system/.classpath
   branches/MC_VDF_WORK/system/build-test.xml
   branches/MC_VDF_WORK/system/build.xml
   branches/MC_VDF_WORK/system/src/main/org/jboss/system/server/ServerLoader.java
   branches/MC_VDF_WORK/testsuite/.classpath
   branches/MC_VDF_WORK/testsuite/build.xml
   branches/MC_VDF_WORK/testsuite/imports/sections/aop.xml
   branches/MC_VDF_WORK/testsuite/imports/sections/cache.xml
   branches/MC_VDF_WORK/testsuite/imports/sections/cluster.xml
   branches/MC_VDF_WORK/tomcat/.classpath
   branches/MC_VDF_WORK/tomcat/build.xml
   branches/MC_VDF_WORK/tools/etc/buildmagic/modules.ent
   branches/MC_VDF_WORK/tools/lib/jbossbuild.jar
   branches/MC_VDF_WORK/transaction/.classpath
   branches/MC_VDF_WORK/transaction/build.xml
   branches/MC_VDF_WORK/varia/.classpath
   branches/MC_VDF_WORK/varia/build.xml
Log:
jboss-common refactoring


Modified: branches/MC_VDF_WORK/aop/.classpath
===================================================================
--- branches/MC_VDF_WORK/aop/.classpath	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/aop/.classpath	2006-09-18 06:04:17 UTC (rev 56931)
@@ -12,9 +12,11 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="docs"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/profiler/jvmti/lib/jboss-profiler-jvmti.jar"/>
-	<classpathentry sourcepath="C:/svn/JBossCommon/workspace/common" kind="lib" path="/thirdparty/jboss/common/lib/jboss-common.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core-2.0.0.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi-2.0.0.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j-2.0.0.jar"/>
 	<classpathentry sourcepath="/javassist" kind="lib" path="/thirdparty/javassist/lib/javassist.jar"/>
-	<classpathentry sourcepath="C:/cvs/JBossMC/workspace/container/src/main" kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-container.jar"/>
+	<classpathentry sourcepath="/home/svn/JBossMC/jbossmc/container/src/main" kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-container.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/test/lib/jboss-test.jar"/>
 	<classpathentry kind="output" path="output/eclipse-classes"/>
 </classpath>

Modified: branches/MC_VDF_WORK/aop/build-retro.xml
===================================================================
--- branches/MC_VDF_WORK/aop/build-retro.xml	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/aop/build-retro.xml	2006-09-18 06:04:17 UTC (rev 56931)
@@ -100,7 +100,10 @@
 
       <!-- The combined dependent module classpath -->
       <path id="dependentmodule.classpath">
-         <path refid="jboss.common.classpath"/>
+      <path refid="jboss.common.core.classpath"/>
+      <path refid="jboss.common.logging.spi.classpath"/>
+      <path refid="jboss.common.logging.log4j.classpath"/>
+      <path refid="jboss.common.logging.jdk.classpath"/>
       </path>
 
       <!-- ===== -->

Modified: branches/MC_VDF_WORK/aop/build-tests-jdk14.xml
===================================================================
--- branches/MC_VDF_WORK/aop/build-tests-jdk14.xml	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/aop/build-tests-jdk14.xml	2006-09-18 06:04:17 UTC (rev 56931)
@@ -106,7 +106,10 @@
 
       <!-- The combined dependent module classpath -->
       <path id="dependentmodule.classpath">
-         <path refid="jboss.common.classpath"/>
+      <path refid="jboss.common.core.classpath"/>
+      <path refid="jboss.common.logging.spi.classpath"/>
+      <path refid="jboss.common.logging.log4j.classpath"/>
+      <path refid="jboss.common.logging.jdk.classpath"/>
          <path refid="jboss.test.classpath"/>
       </path>
 

Modified: branches/MC_VDF_WORK/aop/build-tests-jdk50.xml
===================================================================
--- branches/MC_VDF_WORK/aop/build-tests-jdk50.xml	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/aop/build-tests-jdk50.xml	2006-09-18 06:04:17 UTC (rev 56931)
@@ -101,7 +101,10 @@
 
       <!-- The combined dependent module classpath -->
       <path id="dependentmodule.classpath">
-         <path refid="jboss.common.classpath"/>
+      <path refid="jboss.common.core.classpath"/>
+      <path refid="jboss.common.logging.spi.classpath"/>
+      <path refid="jboss.common.logging.log4j.classpath"/>
+      <path refid="jboss.common.logging.jdk.classpath"/>
          <path refid="jboss.test.classpath"/>
       </path>
 

Modified: branches/MC_VDF_WORK/aop/build.xml
===================================================================
--- branches/MC_VDF_WORK/aop/build.xml	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/aop/build.xml	2006-09-18 06:04:17 UTC (rev 56931)
@@ -100,7 +100,10 @@
 
       <!-- The combined dependent module classpath -->
       <path id="dependentmodule.classpath">
-         <path refid="jboss.common.classpath"/>
+      <path refid="jboss.common.core.classpath"/>
+      <path refid="jboss.common.logging.spi.classpath"/>
+      <path refid="jboss.common.logging.log4j.classpath"/>
+      <path refid="jboss.common.logging.jdk.classpath"/>
          <path refid="jboss.test.classpath"/>
       </path>
 

Modified: branches/MC_VDF_WORK/aop/docs/reference/reference/en/modules/annotationcompiler.xml
===================================================================
--- branches/MC_VDF_WORK/aop/docs/reference/reference/en/modules/annotationcompiler.xml	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/aop/docs/reference/reference/en/modules/annotationcompiler.xml	2006-09-18 06:04:17 UTC (rev 56931)
@@ -239,7 +239,10 @@
       <path id="concurrent.classpath">
          <pathelement path="../../../concurrent.jar"/>
       </path>
-      <path id="jboss.common.classpath">
+      <path refid="jboss.common.core.classpath"/>
+      <path refid="jboss.common.logging.spi.classpath"/>
+      <path refid="jboss.common.logging.log4j.classpath"/>
+      <path refid="jboss.common.logging.jdk.classpath"/>
          <pathelement path="../../../jboss-common.jar"/>
       </path>
       <path id="jboss.aop.classpath">
@@ -252,7 +255,10 @@
          <path refid="javassist.classpath"/>
          <path refid="trove.classpath"/>
          <path refid="jboss.aop.classpath"/>
-         <path refid="jboss.common.classpath"/>
+      <path refid="jboss.common.core.classpath"/>
+      <path refid="jboss.common.logging.spi.classpath"/>
+      <path refid="jboss.common.logging.log4j.classpath"/>
+      <path refid="jboss.common.logging.jdk.classpath"/>
          <path refid="concurrent.classpath"/>
          <path refid="qdox.classpath"/>
       </path>]]></programlisting>

Modified: branches/MC_VDF_WORK/aop/docs/reference/reference/en/modules/compiling.xml
===================================================================
--- branches/MC_VDF_WORK/aop/docs/reference/reference/en/modules/compiling.xml	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/aop/docs/reference/reference/en/modules/compiling.xml	2006-09-18 06:04:17 UTC (rev 56931)
@@ -63,7 +63,10 @@
          <pathelement path="../../../concurrent.jar"/>
       </path>
 
-      <path id="jboss.common.classpath">
+      <path refid="jboss.common.core.classpath"/>
+      <path refid="jboss.common.logging.spi.classpath"/>
+      <path refid="jboss.common.logging.log4j.classpath"/>
+      <path refid="jboss.common.logging.jdk.classpath"/>
          <pathelement path="../../../jboss-common.jar"/>
       </path>
 
@@ -71,7 +74,10 @@
          <path refid="javassist.classpath"/>
          <path refid="trove.classpath"/>
          <path refid="jboss.aop.classpath"/>
-         <path refid="jboss.common.classpath"/>
+      <path refid="jboss.common.core.classpath"/>
+      <path refid="jboss.common.logging.spi.classpath"/>
+      <path refid="jboss.common.logging.log4j.classpath"/>
+      <path refid="jboss.common.logging.jdk.classpath"/>
          <path refid="concurrent.classpath"/>
       </path>]]>
          </programlisting>

Modified: branches/MC_VDF_WORK/aop/src/build.xml
===================================================================
--- branches/MC_VDF_WORK/aop/src/build.xml	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/aop/src/build.xml	2006-09-18 06:04:17 UTC (rev 56931)
@@ -15,7 +15,10 @@
          <pathelement path="concurrent.jar"/>
       </path>
 
-      <path id="jboss.common.classpath">
+      <path refid="jboss.common.core.classpath"/>
+      <path refid="jboss.common.logging.spi.classpath"/>
+      <path refid="jboss.common.logging.log4j.classpath"/>
+      <path refid="jboss.common.logging.jdk.classpath"/>
          <pathelement path="jboss-common.jar"/>
       </path>
 
@@ -35,7 +38,10 @@
          <path refid="javassist.classpath"/>
          <path refid="trove.classpath"/>
          <path refid="jboss.aop.classpath"/>
-         <path refid="jboss.common.classpath"/>
+      <path refid="jboss.common.core.classpath"/>
+      <path refid="jboss.common.logging.spi.classpath"/>
+      <path refid="jboss.common.logging.log4j.classpath"/>
+      <path refid="jboss.common.logging.jdk.classpath"/>
          <path refid="concurrent.classpath"/>
          <path refid="qdox.classpath"/>
          <path refid="junit.classpath"/>

Modified: branches/MC_VDF_WORK/aspects/.classpath
===================================================================
--- branches/MC_VDF_WORK/aspects/.classpath	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/aspects/.classpath	2006-09-18 06:04:17 UTC (rev 56931)
@@ -7,7 +7,9 @@
 	<classpathentry kind="src" path="src/test50"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="src" path="/system"/>
-	<classpathentry kind="lib" path="/thirdparty/jboss/common/lib/jboss-common.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core-2.0.0.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi-2.0.0.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j-2.0.0.jar"/>
 	<classpathentry kind="src" path="/aop"/>
 	<classpathentry kind="src" path="/cluster"/>
 	<classpathentry kind="src" path="/transaction"/>

Modified: branches/MC_VDF_WORK/aspects/build-retro.xml
===================================================================
--- branches/MC_VDF_WORK/aspects/build-retro.xml	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/aspects/build-retro.xml	2006-09-18 06:04:17 UTC (rev 56931)
@@ -81,7 +81,10 @@
 
       <!-- Configure modules -->
       <path id="dependentmodule.classpath">
-         <path refid="jboss.common.classpath"/>
+      <path refid="jboss.common.core.classpath"/>
+      <path refid="jboss.common.logging.spi.classpath"/>
+      <path refid="jboss.common.logging.log4j.classpath"/>
+      <path refid="jboss.common.logging.jdk.classpath"/>
          <path refid="jboss.j2ee.classpath"/>
          <path refid="jboss.j2se.classpath"/>
          <path refid="jboss.jmx.classpath"/>

Modified: branches/MC_VDF_WORK/aspects/build-test.xml
===================================================================
--- branches/MC_VDF_WORK/aspects/build-test.xml	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/aspects/build-test.xml	2006-09-18 06:04:17 UTC (rev 56931)
@@ -102,7 +102,10 @@
 
       <!-- The combined dependent module classpath -->
       <path id="dependentmodule.classpath">
-         <path refid="jboss.common.classpath"/>
+      <path refid="jboss.common.core.classpath"/>
+      <path refid="jboss.common.logging.spi.classpath"/>
+      <path refid="jboss.common.logging.log4j.classpath"/>
+      <path refid="jboss.common.logging.jdk.classpath"/>
          <path refid="jboss.j2ee.classpath"/>
          <path refid="jboss.j2se.classpath"/>
          <path refid="jboss.jmx.classpath"/>

Modified: branches/MC_VDF_WORK/aspects/build-test50.xml
===================================================================
--- branches/MC_VDF_WORK/aspects/build-test50.xml	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/aspects/build-test50.xml	2006-09-18 06:04:17 UTC (rev 56931)
@@ -109,7 +109,10 @@
          <path refid="jboss.j2se.classpath"/>
          <path refid="jboss.aop50.classpath"/>
          <path refid="jboss.aspects50.classpath"/>
-         <path refid="jboss.common.classpath"/>
+      <path refid="jboss.common.core.classpath"/>
+      <path refid="jboss.common.logging.spi.classpath"/>
+      <path refid="jboss.common.logging.log4j.classpath"/>
+      <path refid="jboss.common.logging.jdk.classpath"/>
          <path refid="jboss.system.classpath"/>
          <path refid="jboss.jmx.classpath"/>
          <path refid="jboss.naming.classpath"/>

Modified: branches/MC_VDF_WORK/aspects/build.xml
===================================================================
--- branches/MC_VDF_WORK/aspects/build.xml	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/aspects/build.xml	2006-09-18 06:04:17 UTC (rev 56931)
@@ -81,7 +81,10 @@
 
       <!-- Configure modules -->
       <path id="dependentmodule.classpath">
-         <path refid="jboss.common.classpath"/>
+      <path refid="jboss.common.core.classpath"/>
+      <path refid="jboss.common.logging.spi.classpath"/>
+      <path refid="jboss.common.logging.log4j.classpath"/>
+      <path refid="jboss.common.logging.jdk.classpath"/>
          <path refid="jboss.j2ee.classpath"/>
          <path refid="jboss.j2se.classpath"/>
          <path refid="jboss.jmx.classpath"/>
@@ -262,7 +265,7 @@
          <fileset dir="${build.etc}">
             <include name="org/jboss/**/*.xml"/>
          </fileset>
-         <zipfileset src="${jboss.common.lib}/jboss-archive-browsing.jar">
+         <zipfileset src="${jboss.common.core.lib}/jboss-common-core-2.0.0.jar">
             <include name="org/jboss/util/file/ArchiveBrowser*.class"/>
             <include name="org/jboss/util/file/ClassFileFilter.class"/>
             <include name="org/jboss/util/file/DirectoryArchiveBrowser.class"/>
@@ -407,7 +410,7 @@
          <fileset dir="${build.etc}">
             <include name="org/jboss/**/*.xml"/>
          </fileset>
-         <zipfileset src="${jboss.common.lib}/jboss-archive-browsing.jar">
+         <zipfileset src="${jboss.common.core.lib}/jboss-common-core-2.0.0.jar">
             <include name="org/jboss/util/file/ArchiveBrowser*.class"/>
             <include name="org/jboss/util/file/ClassFileFilter.class"/>
             <include name="org/jboss/util/file/DirectoryArchiveBrowser.class"/>

Modified: branches/MC_VDF_WORK/build/build-distr.xml
===================================================================
--- branches/MC_VDF_WORK/build/build-distr.xml	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/build/build-distr.xml	2006-09-18 06:04:17 UTC (rev 56931)
@@ -1350,7 +1350,7 @@
       <fileset dir="${jboss.jbossretro.lib}">
         <include name="jbossretro-rt.jar"/>
       </fileset>
-      <fileset dir="${jboss/backport.concurrent.lib}">
+      <fileset dir="${jboss.backport.concurrent.lib}">
         <include name="jboss-backport-concurrent.jar"/>
       </fileset>
     </copy>
@@ -1819,10 +1819,18 @@
         <include name="xercesImpl.jar"/>
         <include name="resolver.jar"/>
       </fileset>    	
-      <fileset dir="${jboss.common.lib}">
-        <include name="jboss-common.jar"/>
-        <include name="namespace.jar"/>
+      <fileset dir="${jboss.common.core.lib}">
+        <exclude name="*-source.jar"/>
       </fileset>
+      <fileset dir="${jboss.common.logging.spi.lib}">
+        <exclude name="*-source.jar"/>
+      </fileset>
+      <fileset dir="${jboss.common.logging.log4j.lib}">
+        <exclude name="*-source.jar"/>
+      </fileset>
+      <fileset dir="${jboss.common.logging.jdk.lib}">
+        <exclude name="*-source.jar"/>
+      </fileset>
       <fileset dir="${jboss.jbossxb.lib}">
         <include name="jboss-xml-binding.jar"/>
       </fileset>
@@ -1837,9 +1845,8 @@
 	<!-- Copy the generated client libraries -->
     <mkdir dir="${install.client}"/>
     <copy todir="${install.client}" filtering="no">
-      <fileset dir="${jboss.common.lib}">
-        <include name="jboss-common.jar"/>
-        <include name="namespace.jar"/>
+      <fileset dir="${jboss.common.core.lib}">
+        <include name="jboss-common-core*.jar"/>
       </fileset>
       <fileset dir="${jboss.jbossxb.lib}">
         <include name="jboss-xml-binding.jar"/>

Modified: branches/MC_VDF_WORK/build/build-thirdparty.xml
===================================================================
--- branches/MC_VDF_WORK/build/build-thirdparty.xml	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/build/build-thirdparty.xml	2006-09-18 06:04:17 UTC (rev 56931)
@@ -91,7 +91,10 @@
       <componentref name="jaxen" version="1.1beta4"/>
       <componentref name="jboss/backport-concurrent" version="2.1.0.GA"/>
       <componentref name="jboss/cache" version="snapshot"/>
-      <componentref name="jboss/common" version="1.0.1"/>
+      <componentref name="jboss/common-core" version="2.0.0"/>
+      <componentref name="jboss/common-logging-log4j" version="2.0.0"/>
+      <componentref name="jboss/common-logging-jdk" version="2.0.0"/>
+      <componentref name="jboss/common-logging-spi" version="2.0.0"/>
       <componentref name="jboss/jbossxb" version="1.0.0.CR5"/>
       <componentref name="jboss/jbossretro" version="snapshot"/>
       <componentref name="jboss/jbossws14" version="1.0.1.GA"/>

Modified: branches/MC_VDF_WORK/cluster/.classpath
===================================================================
--- branches/MC_VDF_WORK/cluster/.classpath	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/cluster/.classpath	2006-09-18 06:04:17 UTC (rev 56931)
@@ -3,7 +3,9 @@
 	<classpathentry excluding="org/jbossmx/" kind="src" path="src/main"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="src" path="/system"/>
-	<classpathentry kind="lib" path="/thirdparty/jboss/common/lib/jboss-common.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core-2.0.0.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi-2.0.0.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j-2.0.0.jar"/>
 	<classpathentry kind="src" path="/server"/>
 	<classpathentry kind="src" path="/j2ee"/>
 	<classpathentry kind="src" path="/transaction"/>

Modified: branches/MC_VDF_WORK/cluster/build.xml
===================================================================
--- branches/MC_VDF_WORK/cluster/build.xml	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/cluster/build.xml	2006-09-18 06:04:17 UTC (rev 56931)
@@ -90,7 +90,10 @@
     <!-- The combined dependent module classpath -->
     <path id="dependentmodule.classpath">
       <path refid="jboss.j2ee.classpath"/>
-      <path refid="jboss.common.classpath"/>
+      <path refid="jboss.common.core.classpath"/>
+      <path refid="jboss.common.logging.spi.classpath"/>
+      <path refid="jboss.common.logging.log4j.classpath"/>
+      <path refid="jboss.common.logging.jdk.classpath"/>
       <path refid="jboss.system.classpath"/>
       <path refid="jboss.systemjmx.classpath"/>
       <path refid="jboss.naming.classpath"/>

Modified: branches/MC_VDF_WORK/connector/.classpath
===================================================================
--- branches/MC_VDF_WORK/connector/.classpath	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/connector/.classpath	2006-09-18 06:04:17 UTC (rev 56931)
@@ -4,7 +4,9 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="src" path="/system"/>
 	<classpathentry kind="src" path="/j2ee"/>
-	<classpathentry kind="lib" path="/thirdparty/jboss/common/lib/jboss-common.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core-2.0.0.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi-2.0.0.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j-2.0.0.jar"/>
 	<classpathentry kind="src" path="/server"/>
 	<classpathentry kind="src" path="/transaction"/>
 	<classpathentry kind="src" path="/security"/>

Modified: branches/MC_VDF_WORK/connector/build.xml
===================================================================
--- branches/MC_VDF_WORK/connector/build.xml	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/connector/build.xml	2006-09-18 06:04:17 UTC (rev 56931)
@@ -90,7 +90,10 @@
 
     <!-- The combined depedant module classpath -->
     <path id="dependentmodule.classpath">
-      <path refid="jboss.common.classpath"/>
+      <path refid="jboss.common.core.classpath"/>
+      <path refid="jboss.common.logging.spi.classpath"/>
+      <path refid="jboss.common.logging.log4j.classpath"/>
+      <path refid="jboss.common.logging.jdk.classpath"/>
       <path refid="jboss.j2ee.classpath"/>
       <path refid="jboss.security.classpath"/>
       <path refid="jboss.server.classpath"/>

Modified: branches/MC_VDF_WORK/console/.classpath
===================================================================
--- branches/MC_VDF_WORK/console/.classpath	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/console/.classpath	2006-09-18 06:04:17 UTC (rev 56931)
@@ -3,7 +3,9 @@
 	<classpathentry kind="src" path="src/main"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="src" path="/system"/>
-	<classpathentry kind="lib" path="/thirdparty/jboss/common/lib/jboss-common.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core-2.0.0.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi-2.0.0.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j-2.0.0.jar"/>
 	<classpathentry kind="src" path="/management"/>
 	<classpathentry kind="lib" path="/thirdparty/gnu-getopt/lib/getopt.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/beanshell/lib/bsh-1.3.0.jar"/>

Modified: branches/MC_VDF_WORK/console/build.xml
===================================================================
--- branches/MC_VDF_WORK/console/build.xml	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/console/build.xml	2006-09-18 06:04:17 UTC (rev 56931)
@@ -89,7 +89,10 @@
     &modules;
     <!-- The combined dependent module classpath -->
     <path id="dependentmodule.classpath">
-      <path refid="jboss.common.classpath"/>
+      <path refid="jboss.common.core.classpath"/>
+      <path refid="jboss.common.logging.spi.classpath"/>
+      <path refid="jboss.common.logging.log4j.classpath"/>
+      <path refid="jboss.common.logging.jdk.classpath"/>
       <path refid="jboss.j2se.classpath"/>
       <path refid="jboss.management.classpath"/>
       <path refid="jboss.security.classpath"/>
@@ -327,7 +330,7 @@
         <include name="org/jboss/invocation/*"/>
         <exclude name="META-INF/INDEX.LIST"/>
       </zipfileset>
-      <zipfileset src="${jboss.common.lib}/jboss-common-client.jar">
+      <zipfileset src="${jboss.common.core.lib}/jboss-common-core-2.0.0.jar">
         <exclude name="META-INF/INDEX.LIST"/>
         <exclude name="org/jboss/util/property/**"/>
         <exclude name="org/jboss/util/propertyeditor/**"/>

Modified: branches/MC_VDF_WORK/deployment/.classpath
===================================================================
--- branches/MC_VDF_WORK/deployment/.classpath	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/deployment/.classpath	2006-09-18 06:04:17 UTC (rev 56931)
@@ -2,7 +2,9 @@
 <classpath>
 	<classpathentry kind="src" path="src/main"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="/thirdparty/jboss/common/lib/jboss-common.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core-2.0.0.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi-2.0.0.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j-2.0.0.jar"/>
 	<classpathentry kind="src" path="/j2ee"/>
 	<classpathentry kind="src" path="/system"/>
 	<classpathentry kind="lib" path="/thirdparty/dom4j/lib/dom4j.jar"/>

Modified: branches/MC_VDF_WORK/deployment/build.xml
===================================================================
--- branches/MC_VDF_WORK/deployment/build.xml	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/deployment/build.xml	2006-09-18 06:04:17 UTC (rev 56931)
@@ -80,7 +80,10 @@
 
     <!-- The combined dependant module classpath -->
     <path id="dependentmodule.classpath">
-      <path refid="jboss.common.classpath"/>
+      <path refid="jboss.common.core.classpath"/>
+      <path refid="jboss.common.logging.spi.classpath"/>
+      <path refid="jboss.common.logging.log4j.classpath"/>
+      <path refid="jboss.common.logging.jdk.classpath"/>
       <path refid="jboss.j2ee.classpath"/>
       <path refid="jboss.j2se.classpath"/>
       <path refid="jboss.system.classpath"/>

Modified: branches/MC_VDF_WORK/ejb3/.classpath
===================================================================
--- branches/MC_VDF_WORK/ejb3/.classpath	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/ejb3/.classpath	2006-09-18 06:04:17 UTC (rev 56931)
@@ -49,7 +49,9 @@
 	<classpathentry kind="src" path="/j2ee"/>
 	<classpathentry kind="src" path="/aop"/>
 	<classpathentry kind="lib" path="/thirdparty/trove/lib/trove.jar"/>
-	<classpathentry kind="lib" path="/thirdparty/jboss/common/lib/jboss-common.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core-2.0.0.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi-2.0.0.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j-2.0.0.jar"/>
 	<classpathentry kind="src" path="/security"/>
 	<classpathentry kind="src" path="/system"/>
 	<classpathentry kind="src" path="/j2se"/>
@@ -80,8 +82,8 @@
 	<classpathentry kind="lib" path="/thirdparty/sun-javamail/lib/mail.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/serialization/lib/jboss-serialization.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-container.jar"/>
-	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-dependency.jar"/>
-	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-microcontainer.jar"/>
+	<classpathentry sourcepath="/home/svn/JBossMC/jbossmc/dependency/src/main" kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-dependency.jar"/>
+	<classpathentry sourcepath="/home/svn/JBossMC/jbossmc/kernel/src/main" kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-microcontainer.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/quartz/lib/quartz-all-1.5.2.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/jbossws/lib/jbossws-client.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/cglib/lib/cglib.jar"/>

Modified: branches/MC_VDF_WORK/ejb3/build-test.xml
===================================================================
--- branches/MC_VDF_WORK/ejb3/build-test.xml	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/ejb3/build-test.xml	2006-09-18 06:04:17 UTC (rev 56931)
@@ -168,7 +168,10 @@
       <path refid="jboss.aop.classpath"/>
       <path refid="jboss.aspects.classpath"/>
       <path refid="jboss.ejb3x.classpath"/>
-      <path refid="jboss.common.classpath"/>
+      <path refid="jboss.common.core.classpath"/>
+      <path refid="jboss.common.logging.spi.classpath"/>
+      <path refid="jboss.common.logging.log4j.classpath"/>
+      <path refid="jboss.common.logging.jdk.classpath"/>
       <path refid="jboss.cache.classpath"/>
       <path refid="jboss.cluster.classpath"/>
       <path refid="jboss.system.classpath"/>
@@ -2605,7 +2608,10 @@
             <path refid="jboss.server.classpath"/>
             <path refid="jboss.naming.classpath"/>
             <path refid="trove.classpath"/>
-            <path refid="jboss.common.classpath"/>
+      <path refid="jboss.common.core.classpath"/>
+      <path refid="jboss.common.logging.spi.classpath"/>
+      <path refid="jboss.common.logging.log4j.classpath"/>
+      <path refid="jboss.common.logging.jdk.classpath"/>
             <path refid="jboss.aop50.classpath"/>
             <path refid="jboss.aspects.classpath"/>
             <path refid="jboss.jbossxb.classpath"/>

Modified: branches/MC_VDF_WORK/ejb3/build.xml
===================================================================
--- branches/MC_VDF_WORK/ejb3/build.xml	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/ejb3/build.xml	2006-09-18 06:04:17 UTC (rev 56931)
@@ -117,7 +117,10 @@
          <path refid="jboss.cache.classpath"/>
          <path refid="jboss.aspects.classpath"/>
          <path refid="jboss.ejb3x.classpath"/>
-         <path refid="jboss.common.classpath"/>
+      <path refid="jboss.common.core.classpath"/>
+      <path refid="jboss.common.logging.spi.classpath"/>
+      <path refid="jboss.common.logging.log4j.classpath"/>
+      <path refid="jboss.common.logging.jdk.classpath"/>
          <path refid="jboss.cluster.classpath"/>
          <path refid="jboss.system.classpath"/>
          <path refid="jboss.systemjmx.classpath"/>
@@ -452,7 +455,7 @@
          <zipfileset src="${jboss.transaction.lib}/jboss-transaction.jar" />
          <zipfileset src="${jboss.naming.lib}/jnpserver.jar" />
          <zipfileset src="${jboss.j2ee.lib}/jboss-j2ee.jar" />
-         <zipfileset src="${jboss.common.lib}/jboss-common.jar" />
+         <zipfileset src="${jboss.common.core.lib}/jboss-common-core-2.0.0.jar" />
          <zipfileset src="${jboss.jbossxb.lib}/jboss-xml-binding.jar" />
          <zipfileset src="${jboss.security.lib}/jbosssx.jar" />
          <zipfileset src="${jboss.microcontainer.lib}/jboss-microcontainer.jar" />
@@ -548,7 +551,6 @@
           </fileset>
         </javadoc>
       <property name="ejb3.version" value="jboss-EJB-3.0_RC2"/>
-      <echo message="${jboss.common.lib}"/>
       <zip zipfile="${ejb3.version}.zip">
          <zipfileset dir="." prefix="${ejb3.version}">
             <include name="INSTALL.html"/>
@@ -596,7 +598,6 @@
           </fileset>
         </javadoc>
       <property name="ejb3.zip.version" value="jboss-EJB-3.0_Embeddable_ALPHA_8-patch2"/>
-      <echo message="${jboss.common.lib}"/>
       <zip zipfile="${ejb3.zip.version}.zip">
          <zipfileset dir="." prefix="${ejb3.zip.version}">
             <include name="RELEASE_NOTES.txt"/>

Modified: branches/MC_VDF_WORK/ejb3x/.classpath
===================================================================
--- branches/MC_VDF_WORK/ejb3x/.classpath	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/ejb3x/.classpath	2006-09-18 06:04:17 UTC (rev 56931)
@@ -4,7 +4,9 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="/thirdparty/sun-servlet/lib/servlet-api.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/sun-jaf/lib/activation.jar"/>
-	<classpathentry kind="lib" path="/thirdparty/jboss/common/lib/jboss-common.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core-2.0.0.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi-2.0.0.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j-2.0.0.jar"/>
 	<classpathentry kind="src" path="/j2ee"/>
 	<classpathentry kind="output" path="output/eclipse-classes"/>
 </classpath>

Modified: branches/MC_VDF_WORK/ejb3x/build.xml
===================================================================
--- branches/MC_VDF_WORK/ejb3x/build.xml	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/ejb3x/build.xml	2006-09-18 06:04:17 UTC (rev 56931)
@@ -85,7 +85,10 @@
 
     <!-- The combined dependent module classpath -->
     <path id="dependentmodule.classpath">
-       <path refid="jboss.common.classpath"/>
+      <path refid="jboss.common.core.classpath"/>
+      <path refid="jboss.common.logging.spi.classpath"/>
+      <path refid="jboss.common.logging.log4j.classpath"/>
+      <path refid="jboss.common.logging.jdk.classpath"/>
        <!-- this is for org.jboss.lang.Enum -->
        <path refid="jboss.aop.classpath"/>
        <path refid="jboss.j2ee.classpath"/>

Modified: branches/MC_VDF_WORK/hibernate-int/.classpath
===================================================================
--- branches/MC_VDF_WORK/hibernate-int/.classpath	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/hibernate-int/.classpath	2006-09-18 06:04:17 UTC (rev 56931)
@@ -2,7 +2,9 @@
 <classpath>
 	<classpathentry kind="src" path="src/main"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="/thirdparty/jboss/common/lib/jboss-common.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core-2.0.0.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi-2.0.0.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j-2.0.0.jar"/>
 	<classpathentry kind="src" path="/j2ee"/>
 	<classpathentry kind="src" path="/system"/>
 	<classpathentry kind="src" path="/server"/>

Modified: branches/MC_VDF_WORK/hibernate-int/build.xml
===================================================================
--- branches/MC_VDF_WORK/hibernate-int/build.xml	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/hibernate-int/build.xml	2006-09-18 06:04:17 UTC (rev 56931)
@@ -87,7 +87,10 @@
     <!-- Specify modules upon which this build depends -->
     <path id="dependentmodule.classpath">
       <path refid="jboss.cache.classpath"/>
-      <path refid="jboss.common.classpath"/>
+      <path refid="jboss.common.core.classpath"/>
+      <path refid="jboss.common.logging.spi.classpath"/>
+      <path refid="jboss.common.logging.log4j.classpath"/>
+      <path refid="jboss.common.logging.jdk.classpath"/>
       <path refid="jboss.j2se.classpath"/>
       <path refid="jboss.j2ee.classpath"/>
       <path refid="jboss.server.classpath"/>

Modified: branches/MC_VDF_WORK/iiop/.classpath
===================================================================
--- branches/MC_VDF_WORK/iiop/.classpath	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/iiop/.classpath	2006-09-18 06:04:17 UTC (rev 56931)
@@ -7,7 +7,9 @@
 	<classpathentry kind="lib" path="/thirdparty/apache-avalon/lib/avalon-framework.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/apache-log4j/lib/log4j.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/oswego-concurrent/lib/concurrent.jar"/>
-	<classpathentry kind="lib" path="/thirdparty/jboss/common/lib/jboss-common.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core-2.0.0.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi-2.0.0.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j-2.0.0.jar"/>
 	<classpathentry kind="src" path="/j2ee"/>
 	<classpathentry kind="src" path="/naming"/>
 	<classpathentry kind="src" path="/security"/>

Modified: branches/MC_VDF_WORK/iiop/build.xml
===================================================================
--- branches/MC_VDF_WORK/iiop/build.xml	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/iiop/build.xml	2006-09-18 06:04:17 UTC (rev 56931)
@@ -90,7 +90,10 @@
     <!-- The combined dependent module classpath -->
     <path id="dependentmodule.classpath">
       <path refid="jboss.j2ee.classpath"/>
-      <path refid="jboss.common.classpath"/>
+      <path refid="jboss.common.core.classpath"/>
+      <path refid="jboss.common.logging.spi.classpath"/>
+      <path refid="jboss.common.logging.log4j.classpath"/>
+      <path refid="jboss.common.logging.jdk.classpath"/>
       <path refid="jboss.system.classpath"/>
       <path refid="jboss.systemjmx.classpath"/>
       <path refid="jboss.naming.classpath"/>

Modified: branches/MC_VDF_WORK/j2ee/.classpath
===================================================================
--- branches/MC_VDF_WORK/j2ee/.classpath	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/j2ee/.classpath	2006-09-18 06:04:17 UTC (rev 56931)
@@ -4,6 +4,8 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="/thirdparty/sun-servlet/lib/servlet-api.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/sun-jaf/lib/activation.jar"/>
-	<classpathentry kind="lib" path="/thirdparty/jboss/common/lib/jboss-common.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core-2.0.0.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi-2.0.0.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j-2.0.0.jar"/>
 	<classpathentry kind="output" path="output/eclipse-classes"/>
 </classpath>

Modified: branches/MC_VDF_WORK/j2ee/build.xml
===================================================================
--- branches/MC_VDF_WORK/j2ee/build.xml	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/j2ee/build.xml	2006-09-18 06:04:17 UTC (rev 56931)
@@ -87,7 +87,10 @@
 
     <!-- The combined dependent module classpath -->
     <path id="dependentmodule.classpath">
-      <path refid="jboss.common.classpath"/>
+      <path refid="jboss.common.core.classpath"/>
+      <path refid="jboss.common.logging.spi.classpath"/>
+      <path refid="jboss.common.logging.log4j.classpath"/>
+      <path refid="jboss.common.logging.jdk.classpath"/>
     </path>
 
     <!-- ===== -->

Modified: branches/MC_VDF_WORK/j2se/.classpath
===================================================================
--- branches/MC_VDF_WORK/j2se/.classpath	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/j2se/.classpath	2006-09-18 06:04:17 UTC (rev 56931)
@@ -3,7 +3,9 @@
 	<classpathentry kind="src" path="src/main"/>
 	<classpathentry kind="src" path="src/tests"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="/thirdparty/jboss/common/lib/jboss-common.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core-2.0.0.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi-2.0.0.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j-2.0.0.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/oswego-concurrent/lib/concurrent.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/dom4j/lib/dom4j.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/junit/lib/junit.jar"/>

Modified: branches/MC_VDF_WORK/j2se/build.xml
===================================================================
--- branches/MC_VDF_WORK/j2se/build.xml	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/j2se/build.xml	2006-09-18 06:04:17 UTC (rev 56931)
@@ -78,7 +78,10 @@
 
     <!-- The combined dependent module classpath -->
     <path id="dependentmodule.classpath">
-        <path refid="jboss.common.classpath"/>
+      <path refid="jboss.common.core.classpath"/>
+      <path refid="jboss.common.logging.spi.classpath"/>
+      <path refid="jboss.common.logging.log4j.classpath"/>
+      <path refid="jboss.common.logging.jdk.classpath"/>
     	<path refid="jboss.microcontainer.classpath"/>
     </path>
 

Modified: branches/MC_VDF_WORK/jbossas/.classpath
===================================================================
--- branches/MC_VDF_WORK/jbossas/.classpath	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/jbossas/.classpath	2006-09-18 06:04:17 UTC (rev 56931)
@@ -28,10 +28,9 @@
 		<attributes>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="lib" path="/thirdparty/jboss/common/lib/jboss-common.jar">
-		<attributes>
-		</attributes>
-	</classpathentry>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core-2.0.0.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi-2.0.0.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j-2.0.0.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/junit/lib/junit.jar">
 		<attributes>
 		</attributes>

Modified: branches/MC_VDF_WORK/jbossas/jmx-remoting/build.xml
===================================================================
--- branches/MC_VDF_WORK/jbossas/jmx-remoting/build.xml	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/jbossas/jmx-remoting/build.xml	2006-09-18 06:04:17 UTC (rev 56931)
@@ -81,7 +81,10 @@
       &modules;
 
       <path id="dependentmodule.classpath">
-         <path refid="jboss.common.classpath"/>
+      <path refid="jboss.common.core.classpath"/>
+      <path refid="jboss.common.logging.spi.classpath"/>
+      <path refid="jboss.common.logging.log4j.classpath"/>
+      <path refid="jboss.common.logging.jdk.classpath"/>
          <path refid="jboss.j2se.classpath"/>
          <path refid="jboss.jmx-remoting.classpath"/>
       </path>

Modified: branches/MC_VDF_WORK/jbossas/remoting/build.xml
===================================================================
--- branches/MC_VDF_WORK/jbossas/remoting/build.xml	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/jbossas/remoting/build.xml	2006-09-18 06:04:17 UTC (rev 56931)
@@ -88,7 +88,10 @@
       &modules;
 
       <path id="dependentmodule.classpath">
-         <path refid="jboss.common.classpath"/>
+      <path refid="jboss.common.core.classpath"/>
+      <path refid="jboss.common.logging.spi.classpath"/>
+      <path refid="jboss.common.logging.log4j.classpath"/>
+      <path refid="jboss.common.logging.jdk.classpath"/>
          <path refid="jboss.j2se.classpath"/>
          <path refid="jboss.aop.classpath"/>
          <path refid="jboss.security.classpath"/>

Modified: branches/MC_VDF_WORK/jmx/.classpath
===================================================================
--- branches/MC_VDF_WORK/jmx/.classpath	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/jmx/.classpath	2006-09-18 06:04:17 UTC (rev 56931)
@@ -2,7 +2,9 @@
 <classpath>
 	<classpathentry kind="src" path="src/main"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="/thirdparty/jboss/common/lib/jboss-common.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core-2.0.0.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi-2.0.0.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j-2.0.0.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/apache-bcel/lib/bcel.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/oswego-concurrent/lib/concurrent.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/junit/lib/junit.jar"/>

Modified: branches/MC_VDF_WORK/jmx/build.xml
===================================================================
--- branches/MC_VDF_WORK/jmx/build.xml	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/jmx/build.xml	2006-09-18 06:04:17 UTC (rev 56931)
@@ -73,7 +73,10 @@
       <!-- Configure modules -->
       <path id="dependentmodule.classpath">
          <!-- Add dependent module classpath elements here. -->
-        <path refid="jboss.common.classpath"/>
+      <path refid="jboss.common.core.classpath"/>
+      <path refid="jboss.common.logging.spi.classpath"/>
+      <path refid="jboss.common.logging.log4j.classpath"/>
+      <path refid="jboss.common.logging.jdk.classpath"/>
         <path refid="jboss.j2se.classpath"/>
         <path refid="jboss.mbeans.classpath"/>
         <path refid="jboss.jmxcompliance.classpath"/>

Modified: branches/MC_VDF_WORK/jmx/src/main/org/jboss/mx/loading/ResourceInfo.java
===================================================================
--- branches/MC_VDF_WORK/jmx/src/main/org/jboss/mx/loading/ResourceInfo.java	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/jmx/src/main/org/jboss/mx/loading/ResourceInfo.java	2006-09-18 06:04:17 UTC (rev 56931)
@@ -26,7 +26,7 @@
 /**
  *
  * @author Scott.Stark at jboss.org
- * @version $Revision:$
+ * @version $Revision$
  */
 class ResourceInfo<T>
 {

Modified: branches/MC_VDF_WORK/jmx-remoting/.classpath
===================================================================
--- branches/MC_VDF_WORK/jmx-remoting/.classpath	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/jmx-remoting/.classpath	2006-09-18 06:04:17 UTC (rev 56931)
@@ -12,10 +12,9 @@
 		<attributes>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="lib" path="/thirdparty/jboss/common/lib/jboss-common.jar">
-		<attributes>
-		</attributes>
-	</classpathentry>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core-2.0.0.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi-2.0.0.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j-2.0.0.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/apache-log4j/lib/log4j.jar">
 		<attributes>
 		</attributes>

Modified: branches/MC_VDF_WORK/jmx-remoting/build.xml
===================================================================
--- branches/MC_VDF_WORK/jmx-remoting/build.xml	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/jmx-remoting/build.xml	2006-09-18 06:04:17 UTC (rev 56931)
@@ -79,7 +79,10 @@
       &modules;
       <!-- The combined dependent module classpath -->
       <path id="dependentmodule.classpath">
-         <path refid="jboss.common.classpath"/>
+      <path refid="jboss.common.core.classpath"/>
+      <path refid="jboss.common.logging.spi.classpath"/>
+      <path refid="jboss.common.logging.log4j.classpath"/>
+      <path refid="jboss.common.logging.jdk.classpath"/>
          <path refid="jboss.j2se.classpath"/>
       </path>
 

Modified: branches/MC_VDF_WORK/management/.classpath
===================================================================
--- branches/MC_VDF_WORK/management/.classpath	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/management/.classpath	2006-09-18 06:04:17 UTC (rev 56931)
@@ -4,7 +4,9 @@
 	<classpathentry kind="src" path="output/classes"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="src" path="/system"/>
-	<classpathentry kind="lib" path="/thirdparty/jboss/common/lib/jboss-common.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core-2.0.0.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi-2.0.0.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j-2.0.0.jar"/>
 	<classpathentry kind="src" path="/j2ee"/>
 	<classpathentry kind="src" path="/server"/>
 	<classpathentry kind="src" path="/cluster"/>

Modified: branches/MC_VDF_WORK/management/build.xml
===================================================================
--- branches/MC_VDF_WORK/management/build.xml	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/management/build.xml	2006-09-18 06:04:17 UTC (rev 56931)
@@ -97,7 +97,10 @@
     <!-- The combined dependent module classpath -->
     <path id="dependentmodule.classpath">
       <path refid="jboss.cluster.classpath"/>
-      <path refid="jboss.common.classpath"/>
+      <path refid="jboss.common.core.classpath"/>
+      <path refid="jboss.common.logging.spi.classpath"/>
+      <path refid="jboss.common.logging.log4j.classpath"/>
+      <path refid="jboss.common.logging.jdk.classpath"/>
       <path refid="jboss.jca.classpath"/>
       <path refid="jboss.server.classpath"/>
       <path refid="jboss.system.classpath"/>

Modified: branches/MC_VDF_WORK/mbeans/.classpath
===================================================================
--- branches/MC_VDF_WORK/mbeans/.classpath	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/mbeans/.classpath	2006-09-18 06:04:17 UTC (rev 56931)
@@ -3,7 +3,9 @@
 	<classpathentry kind="src" path="src/main"/>
 	<classpathentry output="output/eclipse-test-classes" kind="src" path="src/tests"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="/thirdparty/jboss/common/lib/jboss-common.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core-2.0.0.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi-2.0.0.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j-2.0.0.jar"/>
 	<classpathentry kind="src" path="/j2se"/>
 	<classpathentry kind="lib" path="/thirdparty/apache-bcel/lib/bcel.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/dom4j/lib/dom4j.jar"/>

Modified: branches/MC_VDF_WORK/mbeans/build.xml
===================================================================
--- branches/MC_VDF_WORK/mbeans/build.xml	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/mbeans/build.xml	2006-09-18 06:04:17 UTC (rev 56931)
@@ -73,7 +73,10 @@
       <!-- Configure modules -->
       <path id="dependentmodule.classpath">
          <!-- Add dependent module classpath elements here. -->
-        <path refid="jboss.common.classpath"/>
+      <path refid="jboss.common.core.classpath"/>
+      <path refid="jboss.common.logging.spi.classpath"/>
+      <path refid="jboss.common.logging.log4j.classpath"/>
+      <path refid="jboss.common.logging.jdk.classpath"/>
         <path refid="jboss.j2se.classpath"/>
         <path refid="jboss.j2se.classpath"/>
       </path>

Modified: branches/MC_VDF_WORK/messaging/.classpath
===================================================================
--- branches/MC_VDF_WORK/messaging/.classpath	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/messaging/.classpath	2006-09-18 06:04:17 UTC (rev 56931)
@@ -5,7 +5,9 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="src" path="/j2ee"/>
 	<classpathentry kind="src" path="/system"/>
-	<classpathentry kind="lib" path="/thirdparty/jboss/common/lib/jboss-common.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core-2.0.0.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi-2.0.0.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j-2.0.0.jar"/>
 	<classpathentry kind="src" path="/security"/>
 	<classpathentry kind="src" path="/server"/>
 	<classpathentry kind="src" path="/transaction"/>

Modified: branches/MC_VDF_WORK/messaging/build.xml
===================================================================
--- branches/MC_VDF_WORK/messaging/build.xml	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/messaging/build.xml	2006-09-18 06:04:17 UTC (rev 56931)
@@ -78,7 +78,10 @@
     <!-- The combined depedant module classpath -->
     <path id="dependentmodule.classpath">
       <path refid="jboss.j2ee.classpath"/>
-      <path refid="jboss.common.classpath"/>
+      <path refid="jboss.common.core.classpath"/>
+      <path refid="jboss.common.logging.spi.classpath"/>
+      <path refid="jboss.common.logging.log4j.classpath"/>
+      <path refid="jboss.common.logging.jdk.classpath"/>
       <path refid="jboss.system.classpath"/>
       <path refid="jboss.systemjmx.classpath"/>
       <path refid="jboss.naming.classpath"/>

Modified: branches/MC_VDF_WORK/naming/.classpath
===================================================================
--- branches/MC_VDF_WORK/naming/.classpath	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/naming/.classpath	2006-09-18 06:04:17 UTC (rev 56931)
@@ -3,7 +3,9 @@
 	<classpathentry kind="src" path="src/main"/>
 	<classpathentry kind="src" path="output/gen-src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="/thirdparty/jboss/common/lib/jboss-common.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core-2.0.0.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi-2.0.0.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j-2.0.0.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/apache-log4j/lib/log4j.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/junit/lib/junit.jar"/>
 	<classpathentry kind="output" path="output/eclipse-classes"/>

Modified: branches/MC_VDF_WORK/naming/build.xml
===================================================================
--- branches/MC_VDF_WORK/naming/build.xml	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/naming/build.xml	2006-09-18 06:04:17 UTC (rev 56931)
@@ -87,7 +87,10 @@
 
     <!-- The combined dependent module classpath -->
     <path id="dependentmodule.classpath">
-      <path refid="jboss.common.classpath"/>
+      <path refid="jboss.common.core.classpath"/>
+      <path refid="jboss.common.logging.spi.classpath"/>
+      <path refid="jboss.common.logging.log4j.classpath"/>
+      <path refid="jboss.common.logging.jdk.classpath"/>
     </path>
 
     <!-- ===== -->

Modified: branches/MC_VDF_WORK/security/.classpath
===================================================================
--- branches/MC_VDF_WORK/security/.classpath	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/security/.classpath	2006-09-18 06:04:17 UTC (rev 56931)
@@ -3,7 +3,9 @@
 	<classpathentry kind="src" path="src/main"/>
 	<classpathentry kind="src" path="output/gen-parsers"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="/thirdparty/jboss/common/lib/jboss-common.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core-2.0.0.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi-2.0.0.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j-2.0.0.jar"/>
 	<classpathentry kind="src" path="/j2ee"/>
 	<classpathentry kind="src" path="/system"/>
 	<classpathentry kind="src" path="/naming"/>

Modified: branches/MC_VDF_WORK/security/build.xml
===================================================================
--- branches/MC_VDF_WORK/security/build.xml	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/security/build.xml	2006-09-18 06:04:17 UTC (rev 56931)
@@ -87,7 +87,10 @@
     <path id="dependentmodule.classpath">
       <path refid="jboss.j2ee.classpath"/>
       <path refid="jboss.j2ee.ext.classpath"/>
-      <path refid="jboss.common.classpath"/>
+      <path refid="jboss.common.core.classpath"/>
+      <path refid="jboss.common.logging.spi.classpath"/>
+      <path refid="jboss.common.logging.log4j.classpath"/>
+      <path refid="jboss.common.logging.jdk.classpath"/>
       <path refid="jboss.system.classpath"/>
       <path refid="jboss.systemjmx.classpath"/>
       <path refid="jboss.naming.classpath"/>

Modified: branches/MC_VDF_WORK/server/.classpath
===================================================================
--- branches/MC_VDF_WORK/server/.classpath	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/server/.classpath	2006-09-18 06:04:17 UTC (rev 56931)
@@ -4,7 +4,9 @@
 	<classpathentry kind="src" path="output/gen-src"/>
 	<classpathentry kind="src" path="src/main"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="/thirdparty/jboss/common/lib/jboss-common.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core-2.0.0.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi-2.0.0.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j-2.0.0.jar"/>
 	<classpathentry kind="src" path="/system"/>
 	<classpathentry kind="src" path="/j2ee"/>
 	<classpathentry kind="src" path="/naming"/>

Modified: branches/MC_VDF_WORK/server/build.xml
===================================================================
--- branches/MC_VDF_WORK/server/build.xml	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/server/build.xml	2006-09-18 06:04:17 UTC (rev 56931)
@@ -98,7 +98,10 @@
     <path id="dependentmodule.classpath">
       <path refid="jboss.j2ee.classpath"/>
       <path refid="ejb3-persistence.classpath"/>
-      <path refid="jboss.common.classpath"/>
+      <path refid="jboss.common.core.classpath"/>
+      <path refid="jboss.common.logging.spi.classpath"/>
+      <path refid="jboss.common.logging.log4j.classpath"/>
+      <path refid="jboss.common.logging.jdk.classpath"/>
       <path refid="jboss.system.classpath"/>
       <path refid="jboss.systemjmx.classpath"/>
       <path refid="jboss.j2se.classpath"/>

Modified: branches/MC_VDF_WORK/spring-int/.classpath
===================================================================
--- branches/MC_VDF_WORK/spring-int/.classpath	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/spring-int/.classpath	2006-09-18 06:04:17 UTC (rev 56931)
@@ -5,7 +5,9 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/system"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/j2se"/>
-	<classpathentry kind="lib" path="/thirdparty/jboss/common/lib/jboss-common.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core-2.0.0.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi-2.0.0.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j-2.0.0.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/server"/>
 	<classpathentry kind="lib" path="/thirdparty/spring/lib/spring-beans.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/spring/lib/spring-core.jar"/>

Modified: branches/MC_VDF_WORK/system/.classpath
===================================================================
--- branches/MC_VDF_WORK/system/.classpath	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/system/.classpath	2006-09-18 06:04:17 UTC (rev 56931)
@@ -5,7 +5,6 @@
 	<classpathentry output="output/eclipse-test-classes" kind="src" path="src/tests-support"/>
 	<classpathentry kind="lib" path="src/resources/tests"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="/thirdparty/jboss/common/lib/jboss-common.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/gnu-getopt/lib/getopt.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/apache-log4j/lib/log4j.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/oswego-concurrent/lib/concurrent.jar"/>
@@ -16,5 +15,9 @@
 	<classpathentry kind="lib" path="/thirdparty/junit/lib/junit.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/test/lib/jboss-test.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-deployers.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core-2.0.0.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/common-logging-jdk/lib/jboss-logging-jdk-2.0.0.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j-2.0.0.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi-2.0.0.jar"/>
 	<classpathentry kind="output" path="output/eclipse-classes"/>
 </classpath>

Modified: branches/MC_VDF_WORK/system/build-test.xml
===================================================================
--- branches/MC_VDF_WORK/system/build-test.xml	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/system/build-test.xml	2006-09-18 06:04:17 UTC (rev 56931)
@@ -85,7 +85,10 @@
          <path refid="apache.log4j.classpath" />
          <path refid="oswego.concurrent.classpath" />
          <path refid="jboss.jbossxb.classpath" />
-         <path refid="jboss.common.classpath" />
+      <path refid="jboss.common.core.classpath"/>
+      <path refid="jboss.common.logging.spi.classpath"/>
+      <path refid="jboss.common.logging.log4j.classpath"/>
+      <path refid="jboss.common.logging.jdk.classpath"/>
          <path refid="jboss.profiler.jvmti.classpath" />
       </path>
 

Modified: branches/MC_VDF_WORK/system/build.xml
===================================================================
--- branches/MC_VDF_WORK/system/build.xml	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/system/build.xml	2006-09-18 06:04:17 UTC (rev 56931)
@@ -69,13 +69,12 @@
       <path refid="junit.junit.classpath"/>
       <path refid="gnu.getopt.classpath"/>
       <path refid="apache.xerces.classpath"/>
-      <path refid="apache.log4j.classpath"/>
-      <path refid="apache.commons.classpath"/>
       <path refid="oswego.concurrent.classpath"/>
       <path refid="dom4j.dom4j.classpath"/>
       <path refid="jboss.jbossxb.classpath"/>
       <path refid="jboss.microcontainer.classpath"/>
-      <path refid="jboss.common.classpath"/>
+      <path refid="jboss.common.core.classpath"/>
+      <path refid="jboss.common.logging.spi.classpath"/>
     </path>
 
     <!-- The combined dependant module classpath -->

Modified: branches/MC_VDF_WORK/system/src/main/org/jboss/system/server/ServerLoader.java
===================================================================
--- branches/MC_VDF_WORK/system/src/main/org/jboss/system/server/ServerLoader.java	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/system/src/main/org/jboss/system/server/ServerLoader.java	2006-09-18 06:04:17 UTC (rev 56931)
@@ -77,7 +77,7 @@
     * proper libraries.
     */
    public static final String DEFAULT_BOOT_LIBRARY_LIST =
-      "log4j-boot.jar,jboss-common.jar,jboss-system.jar,jboss-xml-binding.jar,jboss-container.jar,jboss-dependency.jar,jboss-microcontainer.jar,jboss-deployers.jar,dom4j.jar,jboss-j2se.jar,jboss-mbeans.jar,jboss-jmx.jar,jboss-system-jmx.jar";
+      "log4j-boot.jar,jboss-common-core-2.0.0.jar,jboss-logging-spi-2.0.0.jar,jboss-logging-log4j-2.0.0.jar,jboss-logging-jdk-2.0.0.jar,jboss-system.jar,jboss-xml-binding.jar,jboss-container.jar,jboss-dependency.jar,jboss-microcontainer.jar,jboss-deployers.jar,dom4j.jar,jboss-j2se.jar,jboss-mbeans.jar,jboss-jmx.jar,jboss-system-jmx.jar";
 
    /** The default server type. */
    public static final String DEFAULT_SERVER_TYPE = "org.jboss.system.server.profileservice.ServerImpl";

Modified: branches/MC_VDF_WORK/system-jmx/.classpath
===================================================================
--- branches/MC_VDF_WORK/system-jmx/.classpath	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/system-jmx/.classpath	2006-09-18 06:04:17 UTC (rev 56931)
@@ -9,7 +9,9 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/mbeans"/>
 	<classpathentry kind="lib" path="/thirdparty/dom4j/lib/dom4j.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/system"/>
-	<classpathentry kind="lib" path="/thirdparty/jboss/common/lib/jboss-common.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core-2.0.0.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi-2.0.0.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j-2.0.0.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-container.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-dependency.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-microcontainer.jar"/>
@@ -23,5 +25,6 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/jmx"/>
 	<classpathentry kind="lib" path="output/test-lib"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-deployers.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/common-logging-jdk/lib/jboss-logging-jdk-2.0.0.jar"/>
 	<classpathentry kind="output" path="output/eclipse-classes"/>
 </classpath>

Modified: branches/MC_VDF_WORK/system-jmx/build-test.xml
===================================================================
--- branches/MC_VDF_WORK/system-jmx/build-test.xml	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/system-jmx/build-test.xml	2006-09-18 06:04:17 UTC (rev 56931)
@@ -78,7 +78,10 @@
          <path refid="apache.log4j.classpath" />
          <path refid="oswego.concurrent.classpath" />
          <path refid="jboss.jbossxb.classpath" />
-         <path refid="jboss.common.classpath" />
+      <path refid="jboss.common.core.classpath"/>
+      <path refid="jboss.common.logging.spi.classpath"/>
+      <path refid="jboss.common.logging.log4j.classpath"/>
+      <path refid="jboss.common.logging.jdk.classpath"/>
          <path refid="jboss.profiler.jvmti.classpath" />
          <path refid="apache.xerces.classpath" />
          <path refid="dom4j.dom4j.classpath" />

Modified: branches/MC_VDF_WORK/system-jmx/build.xml
===================================================================
--- branches/MC_VDF_WORK/system-jmx/build.xml	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/system-jmx/build.xml	2006-09-18 06:04:17 UTC (rev 56931)
@@ -76,7 +76,10 @@
       <path refid="dom4j.dom4j.classpath"/>
       <path refid="jboss.jbossxb.classpath"/>
       <path refid="jboss.microcontainer.classpath"/>
-      <path refid="jboss.common.classpath"/>
+      <path refid="jboss.common.core.classpath"/>
+      <path refid="jboss.common.logging.spi.classpath"/>
+      <path refid="jboss.common.logging.log4j.classpath"/>
+      <path refid="jboss.common.logging.jdk.classpath"/>
     </path>
 
     <!-- ======= -->

Modified: branches/MC_VDF_WORK/testsuite/.classpath
===================================================================
--- branches/MC_VDF_WORK/testsuite/.classpath	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/testsuite/.classpath	2006-09-18 06:04:17 UTC (rev 56931)
@@ -55,7 +55,9 @@
 	<classpathentry kind="lib" path="/thirdparty/sun-xacml/lib/sunxacml.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/sun-xacml/lib/sunxacml-support.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/cache/lib/jboss-cache-jdk50.jar"/>
-	<classpathentry kind="lib" path="/thirdparty/jboss/common/lib/jboss-common.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core-2.0.0.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi-2.0.0.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j-2.0.0.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/jbossxb/lib/jboss-xml-binding.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/joesnmp/lib/joesnmp.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/sun-jsf/lib/jsf-api.jar"/>

Modified: branches/MC_VDF_WORK/testsuite/build.xml
===================================================================
--- branches/MC_VDF_WORK/testsuite/build.xml	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/testsuite/build.xml	2006-09-18 06:04:17 UTC (rev 56931)
@@ -150,7 +150,10 @@
       <path refid="jboss.aspects.classpath"/>
       <path refid="jboss.cache.classpath"/>
       <path refid="jboss.cluster.classpath"/>
-      <path refid="jboss.common.classpath"/>
+      <path refid="jboss.common.core.classpath"/>
+      <path refid="jboss.common.logging.spi.classpath"/>
+      <path refid="jboss.common.logging.log4j.classpath"/>
+      <path refid="jboss.common.logging.jdk.classpath"/>
       <path refid="jboss.deployment.classpath"/>
       <path refid="jboss.ejb3x.classpath"/>
       <path refid="jboss.hibernate.classpath"/>
@@ -2385,7 +2388,10 @@
          <path refid="javassist.classpath"/>
          <path refid="trove.classpath"/>
          <path refid="jboss.aop.classpath"/>
-         <path refid="jboss.common.classpath"/>
+      <path refid="jboss.common.core.classpath"/>
+      <path refid="jboss.common.logging.spi.classpath"/>
+      <path refid="jboss.common.logging.log4j.classpath"/>
+      <path refid="jboss.common.logging.jdk.classpath"/>
       </path>
 
       <aopc compilerclasspathref="aop.task.classpath">

Modified: branches/MC_VDF_WORK/testsuite/imports/sections/aop.xml
===================================================================
--- branches/MC_VDF_WORK/testsuite/imports/sections/aop.xml	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/testsuite/imports/sections/aop.xml	2006-09-18 06:04:17 UTC (rev 56931)
@@ -9,7 +9,10 @@
          <path refid="qdox.classpath"/>
          <path refid="trove.classpath"/>
          <path refid="jboss.aop.classpath"/>
-         <path refid="jboss.common.classpath"/>
+      <path refid="jboss.common.core.classpath"/>
+      <path refid="jboss.common.logging.spi.classpath"/>
+      <path refid="jboss.common.logging.log4j.classpath"/>
+      <path refid="jboss.common.logging.jdk.classpath"/>
       </path>
       <taskdef name="annotationc" classname="org.jboss.aop.ant.AnnotationC"
          classpathref="jboss.aop.classpath"/>

Modified: branches/MC_VDF_WORK/testsuite/imports/sections/cache.xml
===================================================================
--- branches/MC_VDF_WORK/testsuite/imports/sections/cache.xml	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/testsuite/imports/sections/cache.xml	2006-09-18 06:04:17 UTC (rev 56931)
@@ -16,7 +16,10 @@
          <path refid="javassist.classpath"/>
          <path refid="trove.classpath"/>
          <path refid="jboss.aop.classpath"/>
-         <path refid="jboss.common.classpath"/>
+      <path refid="jboss.common.core.classpath"/>
+      <path refid="jboss.common.logging.spi.classpath"/>
+      <path refid="jboss.common.logging.log4j.classpath"/>
+      <path refid="jboss.common.logging.jdk.classpath"/>
       </path>
       
       <aopc compilerclasspathref="aop.task.classpath">

Modified: branches/MC_VDF_WORK/testsuite/imports/sections/cluster.xml
===================================================================
--- branches/MC_VDF_WORK/testsuite/imports/sections/cluster.xml	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/testsuite/imports/sections/cluster.xml	2006-09-18 06:04:17 UTC (rev 56931)
@@ -159,7 +159,10 @@
          <path refid="qdox.classpath"/>
          <path refid="trove.classpath"/>
          <path refid="jboss.aop.classpath"/>
-         <path refid="jboss.common.classpath"/>
+      <path refid="jboss.common.core.classpath"/>
+      <path refid="jboss.common.logging.spi.classpath"/>
+      <path refid="jboss.common.logging.log4j.classpath"/>
+      <path refid="jboss.common.logging.jdk.classpath"/>
          <path refid="jboss.cache.classpath"/>
       </path>
       <taskdef name="annotationc" classname="org.jboss.aop.ant.AnnotationC"

Modified: branches/MC_VDF_WORK/tomcat/.classpath
===================================================================
--- branches/MC_VDF_WORK/tomcat/.classpath	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/tomcat/.classpath	2006-09-18 06:04:17 UTC (rev 56931)
@@ -2,7 +2,9 @@
 <classpath>
 	<classpathentry kind="src" path="src/main"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="/thirdparty/jboss/common/lib/jboss-common.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core-2.0.0.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi-2.0.0.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j-2.0.0.jar"/>
 	<classpathentry kind="src" path="/server"/>
 	<classpathentry kind="src" path="/system"/>
 	<classpathentry kind="src" path="/security"/>

Modified: branches/MC_VDF_WORK/tomcat/build.xml
===================================================================
--- branches/MC_VDF_WORK/tomcat/build.xml	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/tomcat/build.xml	2006-09-18 06:04:17 UTC (rev 56931)
@@ -76,7 +76,10 @@
       <path refid="jboss.systemjmx.classpath"/>
       <path refid="jboss.security.classpath"/>
       <path refid="jboss.server.classpath"/>
-      <path refid="jboss.common.classpath"/>
+      <path refid="jboss.common.core.classpath"/>
+      <path refid="jboss.common.logging.spi.classpath"/>
+      <path refid="jboss.common.logging.log4j.classpath"/>
+      <path refid="jboss.common.logging.jdk.classpath"/>
       <path refid="jboss.j2se.classpath"/>
       <path refid="jboss.cluster.classpath"/>
       <path refid="jboss.cache.classpath"/>

Modified: branches/MC_VDF_WORK/tools/etc/buildmagic/modules.ent
===================================================================
--- branches/MC_VDF_WORK/tools/etc/buildmagic/modules.ent	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/tools/etc/buildmagic/modules.ent	2006-09-18 06:04:17 UTC (rev 56931)
@@ -1,5 +1,13 @@
 <!-- $Id$ -->
 
+<!-- -->
+<path id="jboss.common.classpath">
+   <path refid="jboss.common.core.classpath" />
+   <path refid="jboss.common.logging.jdk.classpath" />
+   <path refid="jboss.common.logging.log4j.classpath" />
+   <path refid="jboss.common.logging.spi.classpath" />
+</path>
+
 <!-- container -->
 <property name="jboss.container.root" value="${project.root}/container"/>
 <property name="jboss.container.lib" value="${jboss.container.root}/output/lib"/>

Modified: branches/MC_VDF_WORK/tools/lib/jbossbuild.jar
===================================================================
(Binary files differ)

Modified: branches/MC_VDF_WORK/transaction/.classpath
===================================================================
--- branches/MC_VDF_WORK/transaction/.classpath	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/transaction/.classpath	2006-09-18 06:04:17 UTC (rev 56931)
@@ -3,7 +3,9 @@
 	<classpathentry excluding="org/jboss/tm/recovery/test/**" kind="src" path="src/main"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="src" path="/system"/>
-	<classpathentry kind="lib" path="/thirdparty/jboss/common/lib/jboss-common.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core-2.0.0.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi-2.0.0.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j-2.0.0.jar"/>
 	<classpathentry kind="src" path="/j2ee"/>
 	<classpathentry kind="lib" path="/thirdparty/oswego-concurrent/lib/concurrent.jar"/>
 	<classpathentry kind="src" path="/j2se"/>

Modified: branches/MC_VDF_WORK/transaction/build.xml
===================================================================
--- branches/MC_VDF_WORK/transaction/build.xml	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/transaction/build.xml	2006-09-18 06:04:17 UTC (rev 56931)
@@ -89,7 +89,10 @@
     <!-- The combined dependent module classpath -->
     <path id="dependentmodule.classpath">
       <path refid="jboss.j2ee.classpath"/>
-      <path refid="jboss.common.classpath"/>
+      <path refid="jboss.common.core.classpath"/>
+      <path refid="jboss.common.logging.spi.classpath"/>
+      <path refid="jboss.common.logging.log4j.classpath"/>
+      <path refid="jboss.common.logging.jdk.classpath"/>
       <path refid="jboss.systemjmx.classpath"/>
       <path refid="jboss.system.classpath"/>
       <path refid="jboss.j2se.classpath"/>

Modified: branches/MC_VDF_WORK/varia/.classpath
===================================================================
--- branches/MC_VDF_WORK/varia/.classpath	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/varia/.classpath	2006-09-18 06:04:17 UTC (rev 56931)
@@ -3,7 +3,9 @@
 	<classpathentry excluding="org/jboss/jaxr/|org/jboss/jdo/castor/|org/jboss/tm/plugins/tyrex/" kind="src" path="src/main"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="src" path="/system"/>
-	<classpathentry kind="lib" path="/thirdparty/jboss/common/lib/jboss-common.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core-2.0.0.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi-2.0.0.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j-2.0.0.jar"/>
 	<classpathentry kind="src" path="/cluster"/>
 	<classpathentry kind="src" path="/j2ee"/>
 	<classpathentry kind="src" path="/server"/>

Modified: branches/MC_VDF_WORK/varia/build.xml
===================================================================
--- branches/MC_VDF_WORK/varia/build.xml	2006-09-18 04:13:58 UTC (rev 56930)
+++ branches/MC_VDF_WORK/varia/build.xml	2006-09-18 06:04:17 UTC (rev 56931)
@@ -103,7 +103,10 @@
     <!-- The combined dependent module classpath -->
     <path id="dependentmodule.classpath">
       <path refid="jboss.j2ee.classpath"/>
-      <path refid="jboss.common.classpath"/>
+      <path refid="jboss.common.core.classpath"/>
+      <path refid="jboss.common.logging.spi.classpath"/>
+      <path refid="jboss.common.logging.log4j.classpath"/>
+      <path refid="jboss.common.logging.jdk.classpath"/>
       <path refid="jboss.jmx.classpath"/>
       <path refid="jboss.cluster.classpath"/>
       <path refid="jboss.system.classpath"/>




More information about the jboss-cvs-commits mailing list