Author: norman
Date: Tue Jun 15 14:20:35 2010
New Revision: 954906
URL: http://svn.apache.org/viewvc?rev=954906&view=rev
Log:
Create a new module called spring-common. It contains reusable spring
components which not depend on been used by spring or spring-dm
Added:
james/server/trunk/spring-common/
james/server/trunk/spring-common/pom.xml
james/server/trunk/spring-common/src/
james/server/trunk/spring-common/src/main/
james/server/trunk/spring-common/src/main/java/
james/server/trunk/spring-common/src/main/java/org/
james/server/trunk/spring-common/src/main/java/org/apache/
james/server/trunk/spring-common/src/main/java/org/apache/james/
james/server/trunk/spring-common/src/main/java/org/apache/james/container/
james/server/trunk/spring-common/src/main/java/org/apache/james/container/spring/
james/server/trunk/spring-common/src/main/java/org/apache/james/container/spring/AbstractMailStore.java
- copied, changed from r954719,
james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/AbstractMailStore.java
james/server/trunk/spring-common/src/main/java/org/apache/james/container/spring/AbstractStore.java
- copied unchanged from r954719,
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/AbstractStore.java
james/server/trunk/spring-common/src/main/java/org/apache/james/container/spring/JamesResourceLoader.java
- copied unchanged from r954719,
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/JamesResourceLoader.java
james/server/trunk/spring-common/src/main/java/org/apache/james/container/spring/Registry.java
- copied unchanged from r954719,
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/Registry.java
james/server/trunk/spring-common/src/main/java/org/apache/james/container/spring/SpringDataSourceSelector.java
- copied unchanged from r954719,
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/SpringDataSourceSelector.java
james/server/trunk/spring-common/src/main/java/org/apache/james/container/spring/SpringFileSystem.java
- copied unchanged from r954719,
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/SpringFileSystem.java
james/server/trunk/spring-common/src/main/java/org/apache/james/container/spring/SpringInstanceFactory.java
- copied unchanged from r954719,
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/SpringInstanceFactory.java
james/server/trunk/spring-common/src/main/java/org/apache/james/container/spring/SpringMailStore.java
- copied, changed from r954719,
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/SpringMailStore.java
james/server/trunk/spring-common/src/main/java/org/apache/james/container/spring/SpringProtocolHandlerChain.java
- copied unchanged from r954719,
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/SpringProtocolHandlerChain.java
james/server/trunk/spring-common/src/main/java/org/apache/james/container/spring/SpringUsersStore.java
- copied unchanged from r954719,
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/SpringUsersStore.java
james/server/trunk/spring-common/src/main/java/org/apache/james/container/spring/SpringVirtualUserTableStore.java
- copied unchanged from r954719,
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/SpringVirtualUserTableStore.java
james/server/trunk/spring-common/src/main/java/org/apache/james/container/spring/lifecycle/
- copied from r954719,
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/lifecycle/
Removed:
james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/AbstractMailStore.java
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/AbstractStore.java
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/JamesResourceLoader.java
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/Registry.java
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/SpringDataSourceSelector.java
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/SpringFileSystem.java
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/SpringInstanceFactory.java
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/SpringMailStore.java
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/SpringProtocolHandlerChain.java
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/SpringUsersStore.java
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/SpringVirtualUserTableStore.java
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/lifecycle/
Modified:
james/server/trunk/pom.xml
james/server/trunk/spring-common/src/main/java/org/apache/james/container/spring/lifecycle/SpringConfigurationRegistry.java
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=954906&r1=954905&r2=954906&view=diff
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Tue Jun 15 14:20:35 2010
@@ -52,7 +52,7 @@
<module>fetchmail</module>
<module>spring-deployment</module>
<module>netty-socket</module>
-
+ <module>spring-common</module>
</modules>
<ciManagement>
<system>hudson</system>
@@ -208,6 +208,11 @@
<dependencies>
<dependency>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-spring-common</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
<artifactId>james-server-netty-socket</artifactId>
<version>${pom.version}</version>
</dependency>
Added: james/server/trunk/spring-common/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/spring-common/pom.xml?rev=954906&view=auto
==============================================================================
--- james/server/trunk/spring-common/pom.xml (added)
+++ james/server/trunk/spring-common/pom.xml Tue Jun 15 14:20:35 2010
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="ISO-8859-15"?>
+<!--
+ 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>
+ <parent>
+ <artifactId>james-server</artifactId>
+ <groupId>org.apache.james</groupId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-spring-common</artifactId>
+ <name>Apache JAMES Server Spring Common</name>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ <manifest>
+
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ <manifest>
+
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ </archive>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>bundle-manifest</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+ </executions>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+
<Export-Package>org.apache.james.container.spring.*</Export-Package>
+ <Embed-Dependency>*;scope=runtime</Embed-Dependency>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-user-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-core-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james.protocols</groupId>
+ <artifactId>protocols-api</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.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+
+
+
+ </dependencies>
+</project>
Copied:
james/server/trunk/spring-common/src/main/java/org/apache/james/container/spring/AbstractMailStore.java
(from r954719,
james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/AbstractMailStore.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/spring-common/src/main/java/org/apache/james/container/spring/AbstractMailStore.java?p2=james/server/trunk/spring-common/src/main/java/org/apache/james/container/spring/AbstractMailStore.java&p1=james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/AbstractMailStore.java&r1=954719&r2=954906&rev=954906&view=diff
==============================================================================
---
james/server/trunk/core-function/src/main/java/org/apache/james/mailrepository/AbstractMailStore.java
(original)
+++
james/server/trunk/spring-common/src/main/java/org/apache/james/container/spring/AbstractMailStore.java
Tue Jun 15 14:20:35 2010
@@ -19,7 +19,7 @@
-package org.apache.james.mailrepository;
+package org.apache.james.container.spring;
import java.util.HashMap;
import java.util.List;
Copied:
james/server/trunk/spring-common/src/main/java/org/apache/james/container/spring/SpringMailStore.java
(from r954719,
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/SpringMailStore.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/spring-common/src/main/java/org/apache/james/container/spring/SpringMailStore.java?p2=james/server/trunk/spring-common/src/main/java/org/apache/james/container/spring/SpringMailStore.java&p1=james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/SpringMailStore.java&r1=954719&r2=954906&rev=954906&view=diff
==============================================================================
---
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/SpringMailStore.java
(original)
+++
james/server/trunk/spring-common/src/main/java/org/apache/james/container/spring/SpringMailStore.java
Tue Jun 15 14:20:35 2010
@@ -23,7 +23,6 @@ import javax.annotation.Resource;
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.commons.logging.Log;
-import org.apache.james.mailrepository.AbstractMailStore;
import org.apache.james.services.MailRepository;
import org.apache.james.services.store.Store;
import org.springframework.beans.BeansException;
Modified:
james/server/trunk/spring-common/src/main/java/org/apache/james/container/spring/lifecycle/SpringConfigurationRegistry.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/spring-common/src/main/java/org/apache/james/container/spring/lifecycle/SpringConfigurationRegistry.java?rev=954906&r1=954719&r2=954906&view=diff
==============================================================================
---
james/server/trunk/spring-common/src/main/java/org/apache/james/container/spring/lifecycle/SpringConfigurationRegistry.java
(original)
+++
james/server/trunk/spring-common/src/main/java/org/apache/james/container/spring/lifecycle/SpringConfigurationRegistry.java
Tue Jun 15 14:20:35 2010
@@ -53,7 +53,7 @@ public class SpringConfigurationRegistry
if (conf != null) {
return conf;
} else {
- Resource r = loader.getResource("file://conf/" + name + ".xml");
+ Resource r = loader.getResource(getConfigPrefix()+ name +
".xml");
if (r.exists()) {
try {
return getConfig(r);
@@ -66,6 +66,10 @@ public class SpringConfigurationRegistry
}
+ protected String getConfigPrefix() {
+ return "file://conf/";
+ }
+
/*
* (non-Javadoc)
* @see
org.springframework.context.ResourceLoaderAware#setResourceLoader(org.springframework.core.io.ResourceLoader)
Modified: james/server/trunk/spring-deployment/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/pom.xml?rev=954906&r1=954905&r2=954906&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/pom.xml (original)
+++ james/server/trunk/spring-deployment/pom.xml Tue Jun 15 14:20:35 2010
@@ -319,6 +319,10 @@
<dependencies>
<dependency>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-spring-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
<artifactId>james-server-core-api</artifactId>
</dependency>
<dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
