james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b...@apache.org
Subject svn commit: r675879 - in /james/server/trunk: ./ spring-deployment/ spring-deployment/src/main/java/org/apache/james/container/spring/ spring-deployment/src/main/java/org/apache/james/container/spring/adaptor/ spring-deployment/src/main/java/org/apache...
Date Fri, 11 Jul 2008 09:24:19 GMT
Author: bago
Date: Fri Jul 11 02:24:18 2008
New Revision: 675879

URL: http://svn.apache.org/viewvc?rev=675879&view=rev
Log:
Created an avalon-spring-bridge-library module including non-james specific code for the avalon-spring
bridge.

Removed:
    james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/Main.java
    james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/adaptor/AvalonConfigurationFileProvider.java
    james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/adaptor/AvalonContext.java
    james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/adaptor/ConfigurationProvider.java
    james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/adaptor/DefaultServiceManagerFactory.java
    james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/adaptor/LoggingBridge.java
    james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/adaptor/ServiceManagerFactory.java
    james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/configuration/
    james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/examples/
    james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/lifecycle/
    james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/logging/
    james/server/trunk/spring-deployment/src/main/test/org/apache/james/container/spring/adaptor/
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=675879&r1=675878&r2=675879&view=diff
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Fri Jul 11 02:24:18 2008
@@ -42,6 +42,7 @@
     <module>imap-codec-library</module>
     <module>user-library</module>
     <module>core-library</module>
+    <module>avalon-spring-bridge-library</module>
     <module>mailbox-library</module>
     <module>smtpserver-function</module>
     <module>pop3server-function</module>
@@ -257,6 +258,11 @@
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
+      <artifactId>james-server-avalon-spring-bridge-library</artifactId>
+      <version>3.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
       <artifactId>james-server-mailbox-library</artifactId>
       <version>3.0-SNAPSHOT</version>
     </dependency>
@@ -879,6 +885,12 @@
       <groupId>avalon-phoenix</groupId>
       <artifactId>avalon-phoenix-client</artifactId>
       <version>4.2-SNAPSHOT</version>
+      <exclusions>
+        <exclusion>
+          <groupId>avalon-framework</groupId>
+          <artifactId>avalon-framework</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <!-- phoenix runtime -->
     <dependency>

Modified: james/server/trunk/spring-deployment/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/pom.xml?rev=675879&r1=675878&r2=675879&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/pom.xml (original)
+++ james/server/trunk/spring-deployment/pom.xml Fri Jul 11 02:24:18 2008
@@ -44,38 +44,5 @@
       <groupId>org.apache.james</groupId>
       <artifactId>james-server-core-library</artifactId>
     </dependency>
-    
-    <dependency>
-    	<groupId>xml-apis</groupId>
-    	<artifactId>xml-apis</artifactId>
-    	<scope>provided</scope>
-    </dependency>
- 			
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring</artifactId>
-      <version>2.0</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.avalon.framework</groupId>
-      <artifactId>avalon-framework-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.avalon.framework</groupId>
-      <artifactId>avalon-framework-impl</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>avalon-phoenix</groupId>
-      <artifactId>avalon-phoenix-client</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</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