james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b...@apache.org
Subject svn commit: r576181 [1/5] - in /james/server/trunk: ./ core-library/ experimental-seda-imap-function/ fetchmail-function/ imap-api/ imap-codec-library/ imap-command-library/ imap-mailbox-processor-function/ imapmailbox-library/ imapserver-function/ mor...
Date Sun, 16 Sep 2007 21:29:38 GMT
Author: bago
Date: Sun Sep 16 14:29:31 2007
New Revision: 576181

URL: http://svn.apache.org/viewvc?rev=576181&view=rev
Log:
Big dependencies update.
Updated dnsjava to 2.0.5 (JAMES-816)
Updated all of the cornerstone libraries to 2.2.2 (JAMES-798)
Updated torque to 3.3RC2
Updated javamail 1.4.1ea to a newer build (related to JAMES-693)
Updated maven2 poms introducing the dependencyManagement stuff in the root pom, so to have dependencies versions in a single place.
Updated license file to reflect changed paths (part of JAMES-797)

Added:
    james/server/trunk/stage/com.thoughtworks.xstream/
      - copied from r553199, james/server/trunk/stage/xstream/
    james/server/trunk/stage/com.thoughtworks.xstream/poms/
    james/server/trunk/stage/com.thoughtworks.xstream/poms/xstream-1.2.pom
    james/server/trunk/stage/com.thoughtworks.xstream/poms/xstream-parent-1.2.pom
    james/server/trunk/stage/commons-beanutils/poms/
    james/server/trunk/stage/commons-beanutils/poms/commons-beanutils-1.7.0.pom
    james/server/trunk/stage/commons-collections/poms/
    james/server/trunk/stage/commons-collections/poms/commons-collections-3.1.pom
    james/server/trunk/stage/commons-configuration/poms/
    james/server/trunk/stage/commons-configuration/poms/commons-configuration-1.1.pom
    james/server/trunk/stage/commons-dbcp/poms/
    james/server/trunk/stage/commons-dbcp/poms/commons-dbcp-1.2.1.pom
    james/server/trunk/stage/commons-logging/poms/
    james/server/trunk/stage/commons-logging/poms/commons-logging-1.1.pom
    james/server/trunk/stage/commons-net/poms/
    james/server/trunk/stage/commons-net/poms/commons-net-1.4.1.pom
    james/server/trunk/stage/commons-pool/poms/
    james/server/trunk/stage/commons-pool/poms/commons-pool-1.2.pom
    james/server/trunk/stage/concurrent/poms/
    james/server/trunk/stage/concurrent/poms/concurrent-1.3.4.pom
    james/server/trunk/stage/dnsjava/jars/dnsjava-2.0.5.jar   (with props)
    james/server/trunk/stage/dnsjava/poms/
    james/server/trunk/stage/dnsjava/poms/dnsjava-2.0.5.pom
    james/server/trunk/stage/javax.activation/
      - copied from r553199, james/server/trunk/stage/activation/
    james/server/trunk/stage/javax.activation/poms/
    james/server/trunk/stage/javax.activation/poms/activation-1.1.pom
    james/server/trunk/stage/javax.mail/poms/
    james/server/trunk/stage/javax.mail/poms/mail-1.4.1ea-SNAPSHOT.pom
    james/server/trunk/stage/jmock/poms/
    james/server/trunk/stage/jmock/poms/jmock-1.1.0.pom
    james/server/trunk/stage/mstor/poms/
    james/server/trunk/stage/mstor/poms/mstor-0.9.9.pom
    james/server/trunk/stage/mx4j/poms/
    james/server/trunk/stage/mx4j/poms/mx4j-jmx-1.1.1.pom
    james/server/trunk/stage/org.apache.avalon/
    james/server/trunk/stage/org.apache.avalon.cornerstone/
    james/server/trunk/stage/org.apache.avalon.cornerstone.connection/
    james/server/trunk/stage/org.apache.avalon.cornerstone.connection/jars/
    james/server/trunk/stage/org.apache.avalon.cornerstone.connection/jars/cornerstone-connection-api-2.2.2.jar   (with props)
    james/server/trunk/stage/org.apache.avalon.cornerstone.connection/jars/cornerstone-connection-impl-2.2.2.jar   (with props)
    james/server/trunk/stage/org.apache.avalon.cornerstone.connection/poms/
    james/server/trunk/stage/org.apache.avalon.cornerstone.connection/poms/cornerstone-connection-1.pom
    james/server/trunk/stage/org.apache.avalon.cornerstone.connection/poms/cornerstone-connection-api-2.2.2.pom
    james/server/trunk/stage/org.apache.avalon.cornerstone.connection/poms/cornerstone-connection-impl-2.2.2.pom
    james/server/trunk/stage/org.apache.avalon.cornerstone.datasources/
    james/server/trunk/stage/org.apache.avalon.cornerstone.datasources/jars/
    james/server/trunk/stage/org.apache.avalon.cornerstone.datasources/jars/cornerstone-datasources-api-2.2.2.jar   (with props)
    james/server/trunk/stage/org.apache.avalon.cornerstone.datasources/jars/cornerstone-datasources-impl-2.2.2.jar   (with props)
    james/server/trunk/stage/org.apache.avalon.cornerstone.datasources/poms/
    james/server/trunk/stage/org.apache.avalon.cornerstone.datasources/poms/cornerstone-datasources-1.pom
    james/server/trunk/stage/org.apache.avalon.cornerstone.datasources/poms/cornerstone-datasources-api-2.2.2.pom
    james/server/trunk/stage/org.apache.avalon.cornerstone.datasources/poms/cornerstone-datasources-impl-2.2.2.pom
    james/server/trunk/stage/org.apache.avalon.cornerstone.scheduler/
    james/server/trunk/stage/org.apache.avalon.cornerstone.scheduler/jars/
    james/server/trunk/stage/org.apache.avalon.cornerstone.scheduler/jars/cornerstone-scheduler-api-2.2.2.jar   (with props)
    james/server/trunk/stage/org.apache.avalon.cornerstone.scheduler/jars/cornerstone-scheduler-impl-2.2.2.jar   (with props)
    james/server/trunk/stage/org.apache.avalon.cornerstone.scheduler/poms/
    james/server/trunk/stage/org.apache.avalon.cornerstone.scheduler/poms/cornerstone-scheduler-1.pom
    james/server/trunk/stage/org.apache.avalon.cornerstone.scheduler/poms/cornerstone-scheduler-api-2.2.2.pom
    james/server/trunk/stage/org.apache.avalon.cornerstone.scheduler/poms/cornerstone-scheduler-impl-2.2.2.pom
    james/server/trunk/stage/org.apache.avalon.cornerstone.sockets/
    james/server/trunk/stage/org.apache.avalon.cornerstone.sockets/jars/
    james/server/trunk/stage/org.apache.avalon.cornerstone.sockets/jars/cornerstone-sockets-api-2.2.2.jar   (with props)
    james/server/trunk/stage/org.apache.avalon.cornerstone.sockets/jars/cornerstone-sockets-impl-2.2.2.jar   (with props)
    james/server/trunk/stage/org.apache.avalon.cornerstone.sockets/poms/
    james/server/trunk/stage/org.apache.avalon.cornerstone.sockets/poms/cornerstone-sockets-1.pom
    james/server/trunk/stage/org.apache.avalon.cornerstone.sockets/poms/cornerstone-sockets-api-2.2.2.pom
    james/server/trunk/stage/org.apache.avalon.cornerstone.sockets/poms/cornerstone-sockets-impl-2.2.2.pom
    james/server/trunk/stage/org.apache.avalon.cornerstone.store/
    james/server/trunk/stage/org.apache.avalon.cornerstone.store/jars/
    james/server/trunk/stage/org.apache.avalon.cornerstone.store/jars/cornerstone-store-api-2.2.2.jar   (with props)
    james/server/trunk/stage/org.apache.avalon.cornerstone.store/poms/
    james/server/trunk/stage/org.apache.avalon.cornerstone.store/poms/cornerstone-store-1.pom
    james/server/trunk/stage/org.apache.avalon.cornerstone.store/poms/cornerstone-store-api-2.2.2.pom
    james/server/trunk/stage/org.apache.avalon.cornerstone.threads/
    james/server/trunk/stage/org.apache.avalon.cornerstone.threads/jars/
    james/server/trunk/stage/org.apache.avalon.cornerstone.threads/jars/cornerstone-threads-api-2.2.2.jar   (with props)
    james/server/trunk/stage/org.apache.avalon.cornerstone.threads/jars/cornerstone-threads-impl-2.2.2.jar   (with props)
    james/server/trunk/stage/org.apache.avalon.cornerstone.threads/poms/
    james/server/trunk/stage/org.apache.avalon.cornerstone.threads/poms/cornerstone-threads-1.pom
    james/server/trunk/stage/org.apache.avalon.cornerstone.threads/poms/cornerstone-threads-api-2.2.2.pom
    james/server/trunk/stage/org.apache.avalon.cornerstone.threads/poms/cornerstone-threads-impl-2.2.2.pom
    james/server/trunk/stage/org.apache.avalon.cornerstone/poms/
    james/server/trunk/stage/org.apache.avalon.cornerstone/poms/avalon-cornerstone-modules-1.pom
    james/server/trunk/stage/org.apache.avalon.framework/
    james/server/trunk/stage/org.apache.avalon.framework/jars/
    james/server/trunk/stage/org.apache.avalon.framework/jars/avalon-framework-api-4.3.1.jar   (with props)
    james/server/trunk/stage/org.apache.avalon.framework/jars/avalon-framework-impl-4.3.1.jar   (with props)
    james/server/trunk/stage/org.apache.avalon.framework/poms/
    james/server/trunk/stage/org.apache.avalon.framework/poms/avalon-framework-api-4.3.1.pom
    james/server/trunk/stage/org.apache.avalon.framework/poms/avalon-framework-impl-4.3.1.pom
    james/server/trunk/stage/org.apache.avalon.logkit/
    james/server/trunk/stage/org.apache.avalon.logkit/jars/
    james/server/trunk/stage/org.apache.avalon.logkit/jars/avalon-logkit-2.2.1.jar   (with props)
    james/server/trunk/stage/org.apache.avalon.logkit/poms/
    james/server/trunk/stage/org.apache.avalon.logkit/poms/avalon-logkit-2.2.1.pom
    james/server/trunk/stage/org.apache.avalon/poms/
    james/server/trunk/stage/org.apache.avalon/poms/avalon-framework-1.pom
    james/server/trunk/stage/org.apache.db.torque/
    james/server/trunk/stage/org.apache.db.torque/jars/
    james/server/trunk/stage/org.apache.db.torque/jars/runtime-3.3-RC2.jar   (with props)
    james/server/trunk/stage/org.apache.db.torque/poms/
    james/server/trunk/stage/org.apache.db.torque/poms/runtime-3.3-RC2.pom
    james/server/trunk/stage/org.apache.db.torque/poms/torque-3.3-RC2.pom
    james/server/trunk/stage/org.apache.derby/poms/
    james/server/trunk/stage/org.apache.derby/poms/derby-10.2.2.0.pom
    james/server/trunk/stage/org.apache.excalibur/
    james/server/trunk/stage/org.apache.excalibur.components/
    james/server/trunk/stage/org.apache.excalibur.components/jars/
    james/server/trunk/stage/org.apache.excalibur.components/jars/excalibur-datasource-2.2.2.jar   (with props)
    james/server/trunk/stage/org.apache.excalibur.components/jars/excalibur-pool-api-2.2.1.jar   (with props)
    james/server/trunk/stage/org.apache.excalibur.components/jars/excalibur-pool-impl-2.2.1.jar   (with props)
    james/server/trunk/stage/org.apache.excalibur.components/jars/excalibur-thread-api-2.2.1.jar   (with props)
    james/server/trunk/stage/org.apache.excalibur.components/jars/excalibur-thread-impl-2.2.1.jar   (with props)
    james/server/trunk/stage/org.apache.excalibur.components/poms/
    james/server/trunk/stage/org.apache.excalibur.components/poms/excalibur-components-modules-1.pom
    james/server/trunk/stage/org.apache.excalibur.components/poms/excalibur-datasource-2.2.2.pom
    james/server/trunk/stage/org.apache.excalibur.components/poms/excalibur-pool-api-2.2.1.pom
    james/server/trunk/stage/org.apache.excalibur.components/poms/excalibur-pool-impl-2.2.1.pom
    james/server/trunk/stage/org.apache.excalibur.components/poms/excalibur-pool-modules-1.pom
    james/server/trunk/stage/org.apache.excalibur.components/poms/excalibur-thread-api-2.2.1.pom
    james/server/trunk/stage/org.apache.excalibur.components/poms/excalibur-thread-impl-2.2.1.pom
    james/server/trunk/stage/org.apache.excalibur.components/poms/excalibur-thread-modules-1.pom
    james/server/trunk/stage/org.apache.excalibur.containerkit/
    james/server/trunk/stage/org.apache.excalibur.containerkit/poms/
    james/server/trunk/stage/org.apache.excalibur.containerkit/poms/excalibur-containerkit-1.pom
    james/server/trunk/stage/org.apache.excalibur/poms/
    james/server/trunk/stage/org.apache.excalibur/poms/excalibur-1.pom
    james/server/trunk/stage/org.apache.excalibur/poms/excalibur-2.pom
    james/server/trunk/stage/org.apache.excalibur/poms/excalibur-3.pom
    james/server/trunk/stage/org.apache.james/poms/james-server-root-1.0.pom
    james/server/trunk/stage/org.apache.james/poms/maven-skin-1.1-SNAPSHOT.pom
    james/server/trunk/stage/org.apache.james/xmls/james-parent-1.1-site.xml
    james/server/trunk/stage/org.apache.james/xmls/james-parent-1.1-site_en.xml
    james/server/trunk/stage/org.apache.james/xmls/james-project-1.1-site.xml
    james/server/trunk/stage/org.apache.james/xmls/james-project-1.1-site_en.xml
    james/server/trunk/stage/org.apache.james/xmls/james-server-root-1.0-site.xml
    james/server/trunk/stage/org.apache.james/xmls/james-server-root-1.0-site_en.xml
    james/server/trunk/stage/village/poms/
    james/server/trunk/stage/village/poms/village-2.0.pom
