[jboss-cvs] JBossAS SVN: r92272 - in trunk: component-matrix and 6 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Wed Aug 12 10:48:47 EDT 2009


Author: sguilhen at redhat.com
Date: 2009-08-12 10:48:46 -0400 (Wed, 12 Aug 2009)
New Revision: 92272

Removed:
   trunk/iiop/src/main/org/jboss/util/Log4jLoggerFactory.java
Modified:
   trunk/build/build.xml
   trunk/build/pom.xml
   trunk/component-matrix/pom.xml
   trunk/iiop/.classpath
   trunk/iiop/pom.xml
   trunk/iiop/src/main/org/jboss/iiop/CorbaNamingService.java
   trunk/iiop/src/main/org/jboss/iiop/jacorb/SSLServerSocketFactory.java
   trunk/iiop/src/main/org/jboss/iiop/jacorb/SSLSocketFactory.java
   trunk/testsuite/build.xml
   trunk/thirdparty/pom.xml
Log:
JBAS-7160: Upgraded JacORB to 2.3.1jboss.patch01 and changed the iiop module accordingly. Removed avalon-framework dependency as this is not required by jacorb anymore

Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml	2009-08-12 14:46:07 UTC (rev 92271)
+++ trunk/build/build.xml	2009-08-12 14:48:46 UTC (rev 92272)
@@ -376,7 +376,6 @@
         <include name="conf/jacorb.properties"/>
         <include name="deploy/juddi-service.sar/**"/>
         <include name="deploy/iiop-service.xml"/>
-        <include name="lib/avalon-framework.jar"/>
         <include name="lib/jacorb.jar"/>
       </fileset>
     </copy>
@@ -439,6 +438,7 @@
       <include name="jboss-deployers-client-spi.jar"/>
       <include name="jbossjts.jar"/>
       <include name="jbossjts-integration.jar"/>
+      <include name="jbossjts-jacorb.jar"/>
       <!-- client excludes -->
       <exclude name="jbossws-native-client.jar"/>
       <exclude name="${jbossall.client.filename}"/>
@@ -2032,7 +2032,6 @@
     <!-- Copy thirdparty libraries to server/all/lib -->
     <mkdir dir="${install.all.lib}"/>
     <copy todir="${install.all.lib}" filtering="no">
-      <fileset refid="apache-avalon:avalon-framework:jar"/>
       <fileset refid="jacorb:jacorb:jar"/>
       <fileset refid="jgroups:jgroups:jar"/>
       <fileset refid="net.jcip:jcip-annotations:jar"/>
@@ -2177,7 +2176,6 @@
       <fileset refid="org.jboss.security:jbosssx-client:jar"/>
       <fileset refid="apache-scout:scout:jar"/>
       <fileset refid="jacorb:jacorb:jar"/>
-      <fileset refid="apache-avalon:avalon-framework:jar"/>
       <fileset refid="apache-avalon-logkit:logkit:jar"/>
       <fileset refid="sun-fi:FastInfoset:jar"/>
       <fileset refid="sun-jaxb:jaxb-api:jar"/>
@@ -2232,6 +2230,7 @@
     <copy todir="${install.client}" filtering="no">
       <fileset refid="jboss.jbossts:jbossjts:jar"/>
       <fileset refid="jboss.jbossts:jbossjts-integration:jar"/>
+      <fileset refid="jboss.jbossts:jbossjts-jacorb:jar"/>
       <mapper refid="remove-versions" />
     </copy>
 

Modified: trunk/build/pom.xml
===================================================================
--- trunk/build/pom.xml	2009-08-12 14:46:07 UTC (rev 92271)
+++ trunk/build/pom.xml	2009-08-12 14:48:46 UTC (rev 92272)
@@ -186,10 +186,6 @@
 
     <!-- Dependencies on additional artifacts not included by the modules  -->
     <dependency>
