james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b...@apache.org
Subject svn commit: r685109 - in /james/postage/trunk: ./ src/main/java/org/apache/james/postage/smtpserver/ stage/org.apache.james/jars/ stage/org.apache.james/poms/
Date Tue, 12 Aug 2008 10:05:26 GMT
Author: bago
Date: Tue Aug 12 03:05:22 2008
New Revision: 685109

URL: http://svn.apache.org/viewvc?rev=685109&view=rev
Log:
Updated postage dependencies to reflect server-trunk changes (few more jars and service.DNSServer
repackaged to domain.DNSService)

Added:
    james/postage/trunk/stage/org.apache.james/jars/james-server-avalon-socket-library-3.0-SNAPSHOT.jar
  (with props)
    james/postage/trunk/stage/org.apache.james/jars/james-server-common-util-3.0-SNAPSHOT.jar
  (with props)
    james/postage/trunk/stage/org.apache.james/jars/james-server-core-api-3.0-SNAPSHOT.jar
  (with props)
    james/postage/trunk/stage/org.apache.james/jars/james-server-core-function-3.0-SNAPSHOT.jar
  (with props)
    james/postage/trunk/stage/org.apache.james/poms/james-server-avalon-socket-library-3.0-SNAPSHOT.pom
  (with props)
    james/postage/trunk/stage/org.apache.james/poms/james-server-common-util-3.0-SNAPSHOT.pom
  (with props)
    james/postage/trunk/stage/org.apache.james/poms/james-server-core-api-3.0-SNAPSHOT.pom
  (with props)
    james/postage/trunk/stage/org.apache.james/poms/james-server-core-function-3.0-SNAPSHOT.pom
  (with props)
Modified:
    james/postage/trunk/build.xml
    james/postage/trunk/pom.xml
    james/postage/trunk/src/main/java/org/apache/james/postage/smtpserver/SMTPMailSink.java
    james/postage/trunk/stage/org.apache.james/jars/james-server-core-library-3.0-SNAPSHOT.jar
    james/postage/trunk/stage/org.apache.james/jars/james-server-domain-api-3.0-SNAPSHOT.jar
    james/postage/trunk/stage/org.apache.james/jars/james-server-smtpserver-function-3.0-SNAPSHOT.jar
    james/postage/trunk/stage/org.apache.james/jars/james-server-user-api-3.0-SNAPSHOT.jar
    james/postage/trunk/stage/org.apache.james/poms/james-server-core-library-3.0-SNAPSHOT.pom
    james/postage/trunk/stage/org.apache.james/poms/james-server-domain-api-3.0-SNAPSHOT.pom
    james/postage/trunk/stage/org.apache.james/poms/james-server-smtpserver-function-3.0-SNAPSHOT.pom
    james/postage/trunk/stage/org.apache.james/poms/james-server-user-api-3.0-SNAPSHOT.pom

Modified: james/postage/trunk/build.xml
URL: http://svn.apache.org/viewvc/james/postage/trunk/build.xml?rev=685109&r1=685108&r2=685109&view=diff
==============================================================================
--- james/postage/trunk/build.xml (original)
+++ james/postage/trunk/build.xml Tue Aug 12 03:05:22 2008
@@ -57,14 +57,17 @@
             	<include name="org.apache.excalibur.components/jars/excalibur-pool-api-2.2.1.jar"
/>
               <include name="org.apache.james/jars/mailet-2.4-SNAPSHOT.jar"/>
               <include name="org.apache.james/jars/james-server-domain-api-3.0-SNAPSHOT.jar"/>
-              <!-- BUILD TIME ONLY -->
-            	<include name="org.apache.james/jars/james-server-core-library-3.0-SNAPSHOT.jar"/>
+            	<include name="org.apache.james/jars/james-server-core-api-3.0-SNAPSHOT.jar"/>
+              <include name="org.apache.james/jars/james-server-avalon-socket-library-3.0-SNAPSHOT.jar"/>
+            	<include name="org.apache.james/jars/james-server-core-function-3.0-SNAPSHOT.jar"/>
+            	<include name="org.apache.james/jars/james-server-common-util-3.0-SNAPSHOT.jar"/>
               <include name="org.apache.james/jars/james-server-smtpserver-function-3.0-SNAPSHOT.jar"/>
