You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by no...@apache.org on 2010/01/05 15:16:28 UTC

svn commit: r896058 - in /james/server/sandbox/active/pure_spring_deployment: ./ build-tools/ spring-deployment/ spring-deployment/src/assemble/ spring-deployment/src/main/java/org/apache/james/container/spring/beanfactory/ spring-deployment/var/nntp/ ...

Author: norman
Date: Tue Jan  5 14:16:27 2010
New Revision: 896058

URL: http://svn.apache.org/viewvc?rev=896058&view=rev
Log:
* Replace spring bundle with the the specific spring libs
* Some build cleanup
* mvn clean package now builds a binary distribution of james (tar.gz, zip) and automatic generate the run scripts (source distribution will come later)

Added:
    james/server/sandbox/active/pure_spring_deployment/spring-deployment/src/assemble/
    james/server/sandbox/active/pure_spring_deployment/spring-deployment/src/assemble/bin.xml
    james/server/sandbox/active/pure_spring_deployment/stage/org.apache.activemq/poms/activemq-parent-4.1.1.pom
    james/server/sandbox/active/pure_spring_deployment/stage/org.springframework/jars/spring-beans-2.5.6.jar   (with props)
    james/server/sandbox/active/pure_spring_deployment/stage/org.springframework/jars/spring-context-2.5.6.jar   (with props)
    james/server/sandbox/active/pure_spring_deployment/stage/org.springframework/jars/spring-core-2.5.6.jar   (with props)
    james/server/sandbox/active/pure_spring_deployment/stage/org.springframework/poms/spring-beans-2.5.6.pom
    james/server/sandbox/active/pure_spring_deployment/stage/org.springframework/poms/spring-context-2.5.6.pom
    james/server/sandbox/active/pure_spring_deployment/stage/org.springframework/poms/spring-core-2.5.6.pom
Removed:
    james/server/sandbox/active/pure_spring_deployment/spring-deployment/src/main/java/org/apache/james/container/spring/beanfactory/
    james/server/sandbox/active/pure_spring_deployment/spring-deployment/var/nntp/
    james/server/sandbox/active/pure_spring_deployment/stage/org.springframework/jars/spring-2.5.6.jar
    james/server/sandbox/active/pure_spring_deployment/stage/org.springframework/poms/spring-2.5.6.pom
Modified:
    james/server/sandbox/active/pure_spring_deployment/build-tools/common-build.xml
    james/server/sandbox/active/pure_spring_deployment/build-tools/deployment-build.xml
    james/server/sandbox/active/pure_spring_deployment/include.properties
    james/server/sandbox/active/pure_spring_deployment/pom.xml
    james/server/sandbox/active/pure_spring_deployment/spring-deployment/build.xml
    james/server/sandbox/active/pure_spring_deployment/spring-deployment/pom.xml
    james/server/sandbox/active/pure_spring_deployment/stage/pom.xml

Modified: james/server/sandbox/active/pure_spring_deployment/build-tools/common-build.xml
URL: http://svn.apache.org/viewvc/james/server/sandbox/active/pure_spring_deployment/build-tools/common-build.xml?rev=896058&r1=896057&r2=896058&view=diff
==============================================================================
--- james/server/sandbox/active/pure_spring_deployment/build-tools/common-build.xml (original)
+++ james/server/sandbox/active/pure_spring_deployment/build-tools/common-build.xml Tue Jan  5 14:16:27 2010
@@ -235,12 +235,10 @@
                     <include name="${jackrabbit-commons.jar}"/>
                     <include name="${jackrabbit-rmi.jar}"/>
                     <include name="${jcr.jar}"/>
-                    <include name="${spring.jar}"/>     
                     <include name="${log4j.jar}"/>     
                     <include name="${jsr250.jar}"/>
                     <include name='${path.lib.james}/apache-james-imap*.jar'/>
                     <include name="${mina-core.jar}"/>
-
                 </fileset>   
             </path>   
             <path id='classpath.jackrabbit.repo'>  

Modified: james/server/sandbox/active/pure_spring_deployment/build-tools/deployment-build.xml
URL: http://svn.apache.org/viewvc/james/server/sandbox/active/pure_spring_deployment/build-tools/deployment-build.xml?rev=896058&r1=896057&r2=896058&view=diff
==============================================================================
--- james/server/sandbox/active/pure_spring_deployment/build-tools/deployment-build.xml (original)
+++ james/server/sandbox/active/pure_spring_deployment/build-tools/deployment-build.xml Tue Jan  5 14:16:27 2010
@@ -52,17 +52,11 @@
 				<classpathentry combineaccessrules="false" kind='src' path='/imap-api'/>
 				<classpathentry combineaccessrules="false" kind="src" path="/user-api"/>
 				<classpathentry combineaccessrules="false" kind="src" path="/core-library"/> 				
-				<classpathentry combineaccessrules="false" kind="src" path="/imap-codec-library"/> 
-				<classpathentry combineaccessrules="false" kind="src" path="/imap-command-library"/> 
-				<classpathentry combineaccessrules="false" kind="src" path="/imapmailbox-library"/>
-				<classpathentry combineaccessrules="false" kind="src" path="/mordred-library"/> 
 				<classpathentry combineaccessrules="false" kind="src" path="/user-library"/>
 				<classpathentry combineaccessrules="false" kind="src" path="/avalon-user-function"/> 
 				<classpathentry combineaccessrules="false" kind="src" path="/basic-user-function"/> 
 				<classpathentry combineaccessrules="false" kind="src" path="/experimental-activemq-function"/> 
-				<classpathentry combineaccessrules="false" kind="src" path="/experimental-seda-imap-function"/> 
 				<classpathentry combineaccessrules="false" kind="src" path="/fetchmail-function"/> 
-				<classpathentry combineaccessrules="false" kind="src" path="/imap-mailbox-processor-function"/> 
 				<classpathentry combineaccessrules="false" kind="src" path="/imapserver-function"/> 
 				<classpathentry combineaccessrules="false" kind="src" path="/jcr-store"/> 
 				<classpathentry combineaccessrules="false" kind="src" path="/nntpserver-function"/> 
@@ -71,7 +65,6 @@
 				<classpathentry combineaccessrules="false" kind="src" path="/smtpserver-function"/> 
 				<classpathentry combineaccessrules="false" kind="src" path="/spoolmanager-function"/> 
 				<classpathentry combineaccessrules="false" kind="src" path="/spring-deployment"/> 
-				<classpathentry combineaccessrules="false" kind="src" path="/torque-mailboxmanager-function"/>">
 			</dependencies>
 		</GenerateEclipseProject>
 	</target>

Modified: james/server/sandbox/active/pure_spring_deployment/include.properties
URL: http://svn.apache.org/viewvc/james/server/sandbox/active/pure_spring_deployment/include.properties?rev=896058&r1=896057&r2=896058&view=diff
==============================================================================
--- james/server/sandbox/active/pure_spring_deployment/include.properties (original)
+++ james/server/sandbox/active/pure_spring_deployment/include.properties Tue Jan  5 14:16:27 2010
@@ -100,7 +100,7 @@
 path.lib.jackrabbit=org.apache.jackrabbit/jars
 path.lib.jcr=javax.jcr/jars
 path.lib.backport-util-concurrent=backport-util-concurrent/jars