-      <groupId>apache-avalon</groupId>
-      <artifactId>avalon-framework</artifactId>
-    </dependency>
-    <dependency>
       <groupId>apache-avalon-logkit</groupId>
       <artifactId>logkit</artifactId>
     </dependency>

Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2009-08-12 14:46:07 UTC (rev 92271)
+++ trunk/component-matrix/pom.xml	2009-08-12 14:48:46 UTC (rev 92272)
@@ -31,7 +31,7 @@
   <!-- Properties -->
   <properties>
     <version.apache.xalan>2.7.0.patch02-brew</version.apache.xalan>
-    <version.jacorb>2.3.0jboss.patch6-brew</version.jacorb>
+    <version.jacorb>2.3.1jboss.patch01-brew</version.jacorb>
     <version.javax.faces>2.0.0-Beta2</version.javax.faces>
     <version.jboss.jaxr>1.2.1.GA</version.jboss.jaxr>
     <version.jboss.jbossts>4.6.1.GA</version.jboss.jbossts>
@@ -172,12 +172,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: trunk/iiop/.classpath
===================================================================
--- trunk/iiop/.classpath	2009-08-12 14:46:07 UTC (rev 92271)
+++ trunk/iiop/.classpath	2009-08-12 14:48:46 UTC (rev 92272)
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry excluding="org/jboss/iiop/SunJDK14IsLocalBugFix.java" kind="src" output="target/classes" path="src/main"/>
-	<classpathentry kind="src" output="target/classes" path="target/generated-sources/idl"/>
+	<classpathentry excluding="org/jboss/iiop/SunJDK14IsLocalBugFix.java" kind="src" path="src/main"/>
+	<classpathentry exported="true" kind="src" path="/server"/>
+	<classpathentry kind="src" path="output/gen-src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-	<classpathentry kind="output" path="target/classes"/>
+	<classpathentry exported="true" kind="lib" path="/thirdparty/jacorb/lib/jacorb.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-kernel.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-kernel-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/jbossts/lib/jbossjts-jacorb.jar"/>
+	<classpathentry kind="output" path="output/eclipse-classes"/>
 </classpath>

Modified: trunk/iiop/pom.xml
===================================================================
--- trunk/iiop/pom.xml	2009-08-12 14:46:07 UTC (rev 92271)
+++ trunk/iiop/pom.xml	2009-08-12 14:48:46 UTC (rev 92272)
@@ -127,11 +127,6 @@
   <dependencies>
     <!-- Compile (global dependencies) -->
     <dependency>
-      <groupId>apache-avalon</groupId>
-      <artifactId>avalon-framework</artifactId>
-    </dependency>
-
-    <dependency>
       <groupId>apache-xerces</groupId>
       <artifactId>xml-apis</artifactId>
     </dependency>
@@ -150,6 +145,11 @@
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
     </dependency>
+
+    <dependency>
+      <groupId>jboss.jbossts</groupId>
+      <artifactId>jbossjts-jacorb</artifactId>
+    </dependency>
     
     <dependency>
       <groupId>org.jboss</groupId>

Modified: trunk/iiop/src/main/org/jboss/iiop/CorbaNamingService.java
===================================================================
--- trunk/iiop/src/main/org/jboss/iiop/CorbaNamingService.java	2009-08-12 14:46:07 UTC (rev 92271)
+++ trunk/iiop/src/main/org/jboss/iiop/CorbaNamingService.java	2009-08-12 14:48:46 UTC (rev 92272)
@@ -22,6 +22,7 @@
 package org.jboss.iiop;
 
 import java.util.Hashtable;
+
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.Name;
@@ -29,7 +30,7 @@
 import javax.naming.Reference;
 import javax.naming.spi.ObjectFactory;
 
-import org.apache.avalon.framework.configuration.Configuration;
+import org.jacorb.config.Configuration;
 import org.jboss.logging.Logger;
 import org.jboss.system.ServiceMBeanSupport;
 import org.omg.CORBA.ORB;