Removed:
    james/server/trunk/stage/dnsjava/jars/dnsjava-2.0.3.jar
    james/server/trunk/stage/org.apache.james/xmls/james-parent-1.1-SNAPSHOT-site.xml
    james/server/trunk/stage/org.apache.james/xmls/james-parent-1.1-SNAPSHOT-site_en.xml
    james/server/trunk/stage/org.apache.james/xmls/james-project-1.1-SNAPSHOT-site.xml
    james/server/trunk/stage/org.apache.james/xmls/james-project-1.1-SNAPSHOT-site_en.xml
Modified:
    james/server/trunk/LICENSE.txt
    james/server/trunk/core-library/pom.xml
    james/server/trunk/experimental-seda-imap-function/pom.xml
    james/server/trunk/fetchmail-function/pom.xml
    james/server/trunk/imap-api/pom.xml
    james/server/trunk/imap-codec-library/pom.xml
    james/server/trunk/imap-command-library/pom.xml
    james/server/trunk/imap-mailbox-processor-function/pom.xml
    james/server/trunk/imapmailbox-library/pom.xml
    james/server/trunk/imapserver-function/pom.xml
    james/server/trunk/include.properties
    james/server/trunk/mordred-library/pom.xml
    james/server/trunk/nntpserver-function/pom.xml
    james/server/trunk/phoenix-deployment/build.xml
    james/server/trunk/phoenix-deployment/pom.xml
    james/server/trunk/pom.xml
    james/server/trunk/pop3server-function/pom.xml
    james/server/trunk/remotemanager-function/pom.xml
    james/server/trunk/smtpserver-function/pom.xml
    james/server/trunk/spoolmanager-function/pom.xml
    james/server/trunk/stage/javax.mail/jars/mail-1.4.1ea-SNAPSHOT.jar
    james/server/trunk/torque-mailboxmanager-function/pom.xml