-# Spring bridge
+
 path.lib.spring=org.springframework/jars
 path.lib.log4j=log4j/jars
 path.lib.h2=com.h2database/jars
@@ -111,8 +111,12 @@
 path.lib.mina=org.apache.mina/jars
 
 # ----- Spring -----
-jarname.spring.jar=spring-2.5.6.jar
-spring.jar=${path.lib.spring}/${jarname.spring.jar}
+jarname.spring-core.jar=spring-core-2.5.6.jar
+spring-core.jar=${path.lib.spring}/${jarname.spring-core.jar}
+jarname.spring-context.jar=spring-context-2.5.6.jar
+spring-context.jar=${path.lib.spring}/${jarname.spring-context.jar}
+jarname.spring-beans.jar=spring-beans-2.5.6.jar
+spring-beans.jar=${path.lib.spring}/${jarname.spring-beans.jar}
 
 jarname.log4j.jar=log4j-1.2.14.jar
 log4j.jar=${path.lib.log4j}/${jarname.log4j.jar}

Modified: james/server/sandbox/active/pure_spring_deployment/pom.xml
URL: http://svn.apache.org/viewvc/james/server/sandbox/active/pure_spring_deployment/pom.xml?rev=896058&r1=896057&r2=896058&view=diff
==============================================================================
--- james/server/sandbox/active/pure_spring_deployment/pom.xml (original)
+++ james/server/sandbox/active/pure_spring_deployment/pom.xml Tue Jan  5 14:16:27 2010
@@ -108,16 +108,7 @@
             </goals>
           </execution>
         </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <descriptorRefs>
-            <descriptorRef>bin</descriptorRef>
-            <descriptorRef>src</descriptorRef>
-          </descriptorRefs>
-        </configuration>
-      </plugin>
+      </plugin>     
     </plugins>
   </build>
   <repositories>
@@ -994,14 +985,7 @@
       <version>2.0.2</version>
       <scope>provided</scope>
     </dependency>
-    <!-- 
-    <dependency>
-      <groupId>xerces</groupId>
-      <artifactId>xercesImpl</artifactId>
-      <version>2.6.2</version>
-      <scope>provided</scope>
-    </dependency>
-     -->
+
     <dependency>
       <groupId>com.thoughtworks.xstream</groupId>
       <artifactId>xstream</artifactId>
@@ -1055,6 +1039,7 @@
       <artifactId>activemq-core</artifactId>
       <version>4.1.1</version>
     </dependency>
+    
     <dependency>
       <groupId>javax.jcr</groupId>
       <artifactId>jcr</artifactId>
@@ -1068,7 +1053,17 @@
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>spring</artifactId>
+      <artifactId>spring-core</artifactId>
+      <version>2.5.6</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-beans</artifactId>
+      <version>2.5.6</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
       <version>2.5.6</version>
     </dependency>
     <dependency>
@@ -1105,6 +1100,7 @@
       <scope>test</scope>
     </dependency>
    
+
   </dependencies>
   </dependencyManagement>
 

Modified: james/server/sandbox/active/pure_spring_deployment/spring-deployment/build.xml
URL: http://svn.apache.org/viewvc/james/server/sandbox/active/pure_spring_deployment/spring-deployment/build.xml?rev=896058&r1=896057&r2=896058&view=diff
==============================================================================
--- james/server/sandbox/active/pure_spring_deployment/spring-deployment/build.xml (original)
+++ james/server/sandbox/active/pure_spring_deployment/spring-deployment/build.xml Tue Jan  5 14:16:27 2010
@@ -135,7 +135,9 @@
         <include name="${jackrabbit-rmi.jar}"/>
         <include name="${jcr.jar}"/>
         <include name="${jsr250.jar}"/>
-        <include name="${spring.jar}"/>
+        <include name="${spring-core.jar}"/>
+        <include name="${spring-context.jar}"/>
+        <include name="${spring-beans.jar}"/>
         <include name="${log4j.jar}"/>
 
         <!-- Protocols should be coupled by deployment only -->

Modified: james/server/sandbox/active/pure_spring_deployment/spring-deployment/pom.xml
URL: http://svn.apache.org/viewvc/james/server/sandbox/active/pure_spring_deployment/spring-deployment/pom.xml?rev=896058&r1=896057&r2=896058&view=diff
==============================================================================
--- james/server/sandbox/active/pure_spring_deployment/spring-deployment/pom.xml (original)
+++ james/server/sandbox/active/pure_spring_deployment/spring-deployment/pom.xml Tue Jan  5 14:16:27 2010
@@ -28,6 +28,7 @@
   <artifactId>james-server-spring-deployment</artifactId>
   <name>Apache JAMES Server Spring Deployment</name>
   <build>
+  
     <plugins>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
@@ -37,18 +38,91 @@
           <target>1.5</target>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>appassembler-maven-plugin</artifactId>
+        <version>1.0</version>
+        <configuration>
+          <!-- Include etc/ in the beginning of the classpath declaration in the bin scripts -->
+          <includeConfigurationDirectoryInClasspath>true</includeConfigurationDirectoryInClasspath>
+          <configurationDirectory>conf</configurationDirectory>
+          <target>${project.build.directory}/appassembler</target>
+          <repositoryLayout>flat</repositoryLayout>
+		  <repositoryName>lib</repositoryName>
+          <includeConfigurationDirectoryInClasspath>true</includeConfigurationDirectoryInClasspath>
+          <!-- Generate bin scripts for windows and unix pr default -->
+          <platforms>
+            <platform>windows</platform>
+            <platform>unix</platform>
+          </platforms>
+          <programs>
+            <program>
+              <mainClass>org.apache.james.container.spring.Main</mainClass>
+              <name>run</name>
+              <!-- Only generate windows bat script for this application -->
+              <platforms>
+                <platform>windows</platform>
+              </platforms>
+            </program>
+            <program>
+              <mainClass>org.apache.james.container.spring.Main</mainClass>
+              <name>run.sh</name>
+              <!-- Only generate unix shell script for this application -->
+              <platforms>
+                <platform>unix</platform>
+              </platforms>
+            </program>
+          </programs>
+        </configuration>
+        <executions>
+          <execution>
+            <id>make-appassemble</id>
+            <phase>package</phase>
+            <goals>
+              <goal>assemble</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+	  <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>2.2-beta-2</version>
+        <configuration>
+          <descriptorSourceDirectory>src/assemble/</descriptorSourceDirectory>
+        </configuration>
+        <executions>
+          <execution>
+            <id>make-assembly</id>
+            <phase>package</phase>
+            <goals>
+              <goal>attached</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
+<repositories>
+    <repository>
+      <id>codehaus-snapshot-repos</id>
+      <name>Codehaus snapshot repos</name>
+      <url>http://snapshots.repository.codehaus.org/</url>
+      <releases>
+        <enabled>false</enabled>
+        <checksumPolicy>ignore</checksumPolicy>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </repository>
+    </repositories>
+  
   <dependencies>
     <dependency>
       <groupId>org.apache.james</groupId>
       <artifactId>james-server-core-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>commons-configuration</groupId>