+              <!-- BUILD TIME ONLY -->
             </fileset>
         </path>
 
         <path id="java.run.classpath">
-            <fileset dir="${basedir}/build/lib/">
+            <fileset dir="${dir.build.lib}">
                 <include name="postage.jar"/>
             </fileset>
             <fileset dir="${dir.stage}">
@@ -85,10 +88,13 @@
             	<include name="org.apache.excalibur.components/jars/excalibur-thread-api-2.2.1.jar"
/>
             	<include name="org.apache.excalibur.components/jars/excalibur-thread-impl-2.2.1.jar"
/>
             	<include name="org.apache.excalibur.components/jars/excalibur-pool-api-2.2.1.jar"
/>
-              <include name="org.apache.james/jars/james-server-core-library-3.0-SNAPSHOT.jar"/>
-              <include name="org.apache.james/jars/james-server-smtpserver-function-3.0-SNAPSHOT.jar"/>
               <include name="org.apache.james/jars/mailet-2.4-SNAPSHOT.jar"/>
               <include name="org.apache.james/jars/james-server-domain-api-3.0-SNAPSHOT.jar"/>
+            	<include name="org.apache.james/jars/james-server-core-api-3.0-SNAPSHOT.jar"/>
+              <include name="org.apache.james/jars/james-server-avalon-socket-library-3.0-SNAPSHOT.jar"/>
+            	<include name="org.apache.james/jars/james-server-core-function-3.0-SNAPSHOT.jar"/>
+            	<include name="org.apache.james/jars/james-server-common-util-3.0-SNAPSHOT.jar"/>
+              <include name="org.apache.james/jars/james-server-smtpserver-function-3.0-SNAPSHOT.jar"/>
               <!-- RUNTIME ONLY -->
             	<include name="concurrent/jars/concurrent-1.3.4.jar" />
             	<include name="org.apache.excalibur.components/jars/excalibur-pool-impl-2.2.1.jar"
/>

Modified: james/postage/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/postage/trunk/pom.xml?rev=685109&r1=685108&r2=685109&view=diff
==============================================================================
--- james/postage/trunk/pom.xml (original)
+++ james/postage/trunk/pom.xml Tue Aug 12 03:05:22 2008
@@ -186,9 +186,9 @@
     </dependency>
     
     <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-      <version>2.3</version>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+      <version>3.1</version>
     </dependency>
     
     <dependency>
@@ -338,12 +338,14 @@
       <scope>runtime</scope>
     </dependency>
 
+    <!-- 
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>3.8.1</version>
       <scope>test</scope>
     </dependency>
+     -->
 
 
     <dependency>
@@ -363,9 +365,36 @@
     </dependency>
     <dependency>
     	<groupId>org.apache.james</groupId>
+    	<artifactId>james-server-avalon-socket-library</artifactId>
+    	<version>3.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+    	<groupId>org.apache.james</groupId>
+    	<artifactId>james-server-common-util</artifactId>
+    	<version>3.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+    	<groupId>org.apache.james</groupId>
+    	<artifactId>james-server-core-function</artifactId>
+    	<version>3.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+    	<groupId>org.apache.james</groupId>
+    	<artifactId>james-server-core-api</artifactId>
+    	<version>3.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+    	<groupId>org.apache.james</groupId>
+    	<artifactId>james-server-domain-api</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>

Modified: james/postage/trunk/src/main/java/org/apache/james/postage/smtpserver/SMTPMailSink.java
URL: http://svn.apache.org/viewvc/james/postage/trunk/src/main/java/org/apache/james/postage/smtpserver/SMTPMailSink.java?rev=685109&r1=685108&r2=685109&view=diff
==============================================================================
--- james/postage/trunk/src/main/java/org/apache/james/postage/smtpserver/SMTPMailSink.java
(original)
+++ james/postage/trunk/src/main/java/org/apache/james/postage/smtpserver/SMTPMailSink.java
Tue Aug 12 03:05:22 2008
@@ -32,12 +32,13 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.excalibur.thread.ThreadPool;
+import org.apache.james.api.dnsservice.DNSService;
 import org.apache.james.dnsserver.DNSServer;
 import org.apache.james.postage.SamplingException;
 import org.apache.james.postage.execution.Sampler;
 import org.apache.james.postage.result.PostageRunnerResult;