Modified: james/server/trunk/LICENSE.txt
URL: http://svn.apache.org/viewvc/james/server/trunk/LICENSE.txt?rev=576181&r1=576180&r2=576181&view=diff
==============================================================================
--- james/server/trunk/LICENSE.txt (original)
+++ james/server/trunk/LICENSE.txt Sun Sep 16 14:29:31 2007
@@ -183,12 +183,15 @@
    
    
    
-   Concurrent, Public Domain (see lib/concurrent.LICENSE)
+   Concurrent, Public Domain 
+     (see stage/concurrent/jars/concurrent.LICENSE)
    
-   BouncyCastle, MIT License (see lib/BouncyCastle.LICENSE)
+   BouncyCastle, MIT License 
+     (see stage/org.bouncycastle/jars/BouncyCastle.LICENSE)
      http://www.bouncycastle.org/licence.html
      
-   DnsJava, BSD License (see lib/dnsjava.LICENSE)
+   DnsJava, BSD License 
+     (see stage/dnsjava/jars/dnsjava.LICENSE)
      http://www.dnsjava.org/README 
      
    JavaBeans Activation Framework, CDDL License
@@ -197,22 +200,30 @@
    JavaMail, CDDL License
      http://glassfish.dev.java.net/public/CDDLv1.0.html
    
-   QDox, ASL 1.1 License (see tools/lib/qdox.LICENSE)
+   QDox, ASL 1.1 License
+     (see phoenix-deployment/tools/lib/qdox.LICENSE)
      http://qdox.codehaus.org/license.html
      
-   MX4J, ASL 1.1 License (see phoenix-bin/bin/lib/mx4j.LICENSE)
+   MX4J, ASL 1.1 License
+     (see phoenix-deployment/phoenix-bin/bin/lib/mx4j.LICENSE)
    
-   Spice, ASL 1.1 License (see phoenix-bin/bin/lib/spice.LICENSE)
+   Spice, ASL 1.1 License
+     (see phoenix-deployment/phoenix-bin/bin/lib/spice.LICENSE)
      http://spice.codehaus.org/license.html
      
-   Wrapper, MIT License (see phoenix-bin/bin/Wrapper.LICENSE)
+   Wrapper, MIT License
+     (see phoenix-deployment/phoenix-bin/bin/Wrapper.LICENSE)
      http://wrapper.tanukisoftware.org/doc/english/license.html
      
-   ISO-Relax, MIT License (see phoenix-bin/tools/lib/isorelax.LICENSE)
+   ISO-Relax, MIT License
+     (see phoenix-deployment/phoenix-bin/tools/lib/isorelax.LICENSE)
 
-   MSV, BSD License (see phoenix-bin/tools/lib/msv.LICENSE)
+   MSV, BSD License
+     (see phoenix-deployment/phoenix-bin/tools/lib/msv.LICENSE)
 
-   RelaxNG-Datatype, BSD License (see phoenix-bin/tools/lib/relaxngDatatype.LICENSE)
+   RelaxNG-Datatype, BSD License
+     (see phoenix-deployment/phoenix-bin/tools/lib/relaxngDatatype.LICENSE)
    
-   XSDLib, BSD License (see phoenix-bin/tools/lib/xsdlib.LICENSE)
+   XSDLib, BSD License
+     (see phoenix-deployment/phoenix-bin/tools/lib/xsdlib.LICENSE)
    

Modified: james/server/trunk/core-library/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/pom.xml?rev=576181&r1=576180&r2=576181&view=diff
==============================================================================
--- james/server/trunk/core-library/pom.xml (original)
+++ james/server/trunk/core-library/pom.xml Sun Sep 16 14:29:31 2007
@@ -1,22 +1,23 @@
-<?xml version="1.0" encoding="ISO-8859-15"?><project>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.    
+<?xml version="1.0" encoding="ISO-8859-15"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.    
 -->
+<project>
   <parent>
     <artifactId>james-server</artifactId>
     <groupId>org.apache.james</groupId>
@@ -27,29 +28,21 @@
   <artifactId>james-server-core-library</artifactId>
   <name>Apache JAMES Server Core</name>
   <dependencies>
+  
     <dependency>
       <groupId>org.apache.james</groupId>
       <artifactId>mailet</artifactId>
-      <version>3.0-SNAPSHOT</version>
-    </dependency>
-
-    <!-- TODO remove this dependency -->
-    <dependency>
-      <groupId>org.apache.james</groupId>
-      <artifactId>james-server-imap-api</artifactId>
-      <version>3.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcmail-jdk14</artifactId>
-      <version>129</version>
     </dependency>
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcmail-jdk14-workaround</artifactId>
-      <version>129</version>
     </dependency>
+    <!--
     <dependency>
       <groupId>org.apache.james</groupId>
       <artifactId>jspf</artifactId>
@@ -60,321 +53,181 @@
       <artifactId>jsieve</artifactId>
       <version>0.2-SNAPSHOT</version>
     </dependency>
+    -->
     <dependency>
       <groupId>javax.mail</groupId>
       <artifactId>mail</artifactId>
-      <version>1.4.1ea-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>activation</groupId>
+      <groupId>javax.activation</groupId>
       <artifactId>activation</artifactId>
-      <version>1.1</version>
     </dependency>
     <dependency>
-      <groupId>avalon-framework</groupId>
+      <groupId>org.apache.avalon.framework</groupId>
       <artifactId>avalon-framework-api</artifactId>
-      <version>4.3</version>
-      <exclusions>
-        <exclusion>
-          <artifactId>avalon-logkit</artifactId>
-          <groupId>avalon-logkit</groupId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <version>1.1</version>
-      <exclusions>
-        <exclusion>
-          <artifactId>logkit</artifactId>
-          <groupId>logkit</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>avalon-framework</artifactId>
-          <groupId>avalon-framework</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>log4j</artifactId>
-          <groupId>log4j</groupId>
-        </exclusion>
-        <exclusion>
-          <groupId>javax.servlet</groupId>
-          <artifactId>servlet-api</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
-      <version>2.1</version>
+      <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>commons-pool</groupId>
       <artifactId>commons-pool</artifactId>
-      <version>1.2</version>
-      <exclusions>
-        <exclusion>
-          <groupId>xerces</groupId>
-          <artifactId>xercesImpl</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>commons-configuration</groupId>
       <artifactId>commons-configuration</artifactId>
-      <version>1.1</version>
+      <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>village</groupId>
       <artifactId>village</artifactId>
-      <version>2.0</version>
+      <scope>runtime</scope>
     </dependency>
     <dependency>
-      <groupId>avalon-framework</groupId>
+      <groupId>org.apache.avalon.framework</groupId>
       <artifactId>avalon-framework-impl</artifactId>
-      <version>4.3</version>
-      <exclusions>
-        <exclusion>
-          <artifactId>jmock</artifactId>
-          <groupId>jmock</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>xalan</artifactId>
-          <groupId>xalan</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>xmlParserAPIs</artifactId>
-          <groupId>xml-apis</groupId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>commons-dbcp</groupId>
       <artifactId>commons-dbcp</artifactId>
-      <version>1.2.1</version>
-      <exclusions>
-        <exclusion>
-          <artifactId>xercesImpl</artifactId>
-          <groupId>xerces</groupId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>commons-net</groupId>
       <artifactId>commons-net</artifactId>
-      <version>1.4.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>commons-collections</groupId>
       <artifactId>commons-collections</artifactId>