-      <artifactId>commons-configuration</artifactId>
-    </dependency>
-    <dependency>
       <groupId>org.apache.avalon.framework</groupId>
       <artifactId>avalon-framework-api</artifactId>
     </dependency>
@@ -58,7 +132,15 @@
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>spring</artifactId>
+      <artifactId>spring-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-beans</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
@@ -68,5 +150,169 @@
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
     </dependency>
+
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-mina-socket-library</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-socket-shared-library</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+ 
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-javamail-util</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-common-util</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-user-api</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-socket-api</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-domain-api</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-core-library</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-management-library</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-user-library</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-avalon-socket-library</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <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>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-smtpserver-function</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-imapserver-function</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-core-function</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-pop3server-function</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-nntpserver-function</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-fetchmail-function</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-spoolmanager-function</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-mailets-function</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-remotemanager-function</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-experimental-activemq-function</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-jcr-store</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.apache.avalon.cornerstone.datasources</groupId>
+      <artifactId>cornerstone-datasources-impl</artifactId>
+      <scope>runtime</scope>
+	</dependency> 
+	<dependency>
+      <groupId>org.apache.avalon.cornerstone.threads</groupId>
+      <artifactId>cornerstone-threads-impl</artifactId>
+      <scope>runtime</scope>
+    </dependency> 
+    	<dependency>
+      <groupId>org.apache.avalon.cornerstone.threads</groupId>
+      <artifactId>cornerstone-threads-impl</artifactId>
+      <scope>runtime</scope>
+    </dependency> 
+    <dependency>
+      <groupId>org.apache.avalon.cornerstone.sockets</groupId>
+      <artifactId>cornerstone-sockets-impl</artifactId>
+      <scope>runtime</scope>
+    </dependency> 
+        <dependency>
+      <groupId>org.apache.avalon.cornerstone.sockets</groupId>
+      <artifactId>cornerstone-sockets-impl</artifactId>
+      <scope>runtime</scope>
+    </dependency> 
+    <dependency>
+      <groupId>org.apache.avalon.cornerstone.scheduler</groupId>
+      <artifactId>cornerstone-scheduler-impl</artifactId>
+      <scope>runtime</scope>
+    </dependency> 
+	<dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derby</artifactId>
+      <scope>runtime</scope>
+    </dependency>
   </dependencies>
 </project>
\ No newline at end of file

Added: james/server/sandbox/active/pure_spring_deployment/spring-deployment/src/assemble/bin.xml
URL: http://svn.apache.org/viewvc/james/server/sandbox/active/pure_spring_deployment/spring-deployment/src/assemble/bin.xml?rev=896058&view=auto
==============================================================================
--- james/server/sandbox/active/pure_spring_deployment/spring-deployment/src/assemble/bin.xml (added)
+++ james/server/sandbox/active/pure_spring_deployment/spring-deployment/src/assemble/bin.xml Tue Jan  5 14:16:27 2010
@@ -0,0 +1,92 @@
+<assembly>
+  <!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+  
+  http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed  under the  License is distributed on an "AS IS" BASIS,
+  WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
+  implied.
+  
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+  <id>bin</id>
+  
+  <formats>
+    <format>zip</format>
+    <format>tar.gz</format>
+  </formats>
+  
+  <fileSets>
+  	<!-- include txt files -->
+    <fileSet>
+      <directory>..</directory>
+      <outputDirectory>/</outputDirectory>
+      <includes>
+        <include>LICENSE.*</include>
+        <include>NOTICE.*</include>
+        <include>RELEASE_NOTES.txt</include>
+        <include>MIGRATE.txt</include>
+      </includes>
+    </fileSet>
+    <!-- include configs -->
+    <fileSet>
+      <directory>src/main/config/james</directory>
+      <outputDirectory>conf</outputDirectory>
+      <includes>
+        <include>*.xml</include>
+        <include>*.properties</include>
+      </includes>
+    </fileSet>
+    
+    <!--  create empty folders by copy a .dummy file -->
+     <fileSet>
+      <directory>.</directory>
+      <outputDirectory>log</outputDirectory>
+      <includes>
+        <include>.dummy</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>.</directory>
+      <outputDirectory>var</outputDirectory>
+      <includes>
+        <include>.dummy</include>
+      </includes>
+    </fileSet>
+    
+    <!-- include stuff from appassembler -->
+    <fileSet>
+      <directory>target/appassembler/lib</directory>
+      <outputDirectory>lib</outputDirectory>
+      <includes>
+        <include>*.jar</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>target/appassembler/bin</directory>
+      <outputDirectory>bin</outputDirectory>
+      <fileMode>0755</fileMode>
+      <lineEnding>dos</lineEnding>
+      <includes>
+        <include>*.bat</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>target/appassembler/bin</directory>
+      <outputDirectory>/bin</outputDirectory>
+      <fileMode>0755</fileMode>
+      <lineEnding>unix</lineEnding>
+      <includes>
+        <include>*.sh</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+</assembly>
\ No newline at end of file