@@ -42,8 +43,8 @@
 import org.omg.CosNaming.NameComponent;
 import org.omg.CosNaming.NamingContext;
 import org.omg.CosNaming.NamingContextExt;
+import org.omg.CosNaming.NamingContextExtHelper;
 import org.omg.CosNaming.NamingContextHelper;
-import org.omg.CosNaming.NamingContextExtHelper;
 import org.omg.PortableServer.IdAssignmentPolicyValue;
 import org.omg.PortableServer.LifespanPolicyValue;
 import org.omg.PortableServer.POA;

Modified: trunk/iiop/src/main/org/jboss/iiop/jacorb/SSLServerSocketFactory.java
===================================================================
--- trunk/iiop/src/main/org/jboss/iiop/jacorb/SSLServerSocketFactory.java	2009-08-12 14:46:07 UTC (rev 92271)
+++ trunk/iiop/src/main/org/jboss/iiop/jacorb/SSLServerSocketFactory.java	2009-08-12 14:48:46 UTC (rev 92272)
@@ -24,8 +24,12 @@
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.ServerSocket;
+
 import javax.net.ssl.SSLServerSocket;
 
+import org.jacorb.config.Configurable;
+import org.jacorb.config.Configuration;
+import org.jacorb.config.ConfigurationException;
 import org.jboss.iiop.CorbaORBService;
 import org.jboss.logging.Logger;
 import org.jboss.security.SecurityDomain;
@@ -43,30 +47,28 @@
  * @author <a href="mailto:reverbel at ime.usp.br">Francisco Reverbel</a>
  * @version $Revision$
  */
