svn commit: r902479 - in /james/nntp/trunk: ./ api/src/main/java/org/apache/james/api/user/ api/src/main/java/org/apache/james/api/vut/ core-library/ protocol/ user-api/src/main/java/org/apache/james/api/user/ user-api/src/main/java/org/apache/james/ap...

[rdonkin]

Author: rdonkin
Date: Sat Jan 23 20:20:26 2010
New Revision: 902479

URL: http://svn.apache.org/viewvc?rev=902479&view=rev
Log:
Consolidate modules

Added:
    james/nntp/trunk/api/src/main/java/org/apache/james/api/user/
      - copied from r902477, 
james/nntp/trunk/user-api/src/main/java/org/apache/james/api/user/
    james/nntp/trunk/api/src/main/java/org/apache/james/api/vut/
      - copied from r902477, 
james/nntp/trunk/user-api/src/main/java/org/apache/james/api/vut/
Removed:
    james/nntp/trunk/user-api/src/main/java/org/apache/james/api/user/
    james/nntp/trunk/user-api/src/main/java/org/apache/james/api/vut/
Modified:
    james/nntp/trunk/core-library/pom.xml
    james/nntp/trunk/pom.xml
    james/nntp/trunk/protocol/pom.xml
    james/nntp/trunk/user-library/pom.xml

Modified: james/nntp/trunk/core-library/pom.xml
URL: 
http://svn.apache.org/viewvc/james/nntp/trunk/core-library/pom.xml?rev=902479&r1=902478&r2=902479&view=diff
==============================================================================
--- james/nntp/trunk/core-library/pom.xml (original)
+++ james/nntp/trunk/core-library/pom.xml Sat Jan 23 20:20:26 2010
@@ -109,11 +109,6 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.james</groupId>
-      <artifactId>james-nntp-user-api</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>org.apache.avalon.cornerstone.datasources</groupId>
       <artifactId>cornerstone-datasources-impl</artifactId>
       <scope>test</scope>

Modified: james/nntp/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/james/nntp/trunk/pom.xml?rev=902479&r1=902478&r2=902479&view=diff
==============================================================================
--- james/nntp/trunk/pom.xml (original)
+++ james/nntp/trunk/pom.xml Sat Jan 23 20:20:26 2010
@@ -35,7 +35,6 @@
   <modules>
     <module>util</module>
     <module>api</module>
-    <module>user-api</module>
     <module>user-library</module>
     <module>core-library</module>
     <module>socket</module>

Modified: james/nntp/trunk/protocol/pom.xml
URL: 
http://svn.apache.org/viewvc/james/nntp/trunk/protocol/pom.xml?rev=902479&r1=902478&r2=902479&view=diff
==============================================================================
--- james/nntp/trunk/protocol/pom.xml (original)
+++ james/nntp/trunk/protocol/pom.xml Sat Jan 23 20:20:26 2010
@@ -50,10 +50,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-nntp-user-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.james</groupId>
       <artifactId>james-nntp-core-library</artifactId>
     </dependency>
     <dependency>

Modified: james/nntp/trunk/user-library/pom.xml
URL: 
http://svn.apache.org/viewvc/james/nntp/trunk/user-library/pom.xml?rev=902479&r1=902478&r2=902479&view=diff
==============================================================================
--- james/nntp/trunk/user-library/pom.xml (original)
+++ james/nntp/trunk/user-library/pom.xml Sat Jan 23 20:20:26 2010
@@ -41,10 +41,6 @@
       <groupId>org.apache.james</groupId>
       <artifactId>james-nntp-common-util</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.james</groupId>
-      <artifactId>james-nntp-user-api</artifactId>
-    </dependency>
 
     <dependency>
       <groupId>${javax.mail.groupId}</groupId>



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