-import org.apache.james.services.JamesConnectionManager;
 import org.apache.james.smtpserver.SMTPServer;
+import org.apache.james.socket.JamesConnectionManager;
 import org.apache.james.util.connection.SimpleConnectionManager;
 
 /**
@@ -87,7 +88,7 @@
         server.enableLogging(new AvalonToPostageLogger());
         server.configure(new DefaultConfiguration("dnsserver"));
         server.initialize();
-                serviceManager.put("org.apache.james.services.DNSServer", server);
+                serviceManager.put(DNSService.ROLE, server);
         serviceManager.put(SocketManager.ROLE, this);
         serviceManager.put(ThreadManager.ROLE, this);
         return serviceManager;

Added: james/postage/trunk/stage/org.apache.james/jars/james-server-avalon-socket-library-3.0-SNAPSHOT.jar
URL: http://svn.apache.org/viewvc/james/postage/trunk/stage/org.apache.james/jars/james-server-avalon-socket-library-3.0-SNAPSHOT.jar?rev=685109&view=auto
==============================================================================
Binary file - no diff available.

Propchange: james/postage/trunk/stage/org.apache.james/jars/james-server-avalon-socket-library-3.0-SNAPSHOT.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: james/postage/trunk/stage/org.apache.james/jars/james-server-common-util-3.0-SNAPSHOT.jar
URL: http://svn.apache.org/viewvc/james/postage/trunk/stage/org.apache.james/jars/james-server-common-util-3.0-SNAPSHOT.jar?rev=685109&view=auto
==============================================================================
Binary file - no diff available.

Propchange: james/postage/trunk/stage/org.apache.james/jars/james-server-common-util-3.0-SNAPSHOT.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: james/postage/trunk/stage/org.apache.james/jars/james-server-core-api-3.0-SNAPSHOT.jar
URL: http://svn.apache.org/viewvc/james/postage/trunk/stage/org.apache.james/jars/james-server-core-api-3.0-SNAPSHOT.jar?rev=685109&view=auto
==============================================================================
Binary file - no diff available.

Propchange: james/postage/trunk/stage/org.apache.james/jars/james-server-core-api-3.0-SNAPSHOT.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: james/postage/trunk/stage/org.apache.james/jars/james-server-core-function-3.0-SNAPSHOT.jar
URL: http://svn.apache.org/viewvc/james/postage/trunk/stage/org.apache.james/jars/james-server-core-function-3.0-SNAPSHOT.jar?rev=685109&view=auto
==============================================================================
Binary file - no diff available.

Propchange: james/postage/trunk/stage/org.apache.james/jars/james-server-core-function-3.0-SNAPSHOT.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: james/postage/trunk/stage/org.apache.james/jars/james-server-core-library-3.0-SNAPSHOT.jar
URL: http://svn.apache.org/viewvc/james/postage/trunk/stage/org.apache.james/jars/james-server-core-library-3.0-SNAPSHOT.jar?rev=685109&r1=685108&r2=685109&view=diff
==============================================================================
Binary files - no diff available.

Modified: james/postage/trunk/stage/org.apache.james/jars/james-server-domain-api-3.0-SNAPSHOT.jar
URL: http://svn.apache.org/viewvc/james/postage/trunk/stage/org.apache.james/jars/james-server-domain-api-3.0-SNAPSHOT.jar?rev=685109&r1=685108&r2=685109&view=diff
==============================================================================
Binary files - no diff available.

Modified: james/postage/trunk/stage/org.apache.james/jars/james-server-smtpserver-function-3.0-SNAPSHOT.jar
URL: http://svn.apache.org/viewvc/james/postage/trunk/stage/org.apache.james/jars/james-server-smtpserver-function-3.0-SNAPSHOT.jar?rev=685109&r1=685108&r2=685109&view=diff
==============================================================================
Binary files - no diff available.

Modified: james/postage/trunk/stage/org.apache.james/jars/james-server-user-api-3.0-SNAPSHOT.jar
URL: http://svn.apache.org/viewvc/james/postage/trunk/stage/org.apache.james/jars/james-server-user-api-3.0-SNAPSHOT.jar?rev=685109&r1=685108&r2=685109&view=diff
==============================================================================
Binary files - no diff available.

Added: james/postage/trunk/stage/org.apache.james/poms/james-server-avalon-socket-library-3.0-SNAPSHOT.pom
URL: http://svn.apache.org/viewvc/james/postage/trunk/stage/org.apache.james/poms/james-server-avalon-socket-library-3.0-SNAPSHOT.pom?rev=685109&view=auto
==============================================================================
--- james/postage/trunk/stage/org.apache.james/poms/james-server-avalon-socket-library-3.0-SNAPSHOT.pom
(added)
+++ james/postage/trunk/stage/org.apache.james/poms/james-server-avalon-socket-library-3.0-SNAPSHOT.pom
Tue Aug 12 03:05:22 2008
@@ -0,0 +1,98 @@
+<?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>
+    <version>3.0-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.james</groupId>
+  <artifactId>james-server-avalon-socket-library</artifactId>
+  <name>Apache JAMES Server Avalon Socket Library</name>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-common-util</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-domain-api</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.avalon.framework</groupId>
+      <artifactId>avalon-framework-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.avalon.framework</groupId>
+      <artifactId>avalon-framework-impl</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.avalon.cornerstone.connection</groupId>
+      <artifactId>cornerstone-connection-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.avalon.cornerstone.connection</groupId>
+      <artifactId>cornerstone-connection-impl</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.avalon.cornerstone.sockets</groupId>
+      <artifactId>cornerstone-sockets-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.avalon.cornerstone.scheduler</groupId>
+      <artifactId>cornerstone-scheduler-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.excalibur.components</groupId>
+      <artifactId>excalibur-pool-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.excalibur.components</groupId>
+      <artifactId>excalibur-pool-impl</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.avalon.cornerstone.threads</groupId>
+      <artifactId>cornerstone-threads-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.excalibur.components</groupId>
+      <artifactId>excalibur-thread-api</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.excalibur.components</groupId>
+      <artifactId>excalibur-thread-impl</artifactId>
+      <version>2.2.1</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.avalon.cornerstone.sockets</groupId>
+      <artifactId>cornerstone-sockets-impl</artifactId>
+      <version>2.2.2</version>
+      <scope>runtime</scope>
+    </dependency>
+  </dependencies>
+</project>
\ No newline at end of file

Propchange: james/postage/trunk/stage/org.apache.james/poms/james-server-avalon-socket-library-3.0-SNAPSHOT.pom
------------------------------------------------------------------------------
    svn:eol-style = native

Added: james/postage/trunk/stage/org.apache.james/poms/james-server-common-util-3.0-SNAPSHOT.pom
URL: http://svn.apache.org/viewvc/james/postage/trunk/stage/org.apache.james/poms/james-server-common-util-3.0-SNAPSHOT.pom?rev=685109&view=auto
==============================================================================
--- james/postage/trunk/stage/org.apache.james/poms/james-server-common-util-3.0-SNAPSHOT.pom
(added)
+++ james/postage/trunk/stage/org.apache.james/poms/james-server-common-util-3.0-SNAPSHOT.pom
Tue Aug 12 03:05:22 2008
@@ -0,0 +1,42 @@
+<?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>
+    <version>3.0-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.james</groupId>
+  <artifactId>james-server-common-util</artifactId>
+  <name>Apache JAMES Server Common Utilities</name>
+  <dependencies>
+    <dependency>
+      <groupId>oro</groupId>
+      <artifactId>oro</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>
\ No newline at end of file

Propchange: james/postage/trunk/stage/org.apache.james/poms/james-server-common-util-3.0-SNAPSHOT.pom
------------------------------------------------------------------------------
    svn:eol-style = native

Added: james/postage/trunk/stage/org.apache.james/poms/james-server-core-api-3.0-SNAPSHOT.pom
URL: http://svn.apache.org/viewvc/james/postage/trunk/stage/org.apache.james/poms/james-server-core-api-3.0-SNAPSHOT.pom?rev=685109&view=auto
==============================================================================
--- james/postage/trunk/stage/org.apache.james/poms/james-server-core-api-3.0-SNAPSHOT.pom
(added)
+++ james/postage/trunk/stage/org.apache.james/poms/james-server-core-api-3.0-SNAPSHOT.pom
Tue Aug 12 03:05:22 2008
@@ -0,0 +1,42 @@
+<?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>
+    <version>3.0-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.james</groupId>
+  <artifactId>james-server-core-api</artifactId>
+  <name>Apache JAMES Server Core API</name>
+  <dependencies>
+    <!-- only used by JamesUser (for MailAddress) -->
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>mailet</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>javax.mail</groupId>
+      <artifactId>mail</artifactId>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+</project>
\ No newline at end of file

Propchange: james/postage/trunk/stage/org.apache.james/poms/james-server-core-api-3.0-SNAPSHOT.pom
------------------------------------------------------------------------------
    svn:eol-style = native

Added: james/postage/trunk/stage/org.apache.james/poms/james-server-core-function-3.0-SNAPSHOT.pom
URL: http://svn.apache.org/viewvc/james/postage/trunk/stage/org.apache.james/poms/james-server-core-function-3.0-SNAPSHOT.pom?rev=685109&view=auto
==============================================================================
--- james/postage/trunk/stage/org.apache.james/poms/james-server-core-function-3.0-SNAPSHOT.pom
(added)
+++ james/postage/trunk/stage/org.apache.james/poms/james-server-core-function-3.0-SNAPSHOT.pom
Tue Aug 12 03:05:22 2008
@@ -0,0 +1,146 @@
+<?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>
+    <version>3.0-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.james</groupId>
+  <artifactId>james-server-core-function</artifactId>
+  <name>Apache JAMES Server Core function</name>
+  <dependencies>
+  
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>mailet</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-common-util</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-core-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-domain-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-core-library</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>javax.mail</groupId>
+      <artifactId>mail</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.avalon.framework</groupId>
+      <artifactId>avalon-framework-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-pool</groupId>
+      <artifactId>commons-pool</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.avalon.framework</groupId>
+      <artifactId>avalon-framework-impl</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-dbcp</groupId>
+      <artifactId>commons-dbcp</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.avalon.cornerstone.datasources</groupId>
+      <artifactId>cornerstone-datasources-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.excalibur.components</groupId>
+      <artifactId>excalibur-datasource</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.avalon.cornerstone.scheduler</groupId>
+      <artifactId>cornerstone-scheduler-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.avalon.cornerstone.store</groupId>
+      <artifactId>cornerstone-store-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>dnsjava</groupId>
+      <artifactId>dnsjava</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>oro</groupId>
+      <artifactId>oro</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-management-library</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-core-library</artifactId>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>apache-james-mailet-base</artifactId>
+      <classifier>tests</classifier>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.excalibur.components</groupId>
+      <artifactId>excalibur-thread-impl</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.avalon.cornerstone.sockets</groupId>
+      <artifactId>cornerstone-sockets-impl</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.avalon.cornerstone.datasources</groupId>
+      <artifactId>cornerstone-datasources-impl</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derby</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>
\ No newline at end of file

Propchange: james/postage/trunk/stage/org.apache.james/poms/james-server-core-function-3.0-SNAPSHOT.pom
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: james/postage/trunk/stage/org.apache.james/poms/james-server-core-library-3.0-SNAPSHOT.pom
URL: http://svn.apache.org/viewvc/james/postage/trunk/stage/org.apache.james/poms/james-server-core-library-3.0-SNAPSHOT.pom?rev=685109&r1=685108&r2=685109&view=diff
==============================================================================
--- james/postage/trunk/stage/org.apache.james/poms/james-server-core-library-3.0-SNAPSHOT.pom
(original)
+++ james/postage/trunk/stage/org.apache.james/poms/james-server-core-library-3.0-SNAPSHOT.pom
Tue Aug 12 03:05:22 2008
@@ -33,6 +33,8 @@
       <groupId>org.apache.james</groupId>
       <artifactId>mailet</artifactId>
     </dependency>
+    <!-- Probably used for RFC2822Headers                             -->
+    <!-- Not needed at runtime because of compiler inlining constants -->
     <dependency>
       <groupId>org.apache.james</groupId>
       <artifactId>apache-james-mailet-base</artifactId>
@@ -40,8 +42,18 @@
 
     <dependency>
       <groupId>org.apache.james</groupId>
+      <artifactId>james-server-common-util</artifactId>
+    </dependency>
+    <!-- 
+    <dependency>
+      <groupId>org.apache.james</groupId>
       <artifactId>james-server-domain-api</artifactId>
     </dependency>
+     -->
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-core-api</artifactId>
+    </dependency>
 
     <dependency>
       <groupId>javax.mail</groupId>
@@ -58,66 +70,18 @@
       <artifactId>avalon-framework-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-pool</groupId>
-      <artifactId>commons-pool</artifactId>
-    </dependency>
-    <dependency>
       <groupId>org.apache.avalon.framework</groupId>
       <artifactId>avalon-framework-impl</artifactId>
     </dependency>
     <dependency>
-      <groupId>commons-dbcp</groupId>
-      <artifactId>commons-dbcp</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.avalon.cornerstone.connection</groupId>
-      <artifactId>cornerstone-connection-impl</artifactId>
-    </dependency>
-    <dependency>
       <groupId>org.apache.avalon.cornerstone.sockets</groupId>
       <artifactId>cornerstone-sockets-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.avalon.cornerstone.datasources</groupId>
-      <artifactId>cornerstone-datasources-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.excalibur.components</groupId>
-      <artifactId>excalibur-datasource</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.avalon.cornerstone.scheduler</groupId>
-      <artifactId>cornerstone-scheduler-api</artifactId>
-    </dependency>
-    <dependency>
       <groupId>org.apache.avalon.cornerstone.store</groupId>
       <artifactId>cornerstone-store-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>dnsjava</groupId>
-      <artifactId>dnsjava</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.excalibur.components</groupId>
-      <artifactId>excalibur-pool-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.excalibur.components</groupId>
-      <artifactId>excalibur-pool-impl</artifactId>
-    </dependency>
-    <dependency>
       <groupId>org.apache.avalon.cornerstone.threads</groupId>
       <artifactId>cornerstone-threads-api</artifactId>
     </dependency>
@@ -125,26 +89,11 @@
       <groupId>org.apache.excalibur.components</groupId>
       <artifactId>excalibur-thread-api</artifactId>
     </dependency>
+    
     <dependency>
-      <groupId>oro</groupId>
-      <artifactId>oro</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>mstor</groupId>
-      <artifactId>mstor</artifactId>
-    </dependency>
-    <dependency>
-    	<groupId>xml-apis</groupId>
-    	<artifactId>xml-apis</artifactId>
-    	<scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.thoughtworks.xstream</groupId>
-      <artifactId>xstream</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>mx4j</groupId>
-      <artifactId>mx4j-jmx</artifactId>
+      <groupId>org.apache.excalibur.components</groupId>
+      <artifactId>excalibur-datasource</artifactId>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>

Modified: james/postage/trunk/stage/org.apache.james/poms/james-server-domain-api-3.0-SNAPSHOT.pom
URL: http://svn.apache.org/viewvc/james/postage/trunk/stage/org.apache.james/poms/james-server-domain-api-3.0-SNAPSHOT.pom?rev=685109&r1=685108&r2=685109&view=diff
==============================================================================
--- james/postage/trunk/stage/org.apache.james/poms/james-server-domain-api-3.0-SNAPSHOT.pom
(original)
+++ james/postage/trunk/stage/org.apache.james/poms/james-server-domain-api-3.0-SNAPSHOT.pom
Tue Aug 12 03:05:22 2008
@@ -28,9 +28,6 @@
   <artifactId>james-server-domain-api</artifactId>
   <name>Apache JAMES Server Domain API</name>
   <dependencies>
-    <dependency>
-      <groupId>org.apache.avalon.framework</groupId>
-      <artifactId>avalon-framework-api</artifactId>
-    </dependency>
+    <!-- No dependency -->
   </dependencies>
 </project>
\ No newline at end of file

Modified: james/postage/trunk/stage/org.apache.james/poms/james-server-smtpserver-function-3.0-SNAPSHOT.pom
URL: http://svn.apache.org/viewvc/james/postage/trunk/stage/org.apache.james/poms/james-server-smtpserver-function-3.0-SNAPSHOT.pom?rev=685109&r1=685108&r2=685109&view=diff
==============================================================================
--- james/postage/trunk/stage/org.apache.james/poms/james-server-smtpserver-function-3.0-SNAPSHOT.pom
(original)
+++ james/postage/trunk/stage/org.apache.james/poms/james-server-smtpserver-function-3.0-SNAPSHOT.pom
Tue Aug 12 03:05:22 2008
@@ -43,6 +43,14 @@
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
+      <artifactId>james-server-javamail-util</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-common-util</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
       <artifactId>james-server-user-api</artifactId>
     </dependency>
     <dependency>
@@ -51,14 +59,34 @@
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
+      <artifactId>james-server-core-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
       <artifactId>james-server-core-library</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-avalon-socket-library</artifactId>
+    </dependency>
 
     <dependency>
       <groupId>org.apache.avalon.cornerstone.datasources</groupId>
       <artifactId>cornerstone-datasources-api</artifactId>
     </dependency>
     <dependency>
+      <groupId>org.apache.avalon.cornerstone.store</groupId>
+      <artifactId>cornerstone-store-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.avalon.cornerstone.threads</groupId>
+      <artifactId>cornerstone-threads-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.avalon.cornerstone.sockets</groupId>
+      <artifactId>cornerstone-sockets-api</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.apache.avalon.framework</groupId>
       <artifactId>avalon-framework-impl</artifactId>
     </dependency>
@@ -82,13 +110,13 @@
     <dependency>
       <groupId>org.apache.james</groupId>
       <artifactId>james-server-core-library</artifactId>
-      <classifier>tests</classifier>
+      <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
       <artifactId>james-server-user-library</artifactId>
-      <classifier>tests</classifier>
+      <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -108,16 +136,6 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.excalibur.components</groupId>
-      <artifactId>excalibur-thread-impl</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.avalon.cornerstone.sockets</groupId>
-      <artifactId>cornerstone-sockets-impl</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
     	<groupId>junit</groupId>
     	<artifactId>junit</artifactId>
     </dependency>

Modified: james/postage/trunk/stage/org.apache.james/poms/james-server-user-api-3.0-SNAPSHOT.pom
URL: http://svn.apache.org/viewvc/james/postage/trunk/stage/org.apache.james/poms/james-server-user-api-3.0-SNAPSHOT.pom?rev=685109&r1=685108&r2=685109&view=diff
==============================================================================
--- james/postage/trunk/stage/org.apache.james/poms/james-server-user-api-3.0-SNAPSHOT.pom
(original)
+++ james/postage/trunk/stage/org.apache.james/poms/james-server-user-api-3.0-SNAPSHOT.pom
Tue Aug 12 03:05:22 2008
@@ -28,6 +28,10 @@
   <artifactId>james-server-user-api</artifactId>
   <name>Apache JAMES Server User API</name>
   <dependencies>
-  	<!-- no dependencies -->
+    <!-- only used by JamesUser (for MailAddress) -->
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>mailet</artifactId>
+    </dependency>
   </dependencies>
 </project>
\ No newline at end of file



---------------------------------------------------------------------
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