-      <version>3.1</version>
     </dependency>
     <dependency>
-      <groupId>cornerstone-connection</groupId>
+      <groupId>org.apache.avalon.cornerstone.connection</groupId>
       <artifactId>cornerstone-connection-api</artifactId>
-      <version>2.1</version>
     </dependency>
     <dependency>
-      <groupId>cornerstone-connection</groupId>
+      <groupId>org.apache.avalon.cornerstone.connection</groupId>
       <artifactId>cornerstone-connection-impl</artifactId>
-      <version>2.1</version>
     </dependency>
     <dependency>
-      <groupId>cornerstone-sockets</groupId>
+      <groupId>org.apache.avalon.cornerstone.sockets</groupId>
       <artifactId>cornerstone-sockets-api</artifactId>
-      <version>2.1</version>
     </dependency>
     <dependency>
-      <groupId>cornerstone-sockets</groupId>
+      <groupId>org.apache.avalon.cornerstone.sockets</groupId>
       <artifactId>cornerstone-sockets-impl</artifactId>
-      <version>2.1-patched</version>
-      <exclusions>
-        <exclusion>
-          <artifactId>xml-apis</artifactId>
-          <groupId>xml-apis</groupId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
-      <groupId>cornerstone-datasources</groupId>
+      <groupId>org.apache.avalon.cornerstone.datasources</groupId>
       <artifactId>cornerstone-datasources-api</artifactId>
-      <version>2.1</version>
     </dependency>
     <dependency>
-      <groupId>excalibur-datasource</groupId>
+      <groupId>org.apache.excalibur.components</groupId>
       <artifactId>excalibur-datasource</artifactId>
-      <version>2.1</version>
-      <exclusions>
-        <exclusion>
-          <artifactId>excalibur-pool-instrumented</artifactId>
-          <groupId>excalibur-pool</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>excalibur-component</artifactId>
-          <groupId>excalibur-component</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>excalibur-testcase</artifactId>
-          <groupId>excalibur-component</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>excalibur-fortress</artifactId>
-          <groupId>excalibur-fortress</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>excalibur-fortress-container-api</artifactId>
-          <groupId>excalibur-fortress</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>excalibur-logger</artifactId>
-          <groupId>excalibur-logger</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>hsqldb</artifactId>
-          <groupId>hsqldb</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>excalibur-fortress-meta</artifactId>
-          <groupId>excalibur-fortress</groupId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
-      <groupId>cornerstone-datasources</groupId>
+      <groupId>org.apache.avalon.cornerstone.datasources</groupId>
       <artifactId>cornerstone-datasources-impl</artifactId>
-      <version>2.1-patched</version>
-      <exclusions>
-        <exclusion>
-          <artifactId>d-haven-managed-pool</artifactId>
-          <groupId>d-haven-managed-pool</groupId>
-        </exclusion>
-      </exclusions>
+      <scope>runtime</scope>
     </dependency>
     <dependency>
-      <groupId>cornerstone-scheduler</groupId>
+      <groupId>org.apache.avalon.cornerstone.scheduler</groupId>
       <artifactId>cornerstone-scheduler-api</artifactId>
-      <version>2.1</version>
     </dependency>
     <dependency>
-      <groupId>cornerstone-scheduler</groupId>
+      <groupId>org.apache.avalon.cornerstone.scheduler</groupId>
       <artifactId>cornerstone-scheduler-impl</artifactId>
-      <version>2.1</version>
+      <scope>runtime</scope>
     </dependency>
     <dependency>
-      <groupId>cornerstone-store</groupId>
+      <groupId>org.apache.avalon.cornerstone.store</groupId>
       <artifactId>cornerstone-store-api</artifactId>
-      <version>2.1</version>
     </dependency>
     <dependency>
       <groupId>dnsjava</groupId>
       <artifactId>dnsjava</artifactId>
-      <version>2.0.3</version>
     </dependency>
     <dependency>
-      <groupId>excalibur-pool</groupId>
+      <groupId>org.apache.excalibur.components</groupId>
       <artifactId>excalibur-pool-api</artifactId>
-      <version>2.1</version>
     </dependency>
     <dependency>
-      <groupId>excalibur-pool</groupId>
+      <groupId>org.apache.excalibur.components</groupId>
       <artifactId>excalibur-pool-impl</artifactId>
-      <version>2.1</version>
     </dependency>
     <dependency>
-      <groupId>cornerstone-threads</groupId>
+      <groupId>org.apache.avalon.cornerstone.threads</groupId>
       <artifactId>cornerstone-threads-api</artifactId>
-      <version>2.1</version>
     </dependency>
     <dependency>
-      <groupId>cornerstone-threads</groupId>
+      <groupId>org.apache.avalon.cornerstone.threads</groupId>
       <artifactId>cornerstone-threads-impl</artifactId>
-      <version>2.1</version>
+      <scope>runtime</scope>
     </dependency>
     <dependency>
-      <groupId>excalibur-thread</groupId>
+      <groupId>org.apache.excalibur.components</groupId>
       <artifactId>excalibur-thread-api</artifactId>
-      <version>2.1</version>
     </dependency>
     <dependency>
-      <groupId>excalibur-thread</groupId>
+      <groupId>org.apache.excalibur.components</groupId>
       <artifactId>excalibur-thread-impl</artifactId>
-      <version>2.1</version>
-      <exclusions>
-        <exclusion>
-          <artifactId>junitperf</artifactId>
-          <groupId>junitperf</groupId>
-        </exclusion>
-      </exclusions>
+      <scope>runtime</scope>
     </dependency>
     <dependency>
-      <groupId>avalon-logkit</groupId>
+      <groupId>org.apache.avalon.logkit</groupId>
       <artifactId>avalon-logkit</artifactId>
-      <version>2.1</version>
-      <exclusions>
-        <exclusion>
-          <artifactId>geronimo-spec-javamail</artifactId>
-          <groupId>geronimo-spec</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>geronimo-spec-jms</artifactId>
-          <groupId>geronimo-spec</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>servletapi</artifactId>
-          <groupId>servletapi</groupId>
-        </exclusion>
-      </exclusions>
+      <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>concurrent</groupId>
       <artifactId>concurrent</artifactId>
-      <version>1.3.4</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>commons-beanutils</groupId>
       <artifactId>commons-beanutils</artifactId>
-      <version>1.7.0</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>jmock</groupId>
       <artifactId>jmock</artifactId>
-      <version>1.1.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.derby</groupId>
       <artifactId>derby</artifactId>
-      <version>10.2.2.0</version>
+      <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>oro</groupId>
       <artifactId>oro</artifactId>
-      <version>2.0.8</version>
     </dependency>
     <dependency>
       <groupId>mstor</groupId>
       <artifactId>mstor</artifactId>
-      <version>0.9.9</version>
     </dependency>
     <dependency>
-      <groupId>xstream</groupId>
+    	<groupId>xml-apis</groupId>
+    	<artifactId>xml-apis</artifactId>
+    	<scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.thoughtworks.xstream</groupId>
       <artifactId>xstream</artifactId>
-      <version>1.2</version>
     </dependency>
     <dependency>
       <groupId>mx4j</groupId>
       <artifactId>mx4j-jmx</artifactId>
-      <version>1.1.1</version>
     </dependency>
   </dependencies>
-</project>
+</project>
\ No newline at end of file

Modified: james/server/trunk/experimental-seda-imap-function/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/experimental-seda-imap-function/pom.xml?rev=576181&r1=576180&r2=576181&view=diff
==============================================================================
--- james/server/trunk/experimental-seda-imap-function/pom.xml (original)
+++ james/server/trunk/experimental-seda-imap-function/pom.xml Sun Sep 16 14:29:31 2007
@@ -1,22 +1,23 @@
-<?xml version="1.0" encoding="ISO-8859-15"?><project>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.    
+<?xml version="1.0" encoding="ISO-8859-15"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.    
 -->
