[jboss-svn-commits] JBoss Common SVN: r1952 - in branches/logging_refactoring/common-logging-log4j/trunk: . tools/etc/buildmagic

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

Author: ruel.loehr at jboss.com
Date: 2006-08-14 11:55:07 -0400 (Mon, 14 Aug 2006)
New Revision: 1952

Modified:
   branches/logging_refactoring/common-logging-log4j/trunk/build-compile.xml
   branches/logging_refactoring/common-logging-log4j/trunk/build-thirdparty.xml
   branches/logging_refactoring/common-logging-log4j/trunk/tools/etc/buildmagic/aliases.ent
Log:
update dependency mechanism

Modified: branches/logging_refactoring/common-logging-log4j/trunk/build-compile.xml
===================================================================
--- branches/logging_refactoring/common-logging-log4j/trunk/build-compile.xml	2006-08-14 15:41:24 UTC (rev 1951)
+++ branches/logging_refactoring/common-logging-log4j/trunk/build-compile.xml	2006-08-14 15:55:07 UTC (rev 1952)
@@ -12,17 +12,9 @@
   &targets;
    <!-- The combined library classpath -->
       <path id="library.classpath">
-                <path refid="jboss.logging.spi.classpath"/>
-          <path refid="jboss.common.core.classpath"/>
+          <path refid="jboss/common.logging.spi.classpath"/>
+          <path refid="jboss/common.core.classpath"/>
           <path refid="apache.log4j.classpath"/>
-        <!--<path refid="apache.xerces.classpath"/>
-        <path refid="apache.commons.classpath"/>
-        
-        <path refid="apache.slide.classpath"/>
-        <path refid="dom4j.dom4j.classpath"/>
-        <path refid="wutka.dtdparser.classpath"/>
-        <path refid="oswego.concurrent.classpath"/>
-        <path refid="sun.jaf.classpath"/> -->
       </path>
 
         <!-- The combined dependent module classpath -->

Modified: branches/logging_refactoring/common-logging-log4j/trunk/build-thirdparty.xml
===================================================================
--- branches/logging_refactoring/common-logging-log4j/trunk/build-thirdparty.xml	2006-08-14 15:41:24 UTC (rev 1951)
+++ branches/logging_refactoring/common-logging-log4j/trunk/build-thirdparty.xml	2006-08-14 15:55:07 UTC (rev 1952)
@@ -43,17 +43,10 @@
         The repository is in CVS under the module repository.jboss.com whose contents
         are pushed to the http://repository.jboss.com site.
       -->
-<componentref name="apache-log4j" version="1.2.8"/>  
-      <!--<componentref name="apache-xerces" version="2.7.1"/>
-     
-      <componentref name="apache-slide" version="2.0"/> 
-      <componentref name="dom4j" version="1.5"/>   
-      <componentref name="wutka-dtdparser" version="1.2.1"/>
-      <componentref name="oswego-concurrent" version="1.3.4"/>  
-      <componentref name="sun-jaf" version="1.0.2"/>      
-         <componentref name="apache-httpclient" version="2.0.2"/>-->
+      <componentref name="apache-log4j" version="1.2.8"/>  
+      <componentref name="jboss/common-logging-spi" version="1.0.1.TEST"/> 
+      <componentref name="jboss/common-core" version="1.0.1.TEST"/>   
 
-
    </build>
 
    <synchronizeinfo/>

Modified: branches/logging_refactoring/common-logging-log4j/trunk/tools/etc/buildmagic/aliases.ent
===================================================================
--- branches/logging_refactoring/common-logging-log4j/trunk/tools/etc/buildmagic/aliases.ent	2006-08-14 15:41:24 UTC (rev 1951)
+++ branches/logging_refactoring/common-logging-log4j/trunk/tools/etc/buildmagic/aliases.ent	2006-08-14 15:55:07 UTC (rev 1952)
@@ -94,16 +94,3 @@
 <path id="apache.ant.classpath">
   <pathelement path="${apache.ant.lib}/ant.jar"/>
 </path>
-  
-  
- <!--delete this junk -->  
-    
-  <property name="jboss.logging.spi" value="${project.thirdparty}/jboss/common-logging-spi"/>
-  <path id="jboss.logging.spi.classpath">
-     <pathelement path="${jboss.logging.spi}/jboss-logging-spi-1.0.2.jar"/>
-</path>   
-
-  <property name="jboss.common.core" value="${project.thirdparty}/jboss/common-core"/>
-  <path id="jboss.common.core.classpath">
-     <pathelement path="${jboss.common.core}/jboss-common-core-1.0.2.jar"/>
-</path>     
\ No newline at end of file