james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nor...@apache.org
Subject svn commit: r1049983 - in /james/server/trunk: ./ container-spring/ core-api/ core-library/ core/ core/src/main/java/org/apache/james/ core/src/main/java/org/apache/james/core/ core/src/main/java/org/apache/james/filepair/ core/src/main/java/org/apache...
Date Thu, 16 Dec 2010 14:18:29 GMT
Author: norman
Date: Thu Dec 16 14:18:27 2010
New Revision: 1049983

URL: http://svn.apache.org/viewvc?rev=1049983&view=rev
Log:
Remove empty folders and rename core-library to core

Added:
    james/server/trunk/core/
      - copied from r1049797, james/server/trunk/core-library/
    james/server/trunk/core/pom.xml
      - copied, changed from r1049974, james/server/trunk/core-library/pom.xml
    james/server/trunk/core/src/main/java/org/apache/james/core/MailImpl.java
      - copied unchanged from r1049974, james/server/trunk/core-library/src/main/java/org/apache/james/core/MailImpl.java
    james/server/trunk/core/src/main/java/org/apache/james/core/MimeMessageCopyOnWriteProxy.java
      - copied unchanged from r1049974, james/server/trunk/core-library/src/main/java/org/apache/james/core/MimeMessageCopyOnWriteProxy.java
    james/server/trunk/core/src/main/java/org/apache/james/core/MimeMessageInputStreamSource.java
      - copied unchanged from r1049974, james/server/trunk/core-library/src/main/java/org/apache/james/core/MimeMessageInputStreamSource.java
    james/server/trunk/core/src/main/java/org/apache/james/core/MimeMessageWrapper.java
      - copied unchanged from r1049974, james/server/trunk/core-library/src/main/java/org/apache/james/core/MimeMessageWrapper.java
    james/server/trunk/core/src/main/java/org/apache/james/core/NonClosingSharedInputStream.java
      - copied unchanged from r1049974, james/server/trunk/core-library/src/main/java/org/apache/james/core/NonClosingSharedInputStream.java
    james/server/trunk/core/src/test/java/org/apache/james/core/MimeMessageCopyOnWriteProxyTest.java
      - copied unchanged from r1049974, james/server/trunk/core-library/src/test/java/org/apache/james/core/MimeMessageCopyOnWriteProxyTest.java
    james/server/trunk/core/src/test/java/org/apache/james/core/MimeMessageTest.java
      - copied unchanged from r1049974, james/server/trunk/core-library/src/test/java/org/apache/james/core/MimeMessageTest.java
    james/server/trunk/core/src/test/java/org/apache/james/core/MimeMessageWrapperTest.java
      - copied unchanged from r1049974, james/server/trunk/core-library/src/test/java/org/apache/james/core/MimeMessageWrapperTest.java
    james/server/trunk/core/src/test/java/org/apache/james/util/TestUtil.java
      - copied unchanged from r1049974, james/server/trunk/core-library/src/test/java/org/apache/james/util/TestUtil.java
Removed:
    james/server/trunk/core-api/
    james/server/trunk/core-library/
    james/server/trunk/core/src/main/java/org/apache/james/Constants.java
    james/server/trunk/core/src/main/java/org/apache/james/filepair/
    james/server/trunk/core/src/main/java/org/apache/james/services/
    james/server/trunk/core/src/test/java/org/apache/james/services/AbstractJSR250InstanceFactory.java
    james/server/trunk/core/src/test/java/org/apache/james/services/MockFileSystem.java
    james/server/trunk/core/src/test/java/org/apache/james/services/MockJSR250Loader.java
Modified:
    james/server/trunk/container-spring/pom.xml
    james/server/trunk/domainlist-jdbc/pom.xml
    james/server/trunk/domainlist-library/pom.xml
    james/server/trunk/fetchmail/pom.xml
    james/server/trunk/lmtpserver/pom.xml
    james/server/trunk/mail-file/pom.xml
    james/server/trunk/mail-jcr/pom.xml
    james/server/trunk/mail-jdbc/pom.xml
    james/server/trunk/mail-library/pom.xml
    james/server/trunk/mailetcontainer-camel/pom.xml
    james/server/trunk/mailetcontainer-library/pom.xml
    james/server/trunk/mailets/pom.xml
    james/server/trunk/pom.xml
    james/server/trunk/pop3server/pom.xml
    james/server/trunk/queue-activemq/pom.xml
    james/server/trunk/queue-jms/pom.xml
    james/server/trunk/remotemanager/pom.xml
    james/server/trunk/smtpserver/pom.xml
    james/server/trunk/user-file/pom.xml
    james/server/trunk/user-jcr/pom.xml

