Author: norman
Date: Sun Jan 31 20:43:07 2010
New Revision: 905117
URL: http://svn.apache.org/viewvc?rev=905117&view=rev
Log:
merge avalon-user-function and basic-user-function into user-function
Removed:
james/server/trunk/avalon-user-function/
james/server/trunk/basic-user-function/
Modified:
james/server/trunk/pom.xml
james/server/trunk/spring-deployment/pom.xml
Modified: james/server/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=905117&r1=905116&r2=905117&view=diff
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Sun Jan 31 20:43:07 2010
@@ -49,8 +49,7 @@
<module>pop3server-function</module>
<module>spoolmanager-function</module>
<module>remotemanager-function</module>
- <module>basic-user-function</module>
- <module>avalon-user-function</module>
+ <module>user-function</module>
<module>mailets-function</module>
<module>fetchmail-function</module>
<module>experimental-activemq-function</module>
@@ -141,6 +140,7 @@
</plugins>
</build>
+
<reporting>
<plugins>
<!--
@@ -416,12 +416,7 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-avalon-user-function</artifactId>
- <version>3.0-M1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-basic-user-function</artifactId>
+ <artifactId>james-server-user-function</artifactId>
<version>3.0-M1</version>
</dependency>
<dependency>
Modified: james/server/trunk/spring-deployment/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/pom.xml?rev=905117&r1=905116&r2=905117&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/pom.xml (original)
+++ james/server/trunk/spring-deployment/pom.xml Sun Jan 31 20:43:07 2010
@@ -282,15 +282,10 @@
<artifactId>james-server-smtp-protocol-library</artifactId>
<scope>runtime</scope>
</dependency>
-
+
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-avalon-user-function</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-basic-user-function</artifactId>
+ <artifactId>james-server-user-function</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
