[jboss-cvs] JBossAS SVN: r92096 - in branches/Branch_5_x: component-matrix and 4 other directories.

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

Author: sguilhen at redhat.com
Date: 2009-08-06 20:30:32 -0400 (Thu, 06 Aug 2009)
New Revision: 92096

Modified:
   branches/Branch_5_x/build/docs/readme.html
   branches/Branch_5_x/component-matrix/pom.xml
   branches/Branch_5_x/iiop/build.xml
   branches/Branch_5_x/iiop/pom.xml
   branches/Branch_5_x/testsuite/build.xml
   branches/Branch_5_x/thirdparty/pom.xml
   branches/Branch_5_x/tools/etc/buildmagic/libraries.ent
Log:
JBAS-7160: Removed avalon-framework dependency as it is not needed by jacorb anymore.



Modified: branches/Branch_5_x/build/docs/readme.html
===================================================================
--- branches/Branch_5_x/build/docs/readme.html	2009-08-07 00:19:05 UTC (rev 92095)
+++ branches/Branch_5_x/build/docs/readme.html	2009-08-07 00:30:32 UTC (rev 92096)
@@ -185,7 +185,6 @@
 name="CallByValue"&gt;true&lt;/attribute&gt;</li><li><span style="font-family: monospace;">conf/jndi.properties</span><span style="font-family: monospace;"><br>
 java.naming.factory.initial=org.jboss.iiop.naming.ORBInitialContextFactory</span></li><li style="font-family: monospace;">conf/jacorb.properties<br>
 deploy/iiop-service.xml<br>
-lib/avalon-framework.jar<br>
 lib/jacorb.jar</li><li><span style="font-family: monospace;"><span style="font-family: monospace;">deploy/juddi-service.sar</span></span></li></ul><li>The <span style="font-weight: bold;">web</span> config is a new <span style="font-style: italic; font-weight: bold;">experimental</span>&nbsp;lightweight
 configuration created around JBoss Web that will follow
 the developments of the JavaEE 6 web profile. Except for the

Modified: branches/Branch_5_x/component-matrix/pom.xml
===================================================================
--- branches/Branch_5_x/component-matrix/pom.xml	2009-08-07 00:19:05 UTC (rev 92095)
+++ branches/Branch_5_x/component-matrix/pom.xml	2009-08-07 00:30:32 UTC (rev 92096)
@@ -183,12 +183,6 @@
       </dependency>
       
       <dependency>
-        <groupId>apache-avalon</groupId>
-        <artifactId>avalon-framework</artifactId>
-        <version>4.1.5</version>
-      </dependency>
-      
-      <dependency>
         <groupId>apache-avalon-logkit</groupId>
         <artifactId>logkit</artifactId>
         <version>1.2</version>

Modified: branches/Branch_5_x/iiop/build.xml
===================================================================
--- branches/Branch_5_x/iiop/build.xml	2009-08-07 00:19:05 UTC (rev 92095)
+++ branches/Branch_5_x/iiop/build.xml	2009-08-07 00:30:32 UTC (rev 92096)
@@ -74,7 +74,6 @@
     &libraries;
     <!-- The combined library classpath -->
     <path id="library.classpath">
-      <path refid="apache.avalon.classpath"/>
       <path refid="apache.log4j.classpath"/>
       <path refid="junit.junit.classpath"/>
       <path refid="jacorb.jacorb.classpath"/>

Modified: branches/Branch_5_x/iiop/pom.xml
===================================================================
--- branches/Branch_5_x/iiop/pom.xml	2009-08-07 00:19:05 UTC (rev 92095)
+++ branches/Branch_5_x/iiop/pom.xml	2009-08-07 00:30:32 UTC (rev 92096)
@@ -96,10 +96,6 @@
   </build>
   <dependencies>
     <!-- Compile (global dependencies) -->
-    <dependency>
-      <groupId>apache-avalon</groupId>
-      <artifactId>avalon-framework</artifactId>
-    </dependency>
 
     <dependency>
       <groupId>apache-xerces</groupId>

Modified: branches/Branch_5_x/testsuite/build.xml
===================================================================
--- branches/Branch_5_x/testsuite/build.xml	2009-08-07 00:19:05 UTC (rev 92095)
+++ branches/Branch_5_x/testsuite/build.xml	2009-08-07 00:30:32 UTC (rev 92096)
@@ -112,7 +112,6 @@
 
    <!-- The combined library classpath -->
    <path id="library.classpath">
-      <path refid="apache.avalon.classpath"/>
       <path refid="apache.commons.classpath"/>
       <path refid="apache.codec.classpath"/>
       <path refid="apache.log4j.classpath"/>

Modified: branches/Branch_5_x/thirdparty/pom.xml
===================================================================
--- branches/Branch_5_x/thirdparty/pom.xml	2009-08-07 00:19:05 UTC (rev 92095)
+++ branches/Branch_5_x/thirdparty/pom.xml	2009-08-07 00:30:32 UTC (rev 92096)
@@ -1033,10 +1033,6 @@
       <artifactId>antlr</artifactId>
     </dependency>
     <dependency>
-      <groupId>apache-avalon</groupId>
-      <artifactId>avalon-framework</artifactId>
-    </dependency>
-    <dependency>
       <groupId>apache-avalon-logkit</groupId>
       <artifactId>logkit</artifactId>
     </dependency>

Modified: branches/Branch_5_x/tools/etc/buildmagic/libraries.ent
===================================================================
--- branches/Branch_5_x/tools/etc/buildmagic/libraries.ent	2009-08-07 00:19:05 UTC (rev 92095)
+++ branches/Branch_5_x/tools/etc/buildmagic/libraries.ent	2009-08-07 00:30:32 UTC (rev 92096)
@@ -110,11 +110,6 @@
   </path>
 
   <!-- Apache Avalon -->
-  <property name="apache.avalon.root" value="${project.thirdparty}/apache-avalon"/>
-  <property name="apache.avalon.lib" value="${apache.avalon.root}/lib"/>
-  <path id="apache.avalon.classpath">
-    <pathelement path="${apache.avalon.lib}/avalon-framework.jar"/>
-  </path>
   <property name="apache.avalon.logkit.lib" value="${apache.avalon.lib}"/>  
   <path id="apache.avalon.logkit.classpath">
     <pathelement path="${apache.avalon.logkit.lib}/logkit.jar"/>