Modified: james/server/trunk/container-spring/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/container-spring/pom.xml?rev=1049983&r1=1049982&r2=1049983&view=diff
==============================================================================
--- james/server/trunk/container-spring/pom.xml (original)
+++ james/server/trunk/container-spring/pom.xml Thu Dec 16 14:18:27 2010
@@ -407,7 +407,11 @@
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-server-core-library</artifactId>
+      <artifactId>james-server-resolver-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-core</artifactId>
       <scope>runtime</scope>
     </dependency>
     <dependency>

Copied: james/server/trunk/core/pom.xml (from r1049974, james/server/trunk/core-library/pom.xml)
URL: http://svn.apache.org/viewvc/james/server/trunk/core/pom.xml?p2=james/server/trunk/core/pom.xml&p1=james/server/trunk/core-library/pom.xml&r1=1049974&r2=1049983&rev=1049983&view=diff
==============================================================================
--- james/server/trunk/core-library/pom.xml (original)
+++ james/server/trunk/core/pom.xml Thu Dec 16 14:18:27 2010
@@ -25,8 +25,8 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.james</groupId>
-  <artifactId>james-server-core-library</artifactId>
-  <name>Apache James Server Core Library</name>
+  <artifactId>james-server-core</artifactId>
+  <name>Apache James Server Core</name>
   <properties>
       <!-- OSGI stuff -->
     <james.osgi.export>

Modified: james/server/trunk/domainlist-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/domainlist-jdbc/pom.xml?rev=1049983&r1=1049982&r2=1049983&view=diff
==============================================================================
--- james/server/trunk/domainlist-jdbc/pom.xml (original)
+++ james/server/trunk/domainlist-jdbc/pom.xml Thu Dec 16 14:18:27 2010
@@ -78,9 +78,9 @@
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-server-core-library</artifactId>
-      <type>test-jar</type>
+      <artifactId>james-server-resolver-api</artifactId>
       <scope>test</scope>
+      <type>test-jar</type>
     </dependency>
     <dependency>
       <groupId>junit</groupId>

Modified: james/server/trunk/domainlist-library/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/domainlist-library/pom.xml?rev=1049983&r1=1049982&r2=1049983&view=diff
==============================================================================
--- james/server/trunk/domainlist-library/pom.xml (original)
+++ james/server/trunk/domainlist-library/pom.xml Thu Dec 16 14:18:27 2010
@@ -76,6 +76,10 @@
       <artifactId>james-server-lifecycle-api</artifactId>
     </dependency>
     <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-resolver-api</artifactId>
+    </dependency>
+    <dependency>
       <groupId>javax.annotation</groupId>
       <artifactId>jsr250-api</artifactId>
     </dependency>

Modified: james/server/trunk/fetchmail/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/fetchmail/pom.xml?rev=1049983&r1=1049982&r2=1049983&view=diff
==============================================================================
--- james/server/trunk/fetchmail/pom.xml (original)
+++ james/server/trunk/fetchmail/pom.xml Thu Dec 16 14:18:27 2010
@@ -50,7 +50,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-server-core-library</artifactId>
+      <artifactId>james-server-core</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>

Modified: james/server/trunk/lmtpserver/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/lmtpserver/pom.xml?rev=1049983&r1=1049982&r2=1049983&view=diff
==============================================================================
--- james/server/trunk/lmtpserver/pom.xml (original)
+++ james/server/trunk/lmtpserver/pom.xml Thu Dec 16 14:18:27 2010
@@ -38,7 +38,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-server-core-library</artifactId>
+      <artifactId>james-server-core</artifactId>
     </dependency>    
     <dependency>
       <groupId>org.apache.james</groupId>

Modified: james/server/trunk/mail-file/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/mail-file/pom.xml?rev=1049983&r1=1049982&r2=1049983&view=diff
==============================================================================
--- james/server/trunk/mail-file/pom.xml (original)
+++ james/server/trunk/mail-file/pom.xml Thu Dec 16 14:18:27 2010
@@ -42,7 +42,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-server-core-library</artifactId>
+      <artifactId>james-server-core</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
@@ -84,13 +84,13 @@
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-server-core-library</artifactId>
+      <artifactId>james-server-mail-library</artifactId>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-server-mail-library</artifactId>
+      <artifactId>james-server-resolver-api</artifactId>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>