+<project>
   <parent>
     <artifactId>james-server</artifactId>
     <groupId>org.apache.james</groupId>
@@ -30,34 +31,53 @@
     <dependency>
       <groupId>javax.mail</groupId>
       <artifactId>mail</artifactId>
-      <version>1.4.1ea-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
       <artifactId>mailet</artifactId>
-      <version>3.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-imap-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
       <artifactId>james-server-core-library</artifactId>
-      <version>3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
       <artifactId>james-server-imap-codec-library</artifactId>
-      <version>3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
       <artifactId>james-server-imap-command-library</artifactId>
-      <version>3.0-SNAPSHOT</version>
+    </dependency>
+    
+    <dependency>
+      <groupId>concurrent</groupId>
+      <artifactId>concurrent</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.avalon.framework</groupId>
+      <artifactId>avalon-framework-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.avalon.cornerstone.connection</groupId>
+      <artifactId>cornerstone-connection-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.excalibur.components</groupId>
+      <artifactId>excalibur-pool-api</artifactId>
     </dependency>
     
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
-</project>
+</project>
\ No newline at end of file

Modified: james/server/trunk/fetchmail-function/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/fetchmail-function/pom.xml?rev=576181&r1=576180&r2=576181&view=diff
==============================================================================
--- james/server/trunk/fetchmail-function/pom.xml (original)
+++ james/server/trunk/fetchmail-function/pom.xml Sun Sep 16 14:29:31 2007
@@ -1,22 +1,23 @@
-<?xml version="1.0" encoding="ISO-8859-15"?><project>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.    
--->
+<?xml version="1.0" encoding="ISO-8859-15"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.    
+-->
+<project>
   <parent>
     <artifactId>james-server</artifactId>
     <groupId>org.apache.james</groupId>
@@ -27,29 +28,35 @@
   <artifactId>james-server-fetchmail-function</artifactId>
   <name>Apache JAMES Server FetchMail function</name>
   <dependencies>
-    <!--
     <dependency>
       <groupId>javax.mail</groupId>
       <artifactId>mail</artifactId>
-      <version>1.4.1ea-SNAPSHOT</version>
     </dependency>
-    -->
     <dependency>
       <groupId>org.apache.james</groupId>
       <artifactId>mailet</artifactId>
-      <version>3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
       <artifactId>james-server-core-library</artifactId>
-      <version>3.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.avalon.framework</groupId>
+      <artifactId>avalon-framework-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.avalon.framework</groupId>
+      <artifactId>avalon-framework-impl</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.avalon.cornerstone.scheduler</groupId>
+      <artifactId>cornerstone-scheduler-api</artifactId>
     </dependency>
     
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
-</project>
+</project>
\ No newline at end of file

Modified: james/server/trunk/imap-api/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-api/pom.xml?rev=576181&r1=576180&r2=576181&view=diff
==============================================================================
--- james/server/trunk/imap-api/pom.xml (original)
+++ james/server/trunk/imap-api/pom.xml Sun Sep 16 14:29:31 2007
@@ -1,22 +1,23 @@
-<?xml version="1.0" encoding="ISO-8859-15"?><project>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.    
+<?xml version="1.0" encoding="ISO-8859-15"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.    
 -->
+<project>
   <parent>
     <artifactId>james-server</artifactId>
     <groupId>org.apache.james</groupId>
@@ -30,26 +31,17 @@
     <dependency>
       <groupId>javax.mail</groupId>
       <artifactId>mail</artifactId>
-      <version>1.4.1ea-SNAPSHOT</version>
     </dependency>
-    <dependency>
-      <groupId>org.apache.james</groupId>
-      <artifactId>mailet</artifactId>
-      <version>3.0-SNAPSHOT</version>
-    </dependency>
-    <!--
-    <dependency>
-      <groupId>org.apache.james</groupId>
-      <artifactId>james-server-core-library</artifactId>
-      <version>3.0-SNAPSHOT</version>
-    </dependency>
-    -->
     
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>jmock</groupId>
+      <artifactId>jmock</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>
-</project>
+</project>
\ No newline at end of file

Modified: james/server/trunk/imap-codec-library/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-codec-library/pom.xml?rev=576181&r1=576180&r2=576181&view=diff
==============================================================================
--- james/server/trunk/imap-codec-library/pom.xml (original)
+++ james/server/trunk/imap-codec-library/pom.xml Sun Sep 16 14:29:31 2007
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="ISO-8859-15"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.    
+<?xml version="1.0" encoding="ISO-8859-15"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.    
 -->
 <project>
   <parent>
@@ -31,41 +31,31 @@
     <dependency>
       <groupId>javax.mail</groupId>
       <artifactId>mail</artifactId>
-      <version>1.4.1ea-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.james</groupId>
-      <artifactId>mailet</artifactId>
-      <version>3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
       <artifactId>james-server-imap-api</artifactId>
-      <version>3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>avalon-framework</groupId>
+      <groupId>org.apache.avalon.framework</groupId>
       <artifactId>avalon-framework-api</artifactId>
-      <version>4.3</version>
-      <exclusions>
-        <exclusion>
-          <artifactId>avalon-logkit</artifactId>
-          <groupId>avalon-logkit</groupId>
-        </exclusion>
-      </exclusions>
     </dependency>
 
     <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-imap-api</artifactId>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>jmock</groupId>
       <artifactId>jmock</artifactId>
-      <version>1.1.0</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
-</project>
+</project>
\ No newline at end of file

Modified: james/server/trunk/imap-command-library/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-command-library/pom.xml?rev=576181&r1=576180&r2=576181&view=diff
==============================================================================
--- james/server/trunk/imap-command-library/pom.xml (original)
+++ james/server/trunk/imap-command-library/pom.xml Sun Sep 16 14:29:31 2007
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="ISO-8859-15"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.    
+<?xml version="1.0" encoding="ISO-8859-15"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.    
 -->
 <project>
   <parent>
@@ -29,37 +29,18 @@
   <name>Apache JAMES Server IMAP Command Library</name>
   <dependencies>
     <dependency>
-      <groupId>javax.mail</groupId>
-      <artifactId>mail</artifactId>
-      <version>1.4.1ea-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.james</groupId>
-      <artifactId>mailet</artifactId>
-      <version>3.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
       <groupId>org.apache.james</groupId>
       <artifactId>james-server-imap-api</artifactId>
-      <version>3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>avalon-framework</groupId>
+      <groupId>org.apache.avalon.framework</groupId>
       <artifactId>avalon-framework-api</artifactId>
-      <version>4.3</version>
-      <exclusions>
-        <exclusion>
-          <artifactId>avalon-logkit</artifactId>
-          <groupId>avalon-logkit</groupId>
-        </exclusion>
-      </exclusions>
     </dependency>
 
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
-</project>
+</project>
\ No newline at end of file

Modified: james/server/trunk/imap-mailbox-processor-function/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/imap-mailbox-processor-function/pom.xml?rev=576181&r1=576180&r2=576181&view=diff
==============================================================================
--- james/server/trunk/imap-mailbox-processor-function/pom.xml (original)
+++ james/server/trunk/imap-mailbox-processor-function/pom.xml Sun Sep 16 14:29:31 2007
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="ISO-8859-15"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.    
+<?xml version="1.0" encoding="ISO-8859-15"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.    
 -->
 <project>
   <parent>
@@ -33,45 +33,36 @@
     <dependency>
       <groupId>javax.mail</groupId>
       <artifactId>mail</artifactId>
-      <version>1.4.1ea-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
       <artifactId>mailet</artifactId>
-      <version>3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>avalon-framework</groupId>
+      <groupId>org.apache.avalon.framework</groupId>
       <artifactId>avalon-framework-api</artifactId>
-      <version>4.3</version>
-      <exclusions>
-        <exclusion>
-          <artifactId>avalon-logkit</artifactId>
-          <groupId>avalon-logkit</groupId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
       <artifactId>james-server-imap-api</artifactId>