-public class SSLServerSocketFactory 
-   implements org.jacorb.orb.factory.ServerSocketFactory,
-              org.apache.avalon.framework.configuration.Configurable
+public class SSLServerSocketFactory implements org.jacorb.orb.factory.ServerSocketFactory, Configurable
 {
    // Static --------------------------------------------------------
-   
+
    private static Logger log = Logger.getLogger(SSLServerSocketFactory.class);
-   
+
    // Attributes ----------------------------------------------------
-   
+
    private DomainServerSocketFactory domainFactory = null;
+
    private boolean require_mutual_auth = false;
+
    private boolean request_mutual_auth = false;
-   
+
    // Constructor ---------------------------------------------------
-   
-   public SSLServerSocketFactory(org.jacorb.orb.ORB orb)
-      throws IOException
+
+   public SSLServerSocketFactory(org.jacorb.orb.ORB orb) throws IOException
    {
       log.info("Creating");
-      
-      SecurityDomain securityDomain = 
-         (SecurityDomain)Registry.lookup(CorbaORBService.SSL_DOMAIN);
 
+      SecurityDomain securityDomain = (SecurityDomain) Registry.lookup(CorbaORBService.SSL_DOMAIN);
+
       try
       {
          domainFactory = new DomainServerSocketFactory(securityDomain);
@@ -78,16 +80,11 @@
          throw e;
       }
 
-      short serverSupportedOptions = Short.parseShort(
-            orb.getConfiguration().getAttribute(
-                  "jacorb.security.ssl.server.supported_options","20"),
-            16); // 16 is the base as we take the string value as hex!      
-      short serverRequiredOptions = Short.parseShort(
-             orb.getConfiguration().getAttribute(
-                  "jacorb.security.ssl.server.required_options","0"),
-             16); // 16 is the base as we take the string value as hex!      
+      short serverSupportedOptions = Short.parseShort(orb.getConfiguration().getAttribute(
+            "jacorb.security.ssl.server.supported_options", "20"), 16); // 16 is the base as we take the string value as hex!      
+      short serverRequiredOptions = Short.parseShort(orb.getConfiguration().getAttribute(
+            "jacorb.security.ssl.server.required_options", "0"), 16); // 16 is the base as we take the string value as hex!      
 
-
       if ((serverSupportedOptions & 0x40) != 0)
       {
          // would prefer to establish trust in client.  If client can support
@@ -107,65 +104,49 @@
          log.info("Will create SSL sockets that require client authentication");
       log.info("Created");
    }
-           
+
    // JacORB ServerSocketFactory implementation ------------------
    // (interface org.jacorb.orb.factory.ServerSocketFactory)
 
-   public ServerSocket createServerSocket(int port)
-      throws IOException
+   public ServerSocket createServerSocket(int port) throws IOException
    {
-      SSLServerSocket s = 
-         (SSLServerSocket)domainFactory.createServerSocket(port);
+      SSLServerSocket s = (SSLServerSocket) domainFactory.createServerSocket(port);
 
-      if (request_mutual_auth) 
+      if (request_mutual_auth)
          s.setWantClientAuth(request_mutual_auth);
-      else if (require_mutual_auth) 
+      else if (require_mutual_auth)
          s.setNeedClientAuth(require_mutual_auth);
 
       return s;
    }
-   
-   public ServerSocket createServerSocket(int port, int backlog) 
-      throws IOException
+
+   public ServerSocket createServerSocket(int port, int backlog) throws IOException
    {
-      SSLServerSocket s = 
-         (SSLServerSocket)domainFactory.createServerSocket(port, backlog);
+      SSLServerSocket s = (SSLServerSocket) domainFactory.createServerSocket(port, backlog);
 
-      if (request_mutual_auth) 
+      if (request_mutual_auth)
          s.setWantClientAuth(request_mutual_auth);
-      else if (require_mutual_auth) 
+      else if (require_mutual_auth)
          s.setNeedClientAuth(require_mutual_auth);
 
       return s;
    }
 
-   public ServerSocket createServerSocket(int port,
-                                          int backlog,
-                                          InetAddress ifAddress)
-      throws IOException    
+   public ServerSocket createServerSocket(int port, int backlog, InetAddress ifAddress) throws IOException
    {
-      SSLServerSocket s = 
-         (SSLServerSocket)domainFactory.createServerSocket(port, 
-                                                           backlog, ifAddress);
+      SSLServerSocket s = (SSLServerSocket) domainFactory.createServerSocket(port, backlog, ifAddress);
 
-      if (request_mutual_auth) 
+      if (request_mutual_auth)
          s.setWantClientAuth(request_mutual_auth);
-      else if (require_mutual_auth) 
+      else if (require_mutual_auth)
          s.setNeedClientAuth(require_mutual_auth);
 
       return s;
    }
-   
-   public void switchToClientMode(java.net.Socket socket)
-   {
-      // no-op
-   }
 
    // Avalon Configurable implementation ----------------------------
-   
-   public void configure(
-         org.apache.avalon.framework.configuration.Configuration configuration)
-      throws org.apache.avalon.framework.configuration.ConfigurationException
+
+   public void configure(Configuration configuration) throws ConfigurationException
    {
       // no-op
    }

Modified: trunk/iiop/src/main/org/jboss/iiop/jacorb/SSLSocketFactory.java
===================================================================
--- trunk/iiop/src/main/org/jboss/iiop/jacorb/SSLSocketFactory.java	2009-08-12 14:46:07 UTC (rev 92271)
+++ trunk/iiop/src/main/org/jboss/iiop/jacorb/SSLSocketFactory.java	2009-08-12 14:48:46 UTC (rev 92272)
@@ -24,8 +24,12 @@
 import java.io.IOException;
 import java.net.Socket;
 import java.net.UnknownHostException;
+
 import javax.net.ssl.SSLSocket;
 
+import org.jacorb.config.Configurable;
+import org.jacorb.config.Configuration;
+import org.jacorb.config.ConfigurationException;
 import org.jboss.iiop.CorbaORBService;
 import org.jboss.logging.Logger;
 import org.jboss.security.SecurityDomain;
@@ -43,10 +47,8 @@
  * @author <a href="mailto:reverbel at ime.usp.br">Francisco Reverbel</a>
  * @version $Revision$
  */
-public class SSLSocketFactory 
-   implements org.jacorb.orb.factory.SocketFactory,
-              org.apache.avalon.framework.configuration.Configurable
-{    
+public class SSLSocketFactory implements org.jacorb.orb.factory.SocketFactory, Configurable
+{
    // Static --------------------------------------------------------
 
    private static Logger log = Logger.getLogger(SSLSocketFactory.class);
@@ -54,16 +56,14 @@
    // Attributes ----------------------------------------------------
 
    private DomainSocketFactory domainFactory = null;
-   
+
    // Constructor ---------------------------------------------------
 
-   public SSLSocketFactory(org.jacorb.orb.ORB orb) 
-      throws IOException
+   public SSLSocketFactory(org.jacorb.orb.ORB orb) throws IOException
    {
       log.info("Creating");
 
-      SecurityDomain securityDomain = 
-         (SecurityDomain)Registry.lookup(CorbaORBService.SSL_DOMAIN);
+      SecurityDomain securityDomain = (SecurityDomain) Registry.lookup(CorbaORBService.SSL_DOMAIN);
 
       try
       {
@@ -76,49 +76,45 @@
          throw e;
       }
    }
-   
+
    // JacORB SSLSocketFactory implementation ------------------------
    // (interface org.jacorb.orb.factory.SSLSocketFactory)
 
-    /**
-     * create a connected stream Socket.
-     *
-     * @param host the host name
-     * @param port the port number
-     * @return a connected stream Socket
-     * @throws IOException, UnknownHostException
-     */
-   public Socket createSocket(String host, int port)
-      throws IOException, UnknownHostException
-   {       
+   /**
+    * create a connected stream Socket.
+    *
+    * @param host the host name
+    * @param port the port number
+    * @return a connected stream Socket
+    * @throws IOException, UnknownHostException
+    */
+   public Socket createSocket(String host, int port) throws IOException, UnknownHostException
+   {
       return domainFactory.createSocket(host, port);
    }
-   
-    /**
-     * create a connected stream Socket.
-     *
-     * @param host the host name
-     * @param port the port number
-     * @param timeout the timeout value to be used in milliseconds
-     * @return a connected stream Socket
-     * @throws IOException
-     */
-   public Socket createSocket(String host, int port, int timeout)
-      throws IOException, UnknownHostException
+
+   /**
+    * create a connected stream Socket.
+    *
+    * @param host the host name
+    * @param port the port number
+    * @param timeout the timeout value to be used in milliseconds
+    * @return a connected stream Socket
+    * @throws IOException
+    */
+   public Socket createSocket(String host, int port, int timeout) throws IOException, UnknownHostException
    {
       return domainFactory.createSocket(host, port, timeout);
    }
 
-   public boolean isSSL (java.net.Socket s)
-   { 
-      return (s instanceof SSLSocket); 
+   public boolean isSSL(java.net.Socket s)
+   {
+      return (s instanceof SSLSocket);
    }
-   
+
    // Avalon Configurable implementation ----------------------------
-   
-   public void configure(
-         org.apache.avalon.framework.configuration.Configuration configuration)
-      throws org.apache.avalon.framework.configuration.ConfigurationException
+
+   public void configure(Configuration configuration) throws ConfigurationException
    {
       // no-op
    }

Deleted: trunk/iiop/src/main/org/jboss/util/Log4jLoggerFactory.java
===================================================================
--- trunk/iiop/src/main/org/jboss/util/Log4jLoggerFactory.java	2009-08-12 14:46:07 UTC (rev 92271)
+++ trunk/iiop/src/main/org/jboss/util/Log4jLoggerFactory.java	2009-08-12 14:48:46 UTC (rev 92272)
@@ -1,166 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2009, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.util;
-
-import org.jacorb.config.LoggerFactory;
-import org.apache.avalon.framework.logger.Logger;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-
-import java.io.IOException;
-
-/**
- * A stub logger factory which delegates to the JBoss common logging system.  Despite its name it has nothing to
- * do with log4j; it's so named due to external deps which will hopefully be changed some time soon (jacorb:resources).
- */
-public final class Log4jLoggerFactory implements LoggerFactory
-{
-   public String getLoggingBackendName()
-   {
-      return "jboss";
-   }
-
-   public Logger getNamedLogger(String s)
-   {
-      return new AvalonLogger(s);
-   }
-
-   public Logger getNamedRootLogger(String s)
-   {
-      return getNamedLogger(s);
-   }
-
-   public Logger getNamedLogger(String s, String s1, long l) throws IOException
-   {
-      return null;
-   }
-
-   public void setDefaultLogFile(String s, long l) throws IOException
-   {
-      // ignore
-   }
-
-   public void configure(Configuration configuration) throws ConfigurationException
-   {
-      // ignore
-   }
-
-   /**
-    * A stub Avalon logger implementation which delegates to the JBoss logger system.
-    */
-   static final class AvalonLogger implements Logger
-   {
-      private static final String FQCN = AvalonLogger.class.getName();
-
-      private final org.jboss.logging.Logger logger;
-      private final String name;
-
-      public AvalonLogger(String name)
-      {
-         this.name = name;
-         logger = org.jboss.logging.Logger.getLogger(name);
-      }
-
-      public void debug(String s)
-      {
-         logger.debug(FQCN, s, null);
-      }
-
-      public void debug(String s, Throwable throwable)
-      {
-         logger.debug(FQCN, s, throwable);
-      }
-
-      @Deprecated
-      public boolean isDebugEnabled()
-      {
-         return logger.isDebugEnabled();
-      }
-
-      public void info(String s)
-      {
-         logger.info(FQCN, s, null);
-      }
-
-      public void info(String s, Throwable throwable)
-      {
-         logger.info(FQCN, s, throwable);
-      }
-
-      public boolean isInfoEnabled()
-      {
-         return logger.isInfoEnabled();
-      }
-
-      public void warn(String s)
-      {
-         logger.warn(FQCN, s, null);
-      }
-
-      public void warn(String s, Throwable throwable)
-      {
-         logger.warn(FQCN, s, throwable);
-      }
-
-      public boolean isWarnEnabled()
-      {
-         return true;
-      }
-
-      public void error(String s)
-      {
-         logger.error(FQCN, s, null);
-      }
-
-      public void error(String s, Throwable throwable)
-      {
-         logger.error(FQCN, s, throwable);
-      }
-
-      public boolean isErrorEnabled()
-      {
-         return true;
-      }
-
-      public void fatalError(String s)
-      {
-         logger.fatal(FQCN, s, null);
-      }
-
-      public void fatalError(String s, Throwable throwable)
-      {
-         logger.fatal(FQCN, s, throwable);
-      }
-
-      public boolean isFatalErrorEnabled()
-      {
-         return true;
-      }
-
-      public Logger getChildLogger(String s)
-      {
-         final String name = this.name;
-         return new AvalonLogger(name == null || name.length() == 0 ? s : name + "." + s);
-      }
-   }
-}

Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml	2009-08-12 14:46:07 UTC (rev 92271)
+++ trunk/testsuite/build.xml	2009-08-12 14:48:46 UTC (rev 92272)
@@ -200,7 +200,6 @@
     
     <!-- The combined library classpath -->
     <path id="library.classpath">
-      <fileset refid="apache-avalon:avalon-framework:jar"/>
       <!-- apache commons classpath -->
       <fileset refid="commons-collections:commons-collections:jar"/>
       <fileset refid="commons-logging:commons-logging:jar"/>

Modified: trunk/thirdparty/pom.xml
===================================================================
--- trunk/thirdparty/pom.xml	2009-08-12 14:46:07 UTC (rev 92271)
+++ trunk/thirdparty/pom.xml	2009-08-12 14:48:46 UTC (rev 92272)
@@ -1036,10 +1036,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>




More information about the jboss-cvs-commits mailing list