Modified: james/server/trunk/mail-jcr/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/mail-jcr/pom.xml?rev=1049983&r1=1049982&r2=1049983&view=diff
==============================================================================
--- james/server/trunk/mail-jcr/pom.xml (original)
+++ james/server/trunk/mail-jcr/pom.xml Thu Dec 16 14:18:27 2010
@@ -38,7 +38,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-server-core-library</artifactId>
+      <artifactId>james-server-core</artifactId>
     </dependency>
     <dependency>
       <groupId>javax.jcr</groupId>

Modified: james/server/trunk/mail-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/mail-jdbc/pom.xml?rev=1049983&r1=1049982&r2=1049983&view=diff
==============================================================================
--- james/server/trunk/mail-jdbc/pom.xml (original)
+++ james/server/trunk/mail-jdbc/pom.xml Thu Dec 16 14:18:27 2010
@@ -46,7 +46,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-server-core-library</artifactId>
+      <artifactId>james-server-core</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
@@ -84,13 +84,13 @@
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-server-core-library</artifactId>
+      <artifactId>james-server-mail-library</artifactId>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-server-mail-library</artifactId>
+      <artifactId>james-server-resolver-api</artifactId>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>

Modified: james/server/trunk/mail-library/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/mail-library/pom.xml?rev=1049983&r1=1049982&r2=1049983&view=diff
==============================================================================
--- james/server/trunk/mail-library/pom.xml (original)
+++ james/server/trunk/mail-library/pom.xml Thu Dec 16 14:18:27 2010
@@ -34,7 +34,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-server-core-library</artifactId>
+      <artifactId>james-server-core</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>

Modified: james/server/trunk/mailetcontainer-camel/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-camel/pom.xml?rev=1049983&r1=1049982&r2=1049983&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-camel/pom.xml (original)
+++ james/server/trunk/mailetcontainer-camel/pom.xml Thu Dec 16 14:18:27 2010
@@ -42,7 +42,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-server-core-library</artifactId>
+      <artifactId>james-server-core</artifactId>
     </dependency>
      <dependency>
       <groupId>org.apache.james</groupId>

Modified: james/server/trunk/mailetcontainer-library/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-library/pom.xml?rev=1049983&r1=1049982&r2=1049983&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-library/pom.xml (original)
+++ james/server/trunk/mailetcontainer-library/pom.xml Thu Dec 16 14:18:27 2010
@@ -75,7 +75,7 @@
     
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-server-core-library</artifactId>
+      <artifactId>james-server-core</artifactId>
     </dependency>  
     <dependency>
       <groupId>org.apache.james</groupId>

Modified: james/server/trunk/mailets/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/pom.xml?rev=1049983&r1=1049982&r2=1049983&view=diff
==============================================================================
--- james/server/trunk/mailets/pom.xml (original)
+++ james/server/trunk/mailets/pom.xml Thu Dec 16 14:18:27 2010
@@ -131,7 +131,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-server-core-library</artifactId>
+      <artifactId>james-server-core</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>

Modified: james/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=1049983&r1=1049982&r2=1049983&view=diff
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Thu Dec 16 14:18:27 2010
@@ -34,7 +34,7 @@
   <packaging>pom</packaging>
   <modules>
     <module>container-spring</module>
-    <module>core-library</module>
+    <module>core</module>
     <module>dnsservice-api</module>
     <module>dnsservice-dnsjava</module>
     <module>fetchmail</module>