Added: james/server/sandbox/active/pure_spring_deployment/stage/org.apache.activemq/poms/activemq-parent-4.1.1.pom
URL: http://svn.apache.org/viewvc/james/server/sandbox/active/pure_spring_deployment/stage/org.apache.activemq/poms/activemq-parent-4.1.1.pom?rev=896058&view=auto
==============================================================================
--- james/server/sandbox/active/pure_spring_deployment/stage/org.apache.activemq/poms/activemq-parent-4.1.1.pom (added)
+++ james/server/sandbox/active/pure_spring_deployment/stage/org.apache.activemq/poms/activemq-parent-4.1.1.pom Tue Jan  5 14:16:27 2010
@@ -0,0 +1,975 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+  
+  http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.apache.activemq</groupId>
+  <artifactId>activemq-parent</artifactId>
+  <version>4.1.1</version>
+  <packaging>pom</packaging>
+  <name>ActiveMQ</name>
+
+  <prerequisites>
+    <maven>2.0.4</maven>
+  </prerequisites>
+
+  <url>http://activemq.apache.org/</url>
+  <organization>
+    <name>Apache Software Foundation</name>
+    <url>http://www.apache.org/</url>
+  </organization>
+
+  <licenses>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+
+  <mailingLists>
+    <mailingList>
+      <name>Development List</name>
+      <subscribe>activemq-dev@geronimo.apache.org</subscribe>
+      <unsubscribe>activemq-dev@geronimo.apache.org</unsubscribe>
+      <post>activemq-dev@geronimo.apache.org</post>
+    </mailingList>
+  </mailingLists>
+
+  <ciManagement>
+    <system>continuum</system>
+    <url>http://goopen.org:8080/continuum</url>
+    <notifiers>
+      <notifier>
+        <configuration>
+          <address>activemq-commits@geronimo.apache.org</address>
+        </configuration>
+      </notifier>
+
+      <notifier>
+        <type>irc</type>
+        <configuration>
+          <host>irc.codehaus.org</host>
+          <port>6667</port>
+          <channel>#activemq-ci</channel>
+        </configuration>
+      </notifier>
+    </notifiers>
+  </ciManagement>
+
+  <repositories>
+    <repository>
+      <id>apache.incubating.releases</id>
+      <name>Apache Incubating Release Distribution Repository</name>
+      <url>http://people.apache.org/repo/m2-incubating-repository</url>
+    </repository>
+    <repository>
+      <id>apache.snapshots</id>
+      <name>Apache Development Snapshot Repository</name>
+      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+    </repository>
+  </repositories>
+
+  <pluginRepositories>
+    <pluginRepository>
+      <id>apache.incubating.releases</id>
+      <name>Apache Incubating Release Distribution Repository</name>
+      <url>http://people.apache.org/repo/m2-incubating-repository</url>
+    </pluginRepository>
+    <pluginRepository>
+      <id>apache.snapshots</id>
+      <name>Apache Development Snapshot Repository</name>
+      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+    </pluginRepository>
+  </pluginRepositories>
+
+  <distributionManagement>
+    <repository>
+      <id>apache.releases</id>
+      <name>Apache Release Distribution Repository</name>
+      <url>${dist-repo-url}</url>
+    </repository>
+    <snapshotRepository>
+      <id>apache.snapshots</id>
+      <name>Apache Development Snapshot Repository</name>
+      <url>scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
+    </snapshotRepository>
+    <site>
+      <id>apache.website</id>
+      <url>${site-repo-url}</url>
+    </site>
+  </distributionManagement>
+
+  <modules>
+    <module>activemq-core</module>
+    <module>activemq-console</module>
+    <module>activemq-jaas</module>
+    <!-- <module>activemq-jpa-store</module> -->
+    <module>activemq-openwire-generator</module>
+    <module>activemq-optional</module>
+    <module>activemq-ra</module>
+    <module>activemq-rar</module>
+    <module>activemq-test-atomikos</module>
+    <module>activemq-tooling</module>
+    <module>activemq-web</module>
+    <module>activemq-web-demo</module>
+    <module>activemq-web-console</module>
+    <module>activemq-xmpp</module>
+    <module>assembly</module>
+  </modules>
+
+  <scm>
+    <connection>scm:svn:https://svn.apache.org/repos/asf/incubator/activemq/trunk</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/activemq/trunk</developerConnection>
+    <url>http://svn.apache.org/viewcvs.cgi/incubator/activemq/trunk/</url>
+  </scm>
+
+  <dependencyManagement>
+    <dependencies>
+      <!-- =============================== -->
+      <!-- ActiveMQ Dependencies -->
+      <!-- =============================== -->
+      <dependency>
+        <groupId>org.apache.activemq</groupId>
+        <artifactId>activemq-core</artifactId>
+        <version>${activemq-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.activemq</groupId>
+        <artifactId>activemq-core</artifactId>
+        <version>${activemq-version}</version>
+        <type>test-jar</type>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.activemq</groupId>
+        <artifactId>activemq-jaas</artifactId>
+        <version>${activemq-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.activemq</groupId>
+        <artifactId>activemq-web</artifactId>
+        <version>${activemq-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.activemq</groupId>
+        <artifactId>activemq-web-demo</artifactId>
+        <version>${activemq-version}</version>
+        <type>war</type>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.activemq</groupId>
+        <artifactId>activemq-gbean-management</artifactId>
+        <version>${activemq-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.activemq</groupId>
+        <artifactId>activemq-console</artifactId>
+        <version>${activemq-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.activemq</groupId>
+        <artifactId>activemq-optional</artifactId>
+        <version>${activemq-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.activemq</groupId>
+        <artifactId>activemq-ra</artifactId>
+        <version>${activemq-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.activemq</groupId>
+        <artifactId>activemq-rar</artifactId>
+        <version>${activemq-version}</version>
+        <type>rar</type>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.activemq</groupId>
+        <artifactId>activemq-web</artifactId>
+        <version>${activemq-version}</version>
+        <type>war</type>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.activemq</groupId>
+        <artifactId>activeio-core</artifactId>
+        <version>3.0.0-incubator</version>
+      </dependency>
+	  <dependency>
+        <groupId>org.apache.activemq</groupId>
+        <artifactId>activemq-openwire-generator</artifactId>
+        <version>${activemq-version}</version>
+      </dependency>
+
+      <!-- =============================== -->
+      <!-- Required dependencies -->
+      <!-- =============================== -->
+      <dependency>
+        <groupId>backport-util-concurrent</groupId>
+        <artifactId>backport-util-concurrent</artifactId>
+        <version>${backport-util-concurrent-version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>commons-logging</groupId>
+        <artifactId>commons-logging</artifactId>
+        <version>${commons-logging-version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-jms_1.1_spec</artifactId>
+        <version>${org-apache-geronimo-specs-version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+        <version>${org-apache-geronimo-specs-version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
+        <version>${org-apache-geronimo-specs-version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
+        <version>${org-apache-geronimo-specs-version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+        <version>${org-apache-geronimo-specs-version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-jsp_2.0_spec</artifactId>
+        <version>${org-apache-geronimo-specs-version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-servlet_2.4_spec</artifactId>
+        <version>${org-apache-geronimo-specs-version}</version>
+      </dependency>
+
+
+      <!-- =============================== -->
+      <!-- Optional dependencies -->
+      <!-- =============================== -->
+      <!--  for custom XML parsing -->
+      <dependency>
+        <groupId>org.apache.xbean</groupId>
+        <artifactId>xbean-spring</artifactId>
+        <version>${xbean-version}</version>
+        <optional>true</optional>
+        <exclusions>
+          <exclusion>
+            <groupId>qdox</groupId>
+            <artifactId>qdox</artifactId>
+          </exclusion>
+        </exclusions>
+        <!--
+          <exclusions>
+          <exclusion>
+          <groupId>backport-util-concurrent</groupId>
+          <artifactId>backport-util-concurrent</artifactId>
+          </exclusion>
+          <exclusion>
+          <groupId>ant</groupId>
+          <artifactId>ant</artifactId>
+          </exclusion>
+          <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+          </exclusion>
+          <exclusion>
+          <groupId>mx4j</groupId>
+          <artifactId>mx4j</artifactId>
+          </exclusion>
+          <exclusion>
+          <groupId>qdox</groupId>
+          <artifactId>qdox</artifactId>
+          </exclusion>
+          <exclusion>
+          <groupId>stax</groupId>
+          <artifactId>stax-api</artifactId>
+          </exclusion>
+          </exclusions>
+        -->
+
+      </dependency>
+
+      <!-- Used to configure the activemq logs -->
+      <dependency>
+        <groupId>log4j</groupId>
+        <artifactId>log4j</artifactId>
+        <version>${log4j-version}</version>
+        <scope>runtime</scope>
+      </dependency>
+
+      <!-- used to support optional transport configuration via URI query strings -->
+
+      <dependency>
+        <groupId>commons-beanutils</groupId>
+        <artifactId>commons-beanutils</artifactId>
+        <version>${commons-beanutils-version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>commons-collections</groupId>
+        <artifactId>commons-collections</artifactId>
+        <version>${commons-collections-version}</version>
+      </dependency>
+
+      <!-- Optional Spring Support -->
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring</artifactId>
+        <version>2.0</version>
+        <optional>true</optional>
+        <exclusions>
+          <exclusion>
+            <groupId>javax.mail</groupId>
+            <artifactId>mail</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>javax.resource</groupId>
+            <artifactId>connector</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>javax.transaction</groupId>
+            <artifactId>jta</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-support</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-orm</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-hibernate</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-remoting</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+
+      <!-- Optional Derby support-->
+      <dependency>
+        <groupId>org.apache.derby</groupId>
+        <artifactId>derby</artifactId>
+        <version>${org-apache-derby-version}</version>
+        <optional>true</optional>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.derby</groupId>
+        <artifactId>derbynet</artifactId>
+        <version>${org-apache-derby-version}</version>
+        <optional>true</optional>
+      </dependency>
+
+      <!-- Optional Axion support -->
+      <dependency>
+        <groupId>axion</groupId>
+        <artifactId>axion</artifactId>
+        <version>${axion-version}</version>
+        <optional>true</optional>
+      </dependency>
+
+      <dependency>
+        <groupId>commons-primitives</groupId>
+        <artifactId>commons-primitives</artifactId>
+        <version>${commons-primitives-version}</version>
+        <optional>true</optional>
+      </dependency>
+
+      <dependency>
+        <groupId>regexp</groupId>
+        <artifactId>regexp</artifactId>
+        <version>${regexp-version}</version>
+        <optional>true</optional>
+      </dependency>
+
+      <!-- Optional HSQL DB Support -->
+      <!--
+        <dependency>
+        <groupId>hsqldb</groupId>
+        <artifactId>hsqldb</artifactId>
+        <version>${hsqldb-version}</version>
+        <optional>true</optional>
+        </dependency>
+      -->
+
+      <dependency>
+        <groupId>commons-dbcp</groupId>
+        <artifactId>commons-dbcp</artifactId>
+        <version>${commons-dbcp-version}</version>
+        <optional>true</optional>
+      </dependency>
+
+      <dependency>
+        <groupId>commons-pool</groupId>
+        <artifactId>commons-pool</artifactId>
+        <version>${commons-pool-version}</version>
+        <optional>true</optional>
+      </dependency>
+
+      <!-- Optional Journal Implementation -->
+      <!--
+        <dependency>
+        <groupId>howl</groupId>
+        <artifactId>howl-logger</artifactId>
+        <version>${howl-version}</version>
+        <optional>true</optional>
+        </dependency>
+      -->
+
+      <!-- Optional Jabber support -->
+      <dependency>
+        <groupId>activemq</groupId>
+        <artifactId>smack</artifactId>
+        <version>1.5.0</version>
+        <optional>true</optional>
+      </dependency>
+
+      <dependency>
+        <groupId>activemq</groupId>
+        <artifactId>smackx</artifactId>
+        <version>1.5.0</version>
+        <optional>true</optional>
+      </dependency>
+
+      <!-- =============================== -->
+      <!-- XML processing dependencies -->
+      <!-- =============================== -->
+      <!-- For XMLBeans -->
+      <dependency>
+        <groupId>xmlbeans</groupId>
+        <artifactId>xbean</artifactId>
+        <version>${xmlbeans-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>xmlbeans</groupId>
+        <artifactId>xmlpublic</artifactId>
+        <version>${xmlbeans-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>xmlbeans</groupId>
+        <artifactId>xbean_xpath</artifactId>
+        <version>${xmlbeans-version}</version>
+      </dependency>
+
+      <!-- For Stax -->
+      <dependency>
+        <groupId>stax</groupId>
+        <artifactId>stax-api</artifactId>
+        <version>1.0</version>
+      </dependency>
+      <dependency>
+        <groupId>stax</groupId>
+        <artifactId>stax</artifactId>
+        <version>1.1.1-dev</version>
+      </dependency>
+
+      <!-- To use XPath using JAXP 1.3 (std in Java 5) -->
+      <dependency>
+        <groupId>activesoap</groupId>
+        <artifactId>jaxp-api</artifactId>
+        <version>1.3</version>
+      </dependency>
+
+      <!-- To use XPath using JAXP 1.2 (easier to add to Java 1.4.x) -->
+      <dependency>
+        <groupId>activesoap</groupId>
+        <artifactId>jaxp-api</artifactId>
+        <version>1.3</version>
+      </dependency>
+
+      <dependency>
+        <groupId>xalan</groupId>
+        <artifactId>xalan</artifactId>
+        <version>2.6.0</version>
+      </dependency>
+
+      <dependency>
+        <groupId>activemq</groupId>
+        <artifactId>jmdns</artifactId>
+        <version>1.0-RC2</version>
+      </dependency>
+      <dependency>
+        <groupId>mx4j</groupId>
+        <artifactId>mx4j</artifactId>
+        <version>${mx4j-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>mx4j</groupId>
+        <artifactId>mx4j-jmx</artifactId>
+        <version>${mx4j-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>mx4j</groupId>
+        <artifactId>mx4j-remote</artifactId>
+        <version>${mx4j-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>mx4j</groupId>
+        <artifactId>mx4j-tools</artifactId>
+        <version>${mx4j-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>mx4j</groupId>
+        <artifactId>mx4j-impl</artifactId>
+        <version>${mx4j-version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>xstream</groupId>
+        <artifactId>xstream</artifactId>
+        <version>${xstream-version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>xmlpull</groupId>
+        <artifactId>xmlpull</artifactId>
+        <version>${xmlpull-version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.mortbay.jetty</groupId>
+        <artifactId>servlet-api-2.5</artifactId>
+        <version>${jetty-version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.mortbay.jetty</groupId>
+        <artifactId>jetty-util</artifactId>
+        <version>${jetty-version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.mortbay.jetty</groupId>
+        <artifactId>jetty</artifactId>
+        <version>${jetty-version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>axis</groupId>
+        <artifactId>axis</artifactId>
+        <version>${axis-version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>commons-httpclient</groupId>
+        <artifactId>commons-httpclient</artifactId>
+        <version>${commons-httpclient-version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>aopalliance</groupId>
+        <artifactId>aopalliance</artifactId>
+        <version>${aopalliance-version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>${junit-version}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>jmock</groupId>
+        <artifactId>jmock</artifactId>
+        <version>${jmock-version}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>jmock</groupId>
+        <artifactId>jmock-cglib</artifactId>
+        <version>${jmock-version}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>cglib</groupId>
+        <artifactId>cglib-full</artifactId>
+        <version>${cglib-version}</version>
+        <scope>test</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>annogen</groupId>
+        <artifactId>annogen</artifactId>
+        <version>${annogen-version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>ant</groupId>
+        <artifactId>ant</artifactId>
+        <version>${ant-version}</version>
+      </dependency>
+
+      <!-- ACTIVEMQ-WEB Specific Dependencies -->
+      <dependency>
+        <groupId>rome</groupId>
+        <artifactId>rome</artifactId>
+        <version>${rome-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>jdom</groupId>
+        <artifactId>jdom</artifactId>
+        <version>${jdom-version}</version>
+      </dependency>
+
+      <!-- ACTIVEMQ-JAAS Dependencies -->
+      <dependency>
+        <groupId>directory</groupId>
+        <artifactId>apacheds-core</artifactId>
+        <version>${directory-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>directory</groupId>
+        <artifactId>apacheds-shared</artifactId>
+        <version>${directory-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>directory-shared</groupId>
+        <artifactId>apache-ldapber-provider</artifactId>
+        <version>${directory-version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>commons-test</groupId>
+            <artifactId>commons-test</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <groupId>directory-shared</groupId>
+        <artifactId>ldap-common</artifactId>
+        <version>${directory-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>directory-asn1</groupId>
+        <artifactId>asn1-codec</artifactId>
+        <version>${directory-asn1-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>directory-asn1</groupId>
+        <artifactId>asn1-der</artifactId>
+        <version>${directory-asn1-version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>commons-test</groupId>
+            <artifactId>commons-test</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <groupId>directory-shared</groupId>
+        <artifactId>kerberos-common</artifactId>
+        <version>${directory-kerboros-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>directory-network</groupId>
+        <artifactId>mina</artifactId>
+        <version>${directory-mina-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>directory-protocols</groupId>
+        <artifactId>kerberos-protocol</artifactId>
+        <version>${directory-kerboros-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>directory-protocols</groupId>
+        <artifactId>ldap-protocol</artifactId>
+        <version>${directory-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-kernel</artifactId>
+        <version>${geronimo-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-j2ee</artifactId>
+        <version>${geronimo-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>howl</groupId>
+        <artifactId>howl-logger</artifactId>
+        <version>${howl-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>p2psockets</groupId>
+        <artifactId>p2psockets-core</artifactId>
+        <version>${p2psockets-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>jxta</groupId>
+        <artifactId>jxta</artifactId>
+        <version>${jxta-version}</version>
+      </dependency>
+
+    </dependencies>
+  </dependencyManagement>
+  <!--
+    <dependencies>
+    <dependency>
+    <groupId>junit</groupId>
+    <artifactId>junit</artifactId>
+    <scope>test</scope>
+    </dependency>
+    <dependency>
+    <groupId>jmock</groupId>
+    <artifactId>jmock</artifactId>
+    <scope>test</scope>
+    </dependency>
+    <dependency>
+    <groupId>jmock</groupId>
+    <artifactId>jmock-cglib</artifactId>
+    <scope>test</scope>
+    </dependency>
+    <dependency>
+    <groupId>cglib</groupId>
+    <artifactId>cglib-full</artifactId>
+    <scope>test</scope>
+    </dependency>
+    </dependencies>
+  -->
+
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>${org-apache-maven-surefire-plugin-version}</version>
+        </plugin>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>javacc-maven-plugin</artifactId>
+          <version>2.0</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-assembly-plugin</artifactId>
+          <version>2.1</version>
+        </plugin>
+        <plugin>
+          <groupId>org.mortbay.jetty</groupId>
+          <artifactId>maven-jetty-plugin</artifactId>
+          <version>${jetty-version}</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-compiler-plugin</artifactId>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-jar-plugin</artifactId>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <index>true</index>
+            <compress>true</compress>
+            <manifestEntries>
+              <Implementation-Vendor>Apache Software Foundation</Implementation-Vendor>
+              <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
+
+              <Package>${project.groupId}</Package>
+              <Extension-Name>${project.artifactId}</Extension-Name>
+              <Implementation-Version>${project.version}</Implementation-Version>
+
+            </manifestEntries>
+          </archive>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-one-plugin</artifactId>
+        <version>1.0</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>install-maven-one-repository</goal>
+              <goal>deploy-maven-one-repository</goal>
+            </goals>
+            <configuration>
+              <remoteRepositoryId>apache.m1.releases</remoteRepositoryId>
+              <remoteRepositoryUrl>${m1-dist-repo-url}</remoteRepositoryUrl>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.4</source>
+          <target>1.4</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>${org-apache-maven-surefire-plugin-version}</version>
+        <configuration>
+          <forkMode>once</forkMode>
+          <redirectTestOutputToFile>true</redirectTestOutputToFile>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-eclipse-plugin</artifactId>
+        <configuration>
+          <outputDirectory>${basedir}/eclipse-classes</outputDirectory>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <reporting>
+    <plugins>
+      <plugin>
+        <artifactId>maven-javadoc-plugin</artifactId>
+      </plugin>
+<!--
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jxr-plugin</artifactId>
+      </plugin>
+-->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-report-plugin</artifactId>
+      </plugin>
+<!--
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-pmd-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>cobertura-maven-plugin</artifactId>
+      </plugin>
+-->
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>taglist-maven-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <configuration>
+          <links>
+            <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
+            <link>http://java.sun.com/j2ee/1.4/docs/api/</link>
+            <link>http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_0/</link>
+            <link>http://jakarta.apache.org/commons/dbcp/apidocs/</link>
+            <link>http://jakarta.apache.org/commons/fileupload/apidocs/</link>
+            <link>http://jakarta.apache.org/commons/httpclient/apidocs/</link>
+            <link>http://jakarta.apache.org/commons/logging/apidocs/</link>
+            <link>http://jakarta.apache.org/commons/pool/apidocs/</link>
+            <link>http://junit.sourceforge.net/javadoc/</link>
+            <link>http://logging.apache.org/log4j/docs/api/</link>
+          </links>
+          <linksource>true</linksource>
+          <maxmemory>900m</maxmemory>
+          <source>1.5</source>
+        </configuration>
+      </plugin>
+    </plugins>
+  </reporting>
+
+  <properties>
+    <activemq-version>4.1.1</activemq-version>
+    <activesoap-version>1.3</activesoap-version>
+    <annogen-version>0.1.0</annogen-version>
+    <ant-version>1.6.2</ant-version>
+    <aopalliance-version>1.0</aopalliance-version>
+    <axion-version>1.0-M3-dev</axion-version>
+    <axis-version>1.2-RC1</axis-version>
+    <backport-util-concurrent-version>2.1</backport-util-concurrent-version>
+    <cglib-version>2.0</cglib-version>
+    <commons-beanutils-version>1.6.1</commons-beanutils-version>
+    <commons-collections-version>2.1</commons-collections-version>
+    <commons-dbcp-version>1.2</commons-dbcp-version>
+    <commons-httpclient-version>2.0.1</commons-httpclient-version>
+    <commons-logging-version>1.1</commons-logging-version>
+    <commons-pool-version>1.2</commons-pool-version>
+    <commons-primitives-version>1.0</commons-primitives-version>
+    <directory-asn1-version>0.3.2</directory-asn1-version>
+    <directory-kerboros-version>0.5</directory-kerboros-version>
+    <directory-mina-version>0.7.3</directory-mina-version>
+    <directory-version>0.9.2</directory-version>
+    <geronimo-version>1.0</geronimo-version>
+    <howl-version>0.1.8</howl-version>
+    <hsqldb-version>1.7.2.2</hsqldb-version>
+    <jdom-version>1.0</jdom-version>
+    <jetty-version>6.0.1</jetty-version>
+    <jmock-version>1.0.1</jmock-version>
+    <junit-version>3.8.1</junit-version>
+    <jxta-version>2.0</jxta-version>
+    <log4j-version>1.2.12</log4j-version>
+    <mx4j-version>2.1.1</mx4j-version>
+    <org-apache-derby-version>10.1.1.0</org-apache-derby-version>
+    <org-apache-geronimo-specs-version>1.0</org-apache-geronimo-specs-version>
+    <org-apache-maven-surefire-plugin-version>2.2</org-apache-maven-surefire-plugin-version>
+    <p2psockets-version>1.1.2</p2psockets-version>
+    <regexp-version>1.3</regexp-version>
+    <rome-version>0.8</rome-version>
+    <stax-version>1.1.1-dev</stax-version>
+    <xalan-version>2.6.0</xalan-version>
+    <xmlbeans-version>2.0.0-beta1</xmlbeans-version>
+    <xmlpull-version>1.1.3.4d_b4_min</xmlpull-version>
+    <xstream-version>1.1.2</xstream-version>
+    <xbean-version>2.8</xbean-version>
+    <dist-repo-url>scpexe://minotaur.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository</dist-repo-url>
+    <m1-dist-repo-url>scpexe://minotaur.apache.org/www/people.apache.org/repo/m1-snapshot-repository</m1-dist-repo-url>
+    <site-repo-url>scpexe://people.apache.org/www/activemq.apache.org/maven/</site-repo-url>
+  </properties>
+</project>

Added: james/server/sandbox/active/pure_spring_deployment/stage/org.springframework/jars/spring-beans-2.5.6.jar
URL: http://svn.apache.org/viewvc/james/server/sandbox/active/pure_spring_deployment/stage/org.springframework/jars/spring-beans-2.5.6.jar?rev=896058&view=auto
==============================================================================
Binary file - no diff available.

Propchange: james/server/sandbox/active/pure_spring_deployment/stage/org.springframework/jars/spring-beans-2.5.6.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: james/server/sandbox/active/pure_spring_deployment/stage/org.springframework/jars/spring-context-2.5.6.jar
URL: http://svn.apache.org/viewvc/james/server/sandbox/active/pure_spring_deployment/stage/org.springframework/jars/spring-context-2.5.6.jar?rev=896058&view=auto
==============================================================================
Binary file - no diff available.

Propchange: james/server/sandbox/active/pure_spring_deployment/stage/org.springframework/jars/spring-context-2.5.6.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: james/server/sandbox/active/pure_spring_deployment/stage/org.springframework/jars/spring-core-2.5.6.jar
URL: http://svn.apache.org/viewvc/james/server/sandbox/active/pure_spring_deployment/stage/org.springframework/jars/spring-core-2.5.6.jar?rev=896058&view=auto
==============================================================================
Binary file - no diff available.

Propchange: james/server/sandbox/active/pure_spring_deployment/stage/org.springframework/jars/spring-core-2.5.6.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: james/server/sandbox/active/pure_spring_deployment/stage/org.springframework/poms/spring-beans-2.5.6.pom
URL: http://svn.apache.org/viewvc/james/server/sandbox/active/pure_spring_deployment/stage/org.springframework/poms/spring-beans-2.5.6.pom?rev=896058&view=auto
==============================================================================
--- james/server/sandbox/active/pure_spring_deployment/stage/org.springframework/poms/spring-beans-2.5.6.pom (added)
+++ james/server/sandbox/active/pure_spring_deployment/stage/org.springframework/poms/spring-beans-2.5.6.pom Tue Jan  5 14:16:27 2010
@@ -0,0 +1,63 @@
+<?xml version="1.0"?>
+<project
+		xmlns="http://maven.apache.org/POM/4.0.0"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.springframework</groupId>
+	<artifactId>spring-beans</artifactId>
+	<packaging>jar</packaging>
+	<name>Spring Framework: Beans</name>
+	<version>2.5.6</version>
+	<description>Spring Framework: Beans</description>
+	<url>http://www.springframework.org</url>
+	<licenses>
+		<license>
+			<name>The Apache Software License, Version 2.0</name>
+			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
+	<scm>
+		<connection>scm:cvs:pserver:anonymous:@springframework.cvs.sourceforge.net:/cvsroot/springframework:spring</connection>
+		<developerConnection>scm:cvs:ext:username@springframework.cvs.sourceforge.net:/cvsroot/springframework:spring</developerConnection>
+		<url>http://springframework.cvs.sourceforge.net/springframework/</url>
+	</scm>
+	<organization>
+		<name>Spring Framework</name>
+		<url>http://www.springframework.org/</url>
+	</organization>
+	<dependencies>
+<!-- External Dependencies -->
+		<dependency>
+			<groupId>cglib</groupId>
+			<artifactId>cglib-nodep</artifactId>
+			<version>2.1_3</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>commons-logging</groupId>
+			<artifactId>commons-logging</artifactId>
+			<version>1.1.1</version>
+		</dependency>
+<!-- Spring Dependencies -->
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-core</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+	</dependencies>
+	<distributionManagement>
+		<repository>
+			<id>local</id>
+			<name>Spring Release Repository</name>
+			<url>file:///Users/benhale/brm/repos/repo</url>
+		</repository>
+		<snapshotRepository>
+			<id>spring-snapshot</id>
+			<name>Spring Snapshot Repository</name>
+			<url>s3://maven.springframework.org/snapshot</url>
+		</snapshotRepository>
+	</distributionManagement>
+</project>

Added: james/server/sandbox/active/pure_spring_deployment/stage/org.springframework/poms/spring-context-2.5.6.pom
URL: http://svn.apache.org/viewvc/james/server/sandbox/active/pure_spring_deployment/stage/org.springframework/poms/spring-context-2.5.6.pom?rev=896058&view=auto
==============================================================================
--- james/server/sandbox/active/pure_spring_deployment/stage/org.springframework/poms/spring-context-2.5.6.pom (added)
+++ james/server/sandbox/active/pure_spring_deployment/stage/org.springframework/poms/spring-context-2.5.6.pom Tue Jan  5 14:16:27 2010
@@ -0,0 +1,109 @@
+<?xml version="1.0"?>
+<project
+		xmlns="http://maven.apache.org/POM/4.0.0"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.springframework</groupId>
+	<artifactId>spring-context</artifactId>
+	<packaging>jar</packaging>
+	<name>Spring Framework: Context</name>
+	<version>2.5.6</version>
+	<description>Spring Framework: Context</description>
+	<url>http://www.springframework.org</url>
+	<licenses>
+		<license>
+			<name>The Apache Software License, Version 2.0</name>
+			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
+	<scm>
+		<connection>scm:cvs:pserver:anonymous:@springframework.cvs.sourceforge.net:/cvsroot/springframework:spring</connection>
+		<developerConnection>scm:cvs:ext:username@springframework.cvs.sourceforge.net:/cvsroot/springframework:spring</developerConnection>
+		<url>http://springframework.cvs.sourceforge.net/springframework/</url>
+	</scm>
+	<organization>
+		<name>Spring Framework</name>
+		<url>http://www.springframework.org/</url>
+	</organization>
+	<dependencies>
+<!-- External Dependencies -->
+		<dependency>
+			<groupId>aopalliance</groupId>
+			<artifactId>aopalliance</artifactId>
+			<version>1.0</version>
+		</dependency>
+		<dependency>
+			<groupId>backport-util-concurrent</groupId>
+			<artifactId>backport-util-concurrent</artifactId>
+			<version>3.0</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>commons-logging</groupId>
+			<artifactId>commons-logging</artifactId>
+			<version>1.1.1</version>
+		</dependency>
+		<dependency>
+			<groupId>com.bea.wlplatform</groupId>
+			<artifactId>commonj-twm</artifactId>
+			<version>1.1</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>javax.ejb</groupId>
+			<artifactId>ejb</artifactId>
+			<version>3.0</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>javax.jms</groupId>
+			<artifactId>jms</artifactId>
+			<version>1.1</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>javax.xml</groupId>
+			<artifactId>jaxrpc-api</artifactId>
+			<version>1.1</version>
+			<scope>provided</scope>
+		</dependency>
+<!-- Spring Dependencies -->
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-agent</artifactId>
+			<version>${project.version}</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-aop</artifactId>
+			<version>${project.version}</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-beans</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-core</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+	</dependencies>
+	<distributionManagement>
+		<repository>
+			<id>local</id>
+			<name>Spring Release Repository</name>
+			<url>file:///Users/benhale/brm/repos/repo</url>
+		</repository>
+		<snapshotRepository>
+			<id>spring-snapshot</id>
+			<name>Spring Snapshot Repository</name>
+			<url>s3://maven.springframework.org/snapshot</url>
+		</snapshotRepository>
+	</distributionManagement>
+</project>

Added: james/server/sandbox/active/pure_spring_deployment/stage/org.springframework/poms/spring-core-2.5.6.pom
URL: http://svn.apache.org/viewvc/james/server/sandbox/active/pure_spring_deployment/stage/org.springframework/poms/spring-core-2.5.6.pom?rev=896058&view=auto
==============================================================================
--- james/server/sandbox/active/pure_spring_deployment/stage/org.springframework/poms/spring-core-2.5.6.pom (added)
+++ james/server/sandbox/active/pure_spring_deployment/stage/org.springframework/poms/spring-core-2.5.6.pom Tue Jan  5 14:16:27 2010
@@ -0,0 +1,88 @@
+<?xml version="1.0"?>
+<project
+		xmlns="http://maven.apache.org/POM/4.0.0"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.springframework</groupId>
+	<artifactId>spring-core</artifactId>
+	<packaging>jar</packaging>
+	<name>Spring Framework: Core</name>
+	<version>2.5.6</version>
+	<description>Spring Framework: Core</description>
+	<url>http://www.springframework.org</url>
+	<licenses>
+		<license>
+			<name>The Apache Software License, Version 2.0</name>
+			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
+	<scm>
+		<connection>scm:cvs:pserver:anonymous:@springframework.cvs.sourceforge.net:/cvsroot/springframework:spring</connection>
+		<developerConnection>scm:cvs:ext:username@springframework.cvs.sourceforge.net:/cvsroot/springframework:spring</developerConnection>
+		<url>http://springframework.cvs.sourceforge.net/springframework/</url>
+	</scm>
+	<organization>
+		<name>Spring Framework</name>
+		<url>http://www.springframework.org/</url>
+	</organization>
+<!-- External Dependencies -->
+	<dependencies>
+		<dependency>
+			<groupId>asm</groupId>
+			<artifactId>asm</artifactId>
+			<version>2.2.3</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>asm</groupId>
+			<artifactId>asm-commons</artifactId>
+			<version>2.2.3</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>asm</groupId>
+			<artifactId>asm-util</artifactId>
+			<version>2.2.3</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>backport-util-concurrent</groupId>
+			<artifactId>backport-util-concurrent</artifactId>
+			<version>3.0</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>commons-collections</groupId>
+			<artifactId>commons-collections</artifactId>
+			<version>3.2</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>commons-logging</groupId>
+			<artifactId>commons-logging</artifactId>
+			<version>1.1.1</version>
+		</dependency>
+		<dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+			<version>1.2.15</version>
+			<optional>true</optional>
+		</dependency>
+<!-- Spring Dependencies -->
+	</dependencies>
+	<distributionManagement>
+		<repository>
+			<id>local</id>
+			<name>Spring Release Repository</name>
+			<url>file:///Users/benhale/brm/repos/repo</url>
+		</repository>
+		<snapshotRepository>
+			<id>spring-snapshot</id>
+			<name>Spring Snapshot Repository</name>
+			<url>s3://maven.springframework.org/snapshot</url>
+		</snapshotRepository>
+	</distributionManagement>
+</project>

Modified: james/server/sandbox/active/pure_spring_deployment/stage/pom.xml
URL: http://svn.apache.org/viewvc/james/server/sandbox/active/pure_spring_deployment/stage/pom.xml?rev=896058&r1=896057&r2=896058&view=diff
==============================================================================
--- james/server/sandbox/active/pure_spring_deployment/stage/pom.xml (original)
+++ james/server/sandbox/active/pure_spring_deployment/stage/pom.xml Tue Jan  5 14:16:27 2010
@@ -286,10 +286,12 @@
       <groupId>mstor</groupId>
       <artifactId>mstor</artifactId>
     </dependency>
+    <!-- 
     <dependency>
       <groupId>xml-apis</groupId>
       <artifactId>xml-apis</artifactId>
     </dependency>
+    -->
     <dependency>
       <groupId>com.thoughtworks.xstream</groupId>
       <artifactId>xstream</artifactId>
@@ -300,6 +302,11 @@
     </dependency>
     
     <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+    </dependency>
+    
+    <dependency>
       <groupId>org.apache.db.torque</groupId>
       <artifactId>runtime</artifactId>
     </dependency>
@@ -327,7 +334,15 @@
 
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>spring</artifactId>
+      <artifactId>spring-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-beans</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>



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