-      <version>3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
       <artifactId>james-server-imapmailbox-library</artifactId>
-      <version>3.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-core-library</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
       <artifactId>james-server-imap-codec-library</artifactId>
-      <version>3.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
-</project>
+</project>
\ No newline at end of file

Modified: james/server/trunk/imapmailbox-library/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/imapmailbox-library/pom.xml?rev=576181&r1=576180&r2=576181&view=diff
==============================================================================
--- james/server/trunk/imapmailbox-library/pom.xml (original)
+++ james/server/trunk/imapmailbox-library/pom.xml Sun Sep 16 14:29:31 2007
@@ -1,22 +1,23 @@
-<?xml version="1.0" encoding="ISO-8859-15"?><project>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.    
+<?xml version="1.0" encoding="ISO-8859-15"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.    
 -->
+<project>
   <parent>
     <artifactId>james-server</artifactId>
     <groupId>org.apache.james</groupId>
@@ -27,29 +28,27 @@
   <artifactId>james-server-imapmailbox-library</artifactId>
   <name>Apache JAMES Server Imap Mailbox Library</name>
   <dependencies>
-    <!--
     <dependency>
       <groupId>javax.mail</groupId>
       <artifactId>mail</artifactId>
-      <version>1.4.1ea-SNAPSHOT</version>
     </dependency>
-    -->
+    <dependency>
+      <groupId>org.apache.avalon.framework</groupId>
+      <artifactId>avalon-framework-api</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
       <artifactId>mailet</artifactId>
-      <version>3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
       <artifactId>james-server-core-library</artifactId>
-      <version>3.0-SNAPSHOT</version>
     </dependency>
     
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
-</project>
+</project>
\ No newline at end of file

Modified: james/server/trunk/imapserver-function/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/imapserver-function/pom.xml?rev=576181&r1=576180&r2=576181&view=diff
==============================================================================
--- james/server/trunk/imapserver-function/pom.xml (original)
+++ james/server/trunk/imapserver-function/pom.xml Sun Sep 16 14:29:31 2007
@@ -1,22 +1,23 @@
-<?xml version="1.0" encoding="ISO-8859-15"?><project>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.    
+<?xml version="1.0" encoding="ISO-8859-15"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.    
 -->
+<project>
   <parent>
     <artifactId>james-server</artifactId>
     <groupId>org.apache.james</groupId>
@@ -27,44 +28,48 @@
   <artifactId>james-server-imapserver-function</artifactId>
   <name>Apache JAMES Server IMAP function</name>
   <dependencies>
-    <!--
-    <dependency>
-      <groupId>javax.mail</groupId>
-      <artifactId>mail</artifactId>
-      <version>1.4.1ea-SNAPSHOT</version>
-    </dependency>
-    -->
     <dependency>
       <groupId>org.apache.james</groupId>
       <artifactId>mailet</artifactId>
-      <version>3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
       <artifactId>james-server-core-library</artifactId>
-      <version>3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
       <artifactId>james-server-imapmailbox-library</artifactId>
-      <version>3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
       <artifactId>james-server-imap-api</artifactId>
-      <version>3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
       <artifactId>james-server-imap-codec-library</artifactId>
-      <version>3.0-SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.avalon.framework</groupId>
+      <artifactId>avalon-framework-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>javax.mail</groupId>
+      <artifactId>mail</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.avalon.cornerstone.connection</groupId>
+      <artifactId>cornerstone-connection-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.excalibur.components</groupId>
+      <artifactId>excalibur-pool-api</artifactId>
     </dependency>
     
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
-</project>
+</project>
\ No newline at end of file

Modified: james/server/trunk/include.properties
URL: http://svn.apache.org/viewvc/james/server/trunk/include.properties?rev=576181&r1=576180&r2=576181&view=diff
==============================================================================
--- james/server/trunk/include.properties (original)
+++ james/server/trunk/include.properties Sun Sep 16 14:29:31 2007
@@ -50,26 +50,26 @@
 path.lib.bouncycastle=org.bouncycastle/jars
 path.lib.james=org.apache.james/jars
 path.lib.javamail=javax.mail/jars
-path.lib.avalon=avalon-framework/jars
+path.lib.avalon=org.apache.avalon.framework/jars
 path.lib.commonsdbcp=commons-dbcp/jars
 path.lib.commonscollections=commons-collections/jars
-path.lib.cornerstonethreads=cornerstone-threads/jars
-path.lib.cornerstoneconnection=cornerstone-connection/jars
-path.lib.cornerstonesockets=cornerstone-sockets/jars
-path.lib.cornerstonedatasources=cornerstone-datasources/jars
-path.lib.excaliburdatasource=excalibur-datasource/jars
-path.lib.cornerstonescheduler=cornerstone-scheduler/jars
-path.lib.cornerstonestore=cornerstone-store/jars
+path.lib.cornerstonethreads=org.apache.avalon.cornerstone.threads/jars
+path.lib.cornerstoneconnection=org.apache.avalon.cornerstone.connection/jars
+path.lib.cornerstonesockets=org.apache.avalon.cornerstone.sockets/jars
+path.lib.cornerstonedatasources=org.apache.avalon.cornerstone.datasources/jars
+path.lib.excaliburdatasource=org.apache.excalibur.components/jars
+path.lib.cornerstonescheduler=org.apache.avalon.cornerstone.scheduler/jars
+path.lib.cornerstonestore=org.apache.avalon.cornerstone.store/jars
 path.lib.dns=dnsjava/jars
-path.lib.excaliburthread=excalibur-thread/jars
-path.lib.logkit=avalon-logkit/jars
+path.lib.excaliburthread=org.apache.excalibur.components/jars
+path.lib.logkit=org.apache.avalon.logkit/jars
 path.lib.derby=org.apache.derby/jars
 path.lib.oro=oro/jars
 path.lib.mstor=mstor/jars
-path.lib.xstream=xstream/jars
+path.lib.xstream=com.thoughtworks.xstream/jars
 path.lib.mx4j=mx4j/jars
-path.lib.torque=torque/jars
-path.lib.excaliburpool=excalibur-pool/jars
+path.lib.torque=org.apache.db.torque/jars
+path.lib.excaliburpool=org.apache.excalibur.components/jars
 path.lib.concurrent=concurrent/jars
 path.lib.commonslogging=commons-logging/jars
 path.lib.village=village/jars
@@ -77,7 +77,7 @@
 path.lib.commonsbeanutils=commons-beanutils/jars
 path.lib.commonsdigester=commons-digester/jars
 path.lib.jdom=jdom/jars
-path.lib.activation=activation/jars
+path.lib.activation=javax.activation/jars
 path.lib.commonspool=commons-pool/jars
 path.lib.commonslang=commons-lang/jars
 path.lib.commonsnet=commons-net/jars
@@ -89,17 +89,17 @@
 # --------------------------------------------------
 
 # ----- Avalon Framework -----
-jarname.avalon-framework.jar=avalon-framework-api-4.3.jar
+jarname.avalon-framework.jar=avalon-framework-api-4.3.1.jar
 avalon-framework.jar=${path.lib.avalon}/${jarname.avalon-framework.jar}
 
 # ----- Avalon Framework -----
-jarnama.avalon-framework-impl.jar=avalon-framework-impl-4.3.jar
+jarnama.avalon-framework-impl.jar=avalon-framework-impl-4.3.1.jar
 avalon-framework-impl.jar=${path.lib.avalon}/${jarnama.avalon-framework-impl.jar}
 
 # ----- From lib
 
 # ----- Excalibur datasource -----
-jarname.excalibur-datasource.jar=excalibur-datasource-2.1.jar
+jarname.excalibur-datasource.jar=excalibur-datasource-2.2.2.jar
 excalibur-datasource.jar=${path.lib.excaliburdatasource}/${jarname.excalibur-datasource.jar}
 
 # ----- Javax mail -----
@@ -113,7 +113,7 @@
 javax-activation.jar=${path.lib.activation}/${jarname.javax-activation.jar}
 
 # ----- DNS -----
-jarname.dns.jar=dnsjava-2.0.3.jar
+jarname.dns.jar=dnsjava-2.0.5.jar
 dns.jar=${path.lib.dns}/${jarname.dns.jar}
 
 # ----- Commons -----
@@ -129,49 +129,49 @@
 jakarta-oro.jar=${path.lib.oro}/${jarname.jakarta-oro.jar}
 
 # ----- Cornerstone threads, version 1.0 or later -----
-jarname.cornerstone-threads-api.jar=cornerstone-threads-api-2.1.jar
+jarname.cornerstone-threads-api.jar=cornerstone-threads-api-2.2.2.jar
 cornerstone-threads-api.jar=${path.lib.cornerstonethreads}/${jarname.cornerstone-threads-api.jar}
-jarname.cornerstone-threads-impl.jar=cornerstone-threads-impl-2.1.jar
+jarname.cornerstone-threads-impl.jar=cornerstone-threads-impl-2.2.2.jar
 cornerstone-threads-impl.jar=${path.lib.cornerstonethreads}/${jarname.cornerstone-threads-impl.jar}
 
 # ----- Cornerstone connection, version 1.0 or later -----
-jarname.cornerstone-connection-api.jar=cornerstone-connection-api-2.1.jar
+jarname.cornerstone-connection-api.jar=cornerstone-connection-api-2.2.2.jar
 cornerstone-connection-api.jar=${path.lib.cornerstoneconnection}/${jarname.cornerstone-connection-api.jar}
-jarname.cornerstone-connection-impl.jar=cornerstone-connection-impl-2.1.jar
+jarname.cornerstone-connection-impl.jar=cornerstone-connection-impl-2.2.2.jar
 cornerstone-connection-impl.jar=${path.lib.cornerstoneconnection}/${jarname.cornerstone-connection-impl.jar}
 
 # ----- Cornerstone masterstore, version 1.0 or later -----
-jarname.cornerstone-store-api.jar=cornerstone-store-api-2.1.jar
+jarname.cornerstone-store-api.jar=cornerstone-store-api-2.2.2.jar
 cornerstone-store-api.jar=${path.lib.cornerstonestore}/${jarname.cornerstone-store-api.jar}
 
 # ----- Cornerstone sockets, version 1.0 or later -----
-jarname.cornerstone-sockets-api.jar=cornerstone-sockets-api-2.1.jar
+jarname.cornerstone-sockets-api.jar=cornerstone-sockets-api-2.2.2.jar
 cornerstone-sockets-api.jar=${path.lib.cornerstonesockets}/${jarname.cornerstone-sockets-api.jar}
-jarname.cornerstone-sockets-impl.jar=cornerstone-sockets-impl-2.1-patched.jar
+jarname.cornerstone-sockets-impl.jar=cornerstone-sockets-impl-2.2.2.jar
 cornerstone-sockets-impl.jar=${path.lib.cornerstonesockets}/${jarname.cornerstone-sockets-impl.jar}
 
 # ----- Cornerstone scheduler, version 1.0 or later -----
-jarname.cornerstone-scheduler-api.jar=cornerstone-scheduler-api-2.1.jar
+jarname.cornerstone-scheduler-api.jar=cornerstone-scheduler-api-2.2.2.jar
 cornerstone-scheduler-api.jar=${path.lib.cornerstonescheduler}/${jarname.cornerstone-scheduler-api.jar}
-jarname.cornerstone-scheduler-impl.jar=cornerstone-scheduler-impl-2.1.jar
+jarname.cornerstone-scheduler-impl.jar=cornerstone-scheduler-impl-2.2.2.jar
 cornerstone-scheduler-impl.jar=${path.lib.cornerstonescheduler}/${jarname.cornerstone-scheduler-impl.jar}
 
 # ----- Cornerstone scheduler, version 1.0 or later -----
-jarname.cornerstone-datasources-api.jar=cornerstone-datasources-api-2.1.jar
+jarname.cornerstone-datasources-api.jar=cornerstone-datasources-api-2.2.2.jar
 cornerstone-datasources-api.jar=${path.lib.cornerstonedatasources}/${jarname.cornerstone-datasources-api.jar}
-jarname.cornerstone-datasources-impl.jar=cornerstone-datasources-impl-2.1-patched.jar
+jarname.cornerstone-datasources-impl.jar=cornerstone-datasources-impl-2.2.2.jar
 cornerstone-datasources-impl.jar=${path.lib.cornerstonedatasources}/${jarname.cornerstone-datasources-impl.jar}
 
 # ----- Excalibur thread, version 1.0 or later -----
-jarname.excalibur-thread-api.jar=excalibur-thread-api-2.1.jar
+jarname.excalibur-thread-api.jar=excalibur-thread-api-2.2.1.jar
 excalibur-thread-api.jar=${path.lib.excaliburthread}/${jarname.excalibur-thread-api.jar}
-jarname.excalibur-thread-impl.jar=excalibur-thread-impl-2.1.jar
+jarname.excalibur-thread-impl.jar=excalibur-thread-impl-2.2.1.jar
 excalibur-thread-impl.jar=${path.lib.excaliburthread}/${jarname.excalibur-thread-impl.jar}
 
 # ----- Excalibur pool -----
-jarname.excalibur-pool-api.jar=excalibur-pool-api-2.1.jar
+jarname.excalibur-pool-api.jar=excalibur-pool-api-2.2.1.jar
 excalibur-pool-api.jar=${path.lib.excaliburpool}/${jarname.excalibur-pool-api.jar}
-jarname.excalibur-pool-impl.jar=excalibur-pool-impl-2.1.jar
+jarname.excalibur-pool-impl.jar=excalibur-pool-impl-2.2.1.jar
 excalibur-pool-impl.jar=${path.lib.excaliburpool}/${jarname.excalibur-pool-impl.jar}
 
 jarname.concurrent.jar=concurrent-1.3.4.jar
@@ -201,7 +201,7 @@
 
 # ----- torque -----
 
-jarname.torque.jar=torque-3.3-RC1.jar
+jarname.torque.jar=runtime-3.3-RC2.jar
 torque.jar=${path.lib.torque}/${jarname.torque.jar}
 jarname.village.jar=village-2.0.jar
 village.jar=${path.lib.village}/${jarname.village.jar}
@@ -228,7 +228,7 @@
 
 
 # ----- Logging
-jarname.avalon-logkit.jar=avalon-logkit-2.1.jar
+jarname.avalon-logkit.jar=avalon-logkit-2.2.1.jar
 avalon-logkit.jar=${path.lib.logkit}/${jarname.avalon-logkit.jar}
 
 # --------------------------------------------------

Modified: james/server/trunk/mordred-library/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/mordred-library/pom.xml?rev=576181&r1=576180&r2=576181&view=diff
==============================================================================
--- james/server/trunk/mordred-library/pom.xml (original)
+++ james/server/trunk/mordred-library/pom.xml Sun Sep 16 14:29:31 2007
@@ -1,22 +1,23 @@
-<?xml version="1.0" encoding="ISO-8859-15"?><project>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.    
+<?xml version="1.0" encoding="ISO-8859-15"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.    
 -->
+<project>
   <parent>
     <artifactId>james-server</artifactId>
     <groupId>org.apache.james</groupId>
@@ -28,70 +29,31 @@
   <name>Apache JAMES Server Mordred Data Source Library</name>
   <dependencies>
     <dependency>
+      <groupId>org.apache.avalon.framework</groupId>
+      <artifactId>avalon-framework-api</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.apache.avalon.cornerstone.datasources</groupId>
       <artifactId>cornerstone-datasources-api</artifactId>
-      <version>2.2.1</version>
+      <scope>runtime</scope>
     </dependency>
     <dependency>