@@ -545,43 +545,18 @@
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-server-core-library</artifactId>
+      <artifactId>james-server-core</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-server-core-library</artifactId>
+      <artifactId>james-server-core</artifactId>
       <version>${project.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-server-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.james</groupId>
-      <artifactId>james-server-library</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.james</groupId>
-      <artifactId>james-server-file</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.james</groupId>
-      <artifactId>james-server-jdbc</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.james</groupId>
-      <artifactId>james-server-jcr</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.james</groupId>
       <artifactId>james-server-user-library</artifactId>
       <version>${project.version}</version>
     </dependency>

Modified: james/server/trunk/pop3server/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/pom.xml?rev=1049983&r1=1049982&r2=1049983&view=diff
==============================================================================
--- james/server/trunk/pop3server/pom.xml (original)
+++ james/server/trunk/pop3server/pom.xml Thu Dec 16 14:18:27 2010
@@ -89,7 +89,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-server-core-library</artifactId>
+      <artifactId>james-server-core</artifactId>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
@@ -120,5 +120,11 @@
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-resolver-api</artifactId>
+      <scope>test</scope>
+      <type>test-jar</type>
+    </dependency>
   </dependencies>
 </project>
\ No newline at end of file

Modified: james/server/trunk/queue-activemq/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/queue-activemq/pom.xml?rev=1049983&r1=1049982&r2=1049983&view=diff
==============================================================================
--- james/server/trunk/queue-activemq/pom.xml (original)
+++ james/server/trunk/queue-activemq/pom.xml Thu Dec 16 14:18:27 2010
@@ -38,12 +38,16 @@
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-server-core-library</artifactId>
+      <artifactId>james-server-core</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
       <artifactId>james-server-lifecycle-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-resolver-api</artifactId>
+    </dependency>
      <dependency>
       <groupId>org.apache.james</groupId>
       <artifactId>apache-mailet</artifactId>

Modified: james/server/trunk/queue-jms/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/queue-jms/pom.xml?rev=1049983&r1=1049982&r2=1049983&view=diff
==============================================================================
--- james/server/trunk/queue-jms/pom.xml (original)
+++ james/server/trunk/queue-jms/pom.xml Thu Dec 16 14:18:27 2010
@@ -38,7 +38,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-server-core-library</artifactId>
+      <artifactId>james-server-core</artifactId>
     </dependency>
      <dependency>
       <groupId>org.apache.james</groupId>

Modified: james/server/trunk/remotemanager/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/pom.xml?rev=1049983&r1=1049982&r2=1049983&view=diff
==============================================================================
--- james/server/trunk/remotemanager/pom.xml (original)
+++ james/server/trunk/remotemanager/pom.xml Thu Dec 16 14:18:27 2010
@@ -88,7 +88,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-server-core-library</artifactId>
+      <artifactId>james-server-core</artifactId>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
@@ -126,5 +126,11 @@
       <artifactId>commons-net</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-resolver-api</artifactId>
+      <scope>test</scope>
+      <type>test-jar</type>
+    </dependency>
   </dependencies>
 </project>

Modified: james/server/trunk/smtpserver/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/pom.xml?rev=1049983&r1=1049982&r2=1049983&view=diff
==============================================================================
--- james/server/trunk/smtpserver/pom.xml (original)
+++ james/server/trunk/smtpserver/pom.xml Thu Dec 16 14:18:27 2010
@@ -54,7 +54,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-server-core-library</artifactId>
+      <artifactId>james-server-core</artifactId>
     </dependency>    
     <dependency>
       <groupId>org.apache.james</groupId>
@@ -120,7 +120,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-server-core-library</artifactId>
+      <artifactId>james-server-core</artifactId>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
@@ -175,5 +175,11 @@
       <scope>test</scope>
       <type>test-jar</type>
     </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-resolver-api</artifactId>
+      <scope>test</scope>
+      <type>test-jar</type>
+    </dependency>
   </dependencies>
 </project>

Modified: james/server/trunk/user-file/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/user-file/pom.xml?rev=1049983&r1=1049982&r2=1049983&view=diff
==============================================================================
--- james/server/trunk/user-file/pom.xml (original)
+++ james/server/trunk/user-file/pom.xml Thu Dec 16 14:18:27 2010
@@ -55,7 +55,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-server-core-library</artifactId>
+      <artifactId>james-server-core</artifactId>
       <scope>runtime</scope>
     </dependency>
     <dependency>
@@ -89,7 +89,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-server-core-library</artifactId>
+      <artifactId>james-server-core</artifactId>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>

Modified: james/server/trunk/user-jcr/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/user-jcr/pom.xml?rev=1049983&r1=1049982&r2=1049983&view=diff
==============================================================================
--- james/server/trunk/user-jcr/pom.xml (original)
+++ james/server/trunk/user-jcr/pom.xml Thu Dec 16 14:18:27 2010
@@ -82,7 +82,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-server-core-library</artifactId>
+      <artifactId>james-server-core</artifactId>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>



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