Author: eric
Date: Fri Feb 8 10:19:25 2013
New Revision: 1443920
URL: http://svn.apache.org/r1443920
Log:
Integrate spring related classes and configuration in one module (JAMES-1478)
Added:
james/server/trunk/spring/
- copied from r1443907, james/server/trunk/container-spring/
james/server/trunk/spring/src/main/java/org/apache/james/container/spring/lifecycle/
- copied from r1443907,
james/server/trunk/lifecycle-spring/src/main/java/org/apache/james/container/spring/lifecycle/
james/server/trunk/spring/src/main/resources/META-INF/org/
- copied from r1443907,
james/server/trunk/app/src/main/resources/META-INF/org/
Removed:
james/server/trunk/app/src/main/resources/META-INF/org/
james/server/trunk/container-spring/
james/server/trunk/lifecycle-spring/
Modified:
james/server/trunk/app/pom.xml
james/server/trunk/app/src/main/licensing/app/licensing.xml
james/server/trunk/app/src/main/licensing/war/licensing.xml
james/server/trunk/cli/pom.xml
james/server/trunk/pom.xml
james/server/trunk/spring/pom.xml
Modified: james/server/trunk/app/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/app/pom.xml?rev=1443920&r1=1443919&r2=1443920&view=diff
==============================================================================
--- james/server/trunk/app/pom.xml (original)
+++ james/server/trunk/app/pom.xml Fri Feb 8 10:19:25 2013
@@ -137,7 +137,7 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-container-spring</artifactId>
+ <artifactId>james-server-spring</artifactId>
<exclusions>
<exclusion>
<groupId>org.springframework.osgi</groupId>
@@ -153,21 +153,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-lifecycle-spring</artifactId>
- <scope>runtime</scope>
- <exclusions>
- <exclusion>
- <groupId>org.springframework.osgi</groupId>
- <artifactId>spring-osgi-extender</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<!-- Runtime dependencies which will get included in the generated
binary distribution -->
<dependency>
<groupId>org.slf4j</groupId>
Modified: james/server/trunk/app/src/main/licensing/app/licensing.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/app/src/main/licensing/app/licensing.xml?rev=1443920&r1=1443919&r2=1443920&view=diff
==============================================================================
--- james/server/trunk/app/src/main/licensing/app/licensing.xml (original)
+++ james/server/trunk/app/src/main/licensing/app/licensing.xml Fri Feb 8
10:19:25 2013
@@ -1337,7 +1337,7 @@ All rights reserved.
<resource name='jackrabbit-spi-2.2.5.jar'/>
<resource name='jackrabbit-spi-commons-2.2.5.jar'/>
<resource name='james-server-cli-3.0-beta3.jar'/>
- <resource name='james-server-container-spring-3.0-beta3.jar'/>
+ <resource name='james-server-spring-3.0-beta3.jar'/>
<resource name='james-server-core-3.0-beta3.jar'/>
<resource name='james-server-data-api-3.0-beta3.jar'/>
<resource name='james-server-data-library-3.0-beta3.jar'/>
@@ -1353,7 +1353,6 @@ All rights reserved.
<resource name='james-server-jpa-3.0-beta3.jar'/>
<resource name='james-server-ldap-3.0-beta3.jar'/>
<resource name='james-server-lifecycle-api-3.0-beta3.jar'/>
- <resource name='james-server-lifecycle-spring-3.0-beta3.jar'/>
<resource name='james-server-lmtpserver-3.0-beta3.jar'/>
<resource name='james-server-mailbox-adapter-3.0-beta3.jar'/>
<resource
name='james-server-mailetcontainer-api-3.0-beta3.jar'/>
Modified: james/server/trunk/app/src/main/licensing/war/licensing.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/app/src/main/licensing/war/licensing.xml?rev=1443920&r1=1443919&r2=1443920&view=diff
==============================================================================
--- james/server/trunk/app/src/main/licensing/war/licensing.xml (original)
+++ james/server/trunk/app/src/main/licensing/war/licensing.xml Fri Feb 8
10:19:25 2013
@@ -1283,7 +1283,7 @@ All rights reserved.
<resource name='jackrabbit-spi-2.2.5.jar'/>
<resource name='jackrabbit-spi-commons-2.2.5.jar'/>
<resource name='james-server-cli-3.0-beta3.jar'/>
- <resource name='james-server-container-spring-3.0-beta3.jar'/>
+ <resource name='james-server-spring-3.0-beta3.jar'/>
<resource name='james-server-core-3.0-beta3.jar'/>
<resource name='james-server-data-api-3.0-beta3.jar'/>
<resource name='james-server-data-library-3.0-beta3.jar'/>
@@ -1299,7 +1299,6 @@ All rights reserved.
<resource name='james-server-jpa-3.0-beta3.jar'/>
<resource name='james-server-ldap-3.0-beta3.jar'/>
<resource name='james-server-lifecycle-api-3.0-beta3.jar'/>
- <resource name='james-server-lifecycle-spring-3.0-beta3.jar'/>
<resource name='james-server-lmtpserver-3.0-beta3.jar'/>
<resource name='james-server-mailbox-adapter-3.0-beta3.jar'/>
<resource
name='james-server-mailetcontainer-api-3.0-beta3.jar'/>
Modified: james/server/trunk/cli/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/cli/pom.xml?rev=1443920&r1=1443919&r2=1443920&view=diff
==============================================================================
--- james/server/trunk/cli/pom.xml (original)
+++ james/server/trunk/cli/pom.xml Fri Feb 8 10:19:25 2013
@@ -41,7 +41,7 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-container-spring</artifactId>
+ <artifactId>james-server-spring</artifactId>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
Modified: james/server/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=1443920&r1=1443919&r2=1443920&view=diff
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Fri Feb 8 10:19:25 2013
@@ -60,10 +60,9 @@
<module>util</module>
<module>cli</module>
- <module>container-spring</module>
+ <module>spring</module>
<module>core</module>
<module>lifecycle-api</module>
- <module>lifecycle-spring</module>
<module>mailbox-adapter</module>
<module>mailetcontainer-api</module>
<module>mailetcontainer-camel</module>
@@ -192,7 +191,7 @@
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-container-spring</artifactId>
+ <artifactId>james-server-spring</artifactId>
<version>${project.version}</version>
</dependency>
@@ -599,11 +598,6 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-lifecycle-spring</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-protocols-smtp</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
Modified: james/server/trunk/spring/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/spring/pom.xml?rev=1443920&r1=1443907&r2=1443920&view=diff
==============================================================================
--- james/server/trunk/spring/pom.xml (original)
+++ james/server/trunk/spring/pom.xml Fri Feb 8 10:19:25 2013
@@ -29,7 +29,7 @@
</parent>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-container-spring</artifactId>
+ <artifactId>james-server-spring</artifactId>
<packaging>bundle</packaging>
<name>Apache James :: Server :: Container Spring</name>
@@ -37,10 +37,6 @@
<dependencies>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-lifecycle-spring</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-lifecycle-api</artifactId>
</dependency>
<dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