-      <groupId>cornerstone-datasources</groupId>
+      <groupId>org.apache.avalon.cornerstone.datasources</groupId>
       <artifactId>cornerstone-datasources-api</artifactId>
-      <version>2.1</version>
+      <scope>runtime</scope>
     </dependency>
     <dependency>
-      <groupId>excalibur-datasource</groupId>
+      <groupId>org.apache.excalibur.components</groupId>
       <artifactId>excalibur-datasource</artifactId>
-      <version>2.1</version>
-      <exclusions>
-        <exclusion>
-          <artifactId>excalibur-pool-instrumented</artifactId>
-          <groupId>excalibur-pool</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>excalibur-component</artifactId>
-          <groupId>excalibur-component</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>excalibur-testcase</artifactId>
-          <groupId>excalibur-component</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>excalibur-fortress</artifactId>
-          <groupId>excalibur-fortress</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>excalibur-fortress-container-api</artifactId>
-          <groupId>excalibur-fortress</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>excalibur-logger</artifactId>
-          <groupId>excalibur-logger</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>hsqldb</artifactId>
-          <groupId>hsqldb</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>excalibur-fortress-meta</artifactId>
-          <groupId>excalibur-fortress</groupId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
-      <groupId>cornerstone-datasources</groupId>
+      <groupId>org.apache.avalon.cornerstone.datasources</groupId>
       <artifactId>cornerstone-datasources-impl</artifactId>
-      <version>2.1-patched</version>
-      <exclusions>
-        <exclusion>
-          <artifactId>d-haven-managed-pool</artifactId>
-          <groupId>d-haven-managed-pool</groupId>
-        </exclusion>
-      </exclusions>
     </dependency>
     
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

Modified: james/server/trunk/nntpserver-function/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/nntpserver-function/pom.xml?rev=576181&r1=576180&r2=576181&view=diff
==============================================================================
--- james/server/trunk/nntpserver-function/pom.xml (original)
+++ james/server/trunk/nntpserver-function/pom.xml Sun Sep 16 14:29:31 2007
@@ -1,22 +1,23 @@
-<?xml version="1.0" encoding="ISO-8859-15"?><project>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.    
+<?xml version="1.0" encoding="ISO-8859-15"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.    
 -->
+<project>
   <parent>
     <artifactId>james-server</artifactId>
     <groupId>org.apache.james</groupId>
@@ -27,29 +28,42 @@
   <artifactId>james-server-nntpserver-function</artifactId>
   <name>Apache JAMES Server NNTP function</name>
   <dependencies>
-    <!--
     <dependency>
       <groupId>javax.mail</groupId>
       <artifactId>mail</artifactId>
-      <version>1.4.1ea-SNAPSHOT</version>
     </dependency>
-    -->
+    <dependency>
+      <groupId>javax.activation</groupId>
+      <artifactId>activation</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
       <artifactId>mailet</artifactId>
-      <version>3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
       <artifactId>james-server-core-library</artifactId>
-      <version>3.0-SNAPSHOT</version>
+    </dependency>
+    
+    <dependency>
+      <groupId>oro</groupId>
+      <artifactId>oro</artifactId>
+    </dependency>
+    
+
+    <dependency>
+      <groupId>org.apache.avalon.framework</groupId>
+      <artifactId>avalon-framework-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.avalon.framework</groupId>
+      <artifactId>avalon-framework-impl</artifactId>
     </dependency>
     
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
-</project>
+</project>
\ No newline at end of file

Modified: james/server/trunk/phoenix-deployment/build.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/build.xml?rev=576181&r1=576180&r2=576181&view=diff
==============================================================================
--- james/server/trunk/phoenix-deployment/build.xml (original)
+++ james/server/trunk/phoenix-deployment/build.xml Sun Sep 16 14:29:31 2007
@@ -342,7 +342,7 @@
     <target name="javadocs">
 
         <echo message="Making James Javadocs"/>
-
+<!--
         <delete dir="${build.javadocs}"/>
         <mkdir dir="${build.javadocs}"/>
         <javadoc packagenames="org.apache.*" sourcepath="" destdir="${build.javadocs}">
@@ -376,7 +376,7 @@
               </fileset>
             </sourcefiles>
         </javadoc>
-        
+    -->    
     </target>
 
     <!--

Modified: james/server/trunk/phoenix-deployment/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/pom.xml?rev=576181&r1=576180&r2=576181&view=diff
==============================================================================
--- james/server/trunk/phoenix-deployment/pom.xml (original)
+++ james/server/trunk/phoenix-deployment/pom.xml Sun Sep 16 14:29:31 2007
@@ -1,4 +1,23 @@
-<?xml version="1.0" encoding="ISO-8859-15"?><project>
+<?xml version="1.0" encoding="ISO-8859-15"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.    
+-->
+<project>
   <parent>
     <artifactId>james-server</artifactId>
     <groupId>org.apache.james</groupId>
@@ -35,82 +54,161 @@
     <dependency>
       <groupId>org.apache.james</groupId>
       <artifactId>mailet</artifactId>
-      <version>3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
       <artifactId>james-server-core-library</artifactId>
-      <version>3.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.james</groupId>
       <artifactId>james-server-smtpserver-function</artifactId>
-      <version>3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
       <artifactId>james-server-pop3server-function</artifactId>
-      <version>3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
       <artifactId>james-server-imapserver-function</artifactId>
-      <version>3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
       <artifactId>james-server-nntpserver-function</artifactId>
-      <version>3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
       <artifactId>james-server-fetchmail-function</artifactId>
-      <version>3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
       <artifactId>james-server-spoolmanager-function</artifactId>
-      <version>3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
       <artifactId>james-server-remotemanager-function</artifactId>
-      <version>3.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.james</groupId>
       <artifactId>james-server-torque-mailboxmanager-function</artifactId>
-      <version>3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
       <artifactId>james-server-imap-mailbox-processor-function</artifactId>
-      <version>3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
       <artifactId>james-server-experimental-seda-imap-function</artifactId>
-      <version>3.0-SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>jspf</artifactId>
+    </dependency>
+
+    <dependency>
+    	<groupId>xml-apis</groupId>
+    	<artifactId>xml-apis</artifactId>
+    	<scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.avalon.framework</groupId>
+      <artifactId>avalon-framework-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.avalon.framework</groupId>
+      <artifactId>avalon-framework-impl</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>oro</groupId>
+      <artifactId>oro</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.avalon.cornerstone.threads</groupId>
+      <artifactId>cornerstone-threads-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.excalibur.components</groupId>
+      <artifactId>excalibur-thread-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.avalon.cornerstone.datasources</groupId>
+      <artifactId>cornerstone-datasources-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.avalon.cornerstone.sockets</groupId>
+      <artifactId>cornerstone-sockets-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.db.torque</groupId>
+      <artifactId>runtime</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.avalon.cornerstone.sockets</groupId>
+      <artifactId>cornerstone-sockets-impl</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.excalibur.components</groupId>
+      <artifactId>excalibur-thread-impl</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>javax.activation</groupId>
+      <artifactId>activation</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.avalon.cornerstone.datasources</groupId>
+      <artifactId>cornerstone-datasources-impl</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.excalibur.components</groupId>
+      <artifactId>excalibur-datasource</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-imapmailbox-library</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>dnsjava</groupId>
+      <artifactId>dnsjava</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>javax.mail</groupId>
+      <artifactId>mail</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.avalon.cornerstone.store</groupId>
+      <artifactId>cornerstone-store-api</artifactId>
     </dependency>
     
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>commons-net</groupId>
       <artifactId>commons-net</artifactId>
-      <version>1.4.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>jmock</groupId>
       <artifactId>jmock</artifactId>
-      <version>1.1.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-experimental-seda-imap-function</artifactId>
+      <type>test-jar</type>
       <scope>test</scope>
     </dependency>
   </dependencies>



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


Mime
View raw message