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/12/19 11:37:43 UTC
svn commit: r1050795 - in /james/server/trunk:
container-spring/src/main/java/org/apache/james/container/spring/
container-spring/src/main/java/org/apache/james/container/spring/lifecycle/
container-spring/src/main/java/org/apache/james/container/sprin...
Author: norman
Date: Sun Dec 19 10:37:42 2010
New Revision: 1050795
URL: http://svn.apache.org/viewvc?rev=1050795&view=rev
Log:
More package rename etc in container-spring
Added:
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/api/
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/api/AbstractLifeCycleBeanPostProcessor.java
- copied, changed from r1050433, james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/AbstractLifeCycleBeanPostProcessor.java
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/api/ConfigurationProvider.java
- copied, changed from r1050433, james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/ConfigurationProvider.java
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/api/LogProvider.java
- copied, changed from r1050433, james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/LogProvider.java
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/api/RestrictedLifeCycleBeanPostProcessor.java
- copied, changed from r1050433, james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/RestrictedLifeCycleBeanPostProcessor.java
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/impl/
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/impl/CommonsConfigurableBeanPostProcessor.java
- copied, changed from r1050433, james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/CommonsConfigurableBeanPostProcessor.java
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/impl/LogEnabledBeanPostProcessor.java
- copied, changed from r1050433, james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/LogEnabledBeanPostProcessor.java
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/impl/SpringConfigurationProvider.java
- copied, changed from r1050433, james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/SpringConfigurationProvider.java
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/impl/SpringLogProvider.java
- copied, changed from r1050433, james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/SpringLogProvider.java
Removed:
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/AbstractLifeCycleBeanPostProcessor.java
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/CommonsConfigurableBeanPostProcessor.java
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/ConfigurationProvider.java
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/LogEnabledBeanPostProcessor.java
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/LogProvider.java
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/RestrictedLifeCycleBeanPostProcessor.java
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/SpringConfigurationProvider.java
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/SpringLogProvider.java
Modified:
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/BeanFactoryProtocolHandlerChain.java
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/JamesLoaderBeanFactoryPostProcessor.java
james/server/trunk/osgi/src/main/java/org/apache/james/container/osgi/JamesOsgiBeanFactoryPostProcessor.java
james/server/trunk/osgi/src/main/java/org/apache/james/container/osgi/OsgiConfigurationProvider.java
james/server/trunk/osgi/src/main/java/org/apache/james/container/osgi/OsgiLogProvider.java
Modified: james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/BeanFactoryProtocolHandlerChain.java
URL: http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/BeanFactoryProtocolHandlerChain.java?rev=1050795&r1=1050794&r2=1050795&view=diff
==============================================================================
--- james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/BeanFactoryProtocolHandlerChain.java (original)
+++ james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/BeanFactoryProtocolHandlerChain.java Sun Dec 19 10:37:42 2010
@@ -28,8 +28,8 @@ import org.apache.commons.configuration.
import org.apache.commons.configuration.DefaultConfigurationBuilder;
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.commons.logging.Log;
-import org.apache.james.container.spring.lifecycle.ConfigurationProvider;
-import org.apache.james.container.spring.lifecycle.LogProvider;
+import org.apache.james.container.spring.lifecycle.api.ConfigurationProvider;
+import org.apache.james.container.spring.lifecycle.api.LogProvider;
import org.apache.james.protocols.api.ExtensibleHandler;
import org.apache.james.protocols.api.HandlersPackage;
import org.apache.james.protocols.api.ProtocolHandlerChain;
Modified: james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/JamesLoaderBeanFactoryPostProcessor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/JamesLoaderBeanFactoryPostProcessor.java?rev=1050795&r1=1050794&r2=1050795&view=diff
==============================================================================
--- james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/JamesLoaderBeanFactoryPostProcessor.java (original)
+++ james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/JamesLoaderBeanFactoryPostProcessor.java Sun Dec 19 10:37:42 2010
@@ -23,7 +23,7 @@ import java.util.Map;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
-import org.apache.james.container.spring.lifecycle.ConfigurationProvider;
+import org.apache.james.container.spring.lifecycle.api.ConfigurationProvider;
import org.springframework.beans.BeansException;
import org.springframework.beans.FatalBeanException;
import org.springframework.beans.factory.config.BeanDefinition;
Copied: james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/api/AbstractLifeCycleBeanPostProcessor.java (from r1050433, james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/AbstractLifeCycleBeanPostProcessor.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/api/AbstractLifeCycleBeanPostProcessor.java?p2=james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/api/AbstractLifeCycleBeanPostProcessor.java&p1=james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/AbstractLifeCycleBeanPostProcessor.java&r1=1050433&r2=1050795&rev=1050795&view=diff
==============================================================================
--- james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/AbstractLifeCycleBeanPostProcessor.java (original)
+++ james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/api/AbstractLifeCycleBeanPostProcessor.java Sun Dec 19 10:37:42 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.container.spring.lifecycle;
+package org.apache.james.container.spring.lifecycle.api;
import org.springframework.beans.BeansException;
import org.springframework.beans.FatalBeanException;
Copied: james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/api/ConfigurationProvider.java (from r1050433, james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/ConfigurationProvider.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/api/ConfigurationProvider.java?p2=james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/api/ConfigurationProvider.java&p1=james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/ConfigurationProvider.java&r1=1050433&r2=1050795&rev=1050795&view=diff
==============================================================================
--- james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/ConfigurationProvider.java (original)
+++ james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/api/ConfigurationProvider.java Sun Dec 19 10:37:42 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.container.spring.lifecycle;
+package org.apache.james.container.spring.lifecycle.api;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
Copied: james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/api/LogProvider.java (from r1050433, james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/LogProvider.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/api/LogProvider.java?p2=james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/api/LogProvider.java&p1=james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/LogProvider.java&r1=1050433&r2=1050795&rev=1050795&view=diff
==============================================================================
--- james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/LogProvider.java (original)
+++ james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/api/LogProvider.java Sun Dec 19 10:37:42 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.container.spring.lifecycle;
+package org.apache.james.container.spring.lifecycle.api;
import org.apache.commons.logging.Log;
Copied: james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/api/RestrictedLifeCycleBeanPostProcessor.java (from r1050433, james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/RestrictedLifeCycleBeanPostProcessor.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/api/RestrictedLifeCycleBeanPostProcessor.java?p2=james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/api/RestrictedLifeCycleBeanPostProcessor.java&p1=james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/RestrictedLifeCycleBeanPostProcessor.java&r1=1050433&r2=1050795&rev=1050795&view=diff
==============================================================================
--- james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/RestrictedLifeCycleBeanPostProcessor.java (original)
+++ james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/api/RestrictedLifeCycleBeanPostProcessor.java Sun Dec 19 10:37:42 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.container.spring.lifecycle;
+package org.apache.james.container.spring.lifecycle.api;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanFactory;
Copied: james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/impl/CommonsConfigurableBeanPostProcessor.java (from r1050433, james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/CommonsConfigurableBeanPostProcessor.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/impl/CommonsConfigurableBeanPostProcessor.java?p2=james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/impl/CommonsConfigurableBeanPostProcessor.java&p1=james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/CommonsConfigurableBeanPostProcessor.java&r1=1050433&r2=1050795&rev=1050795&view=diff
==============================================================================
--- james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/CommonsConfigurableBeanPostProcessor.java (original)
+++ james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/impl/CommonsConfigurableBeanPostProcessor.java Sun Dec 19 10:37:42 2010
@@ -16,9 +16,11 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.container.spring.lifecycle;
+package org.apache.james.container.spring.lifecycle.impl;
import org.apache.commons.configuration.HierarchicalConfiguration;
+import org.apache.james.container.spring.lifecycle.api.ConfigurationProvider;
+import org.apache.james.container.spring.lifecycle.api.RestrictedLifeCycleBeanPostProcessor;
import org.apache.james.lifecycle.api.Configurable;
/**
Copied: james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/impl/LogEnabledBeanPostProcessor.java (from r1050433, james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/LogEnabledBeanPostProcessor.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/impl/LogEnabledBeanPostProcessor.java?p2=james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/impl/LogEnabledBeanPostProcessor.java&p1=james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/LogEnabledBeanPostProcessor.java&r1=1050433&r2=1050795&rev=1050795&view=diff
==============================================================================
--- james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/LogEnabledBeanPostProcessor.java (original)
+++ james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/impl/LogEnabledBeanPostProcessor.java Sun Dec 19 10:37:42 2010
@@ -16,8 +16,10 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.container.spring.lifecycle;
+package org.apache.james.container.spring.lifecycle.impl;
+import org.apache.james.container.spring.lifecycle.api.LogProvider;
+import org.apache.james.container.spring.lifecycle.api.RestrictedLifeCycleBeanPostProcessor;
import org.apache.james.lifecycle.api.LogEnabled;
/**
Copied: james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/impl/SpringConfigurationProvider.java (from r1050433, james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/SpringConfigurationProvider.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/impl/SpringConfigurationProvider.java?p2=james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/impl/SpringConfigurationProvider.java&p1=james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/SpringConfigurationProvider.java&r1=1050433&r2=1050795&rev=1050795&view=diff
==============================================================================
--- james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/SpringConfigurationProvider.java (original)
+++ james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/impl/SpringConfigurationProvider.java Sun Dec 19 10:37:42 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.container.spring.lifecycle;
+package org.apache.james.container.spring.lifecycle.impl;
import java.io.IOException;
import java.util.HashMap;
@@ -26,6 +26,7 @@ import java.util.Map;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.commons.configuration.XMLConfiguration;
+import org.apache.james.container.spring.lifecycle.api.ConfigurationProvider;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.context.ResourceLoaderAware;
import org.springframework.core.io.Resource;
Copied: james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/impl/SpringLogProvider.java (from r1050433, james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/SpringLogProvider.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/impl/SpringLogProvider.java?p2=james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/impl/SpringLogProvider.java&p1=james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/SpringLogProvider.java&r1=1050433&r2=1050795&rev=1050795&view=diff
==============================================================================
--- james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/SpringLogProvider.java (original)
+++ james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/impl/SpringLogProvider.java Sun Dec 19 10:37:42 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.container.spring.lifecycle;
+package org.apache.james.container.spring.lifecycle.impl;
import java.util.HashMap;
import java.util.Iterator;
@@ -24,6 +24,7 @@ import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.impl.Log4JLogger;
+import org.apache.james.container.spring.lifecycle.api.LogProvider;
import org.springframework.beans.factory.InitializingBean;
/**
Modified: james/server/trunk/osgi/src/main/java/org/apache/james/container/osgi/JamesOsgiBeanFactoryPostProcessor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/osgi/src/main/java/org/apache/james/container/osgi/JamesOsgiBeanFactoryPostProcessor.java?rev=1050795&r1=1050794&r2=1050795&view=diff
==============================================================================
--- james/server/trunk/osgi/src/main/java/org/apache/james/container/osgi/JamesOsgiBeanFactoryPostProcessor.java (original)
+++ james/server/trunk/osgi/src/main/java/org/apache/james/container/osgi/JamesOsgiBeanFactoryPostProcessor.java Sun Dec 19 10:37:42 2010
@@ -21,8 +21,8 @@ package org.apache.james.container.osgi;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
-import org.apache.james.container.spring.lifecycle.CommonsConfigurableBeanPostProcessor;
-import org.apache.james.container.spring.lifecycle.LogEnabledBeanPostProcessor;
+import org.apache.james.container.spring.lifecycle.impl.CommonsConfigurableBeanPostProcessor;
+import org.apache.james.container.spring.lifecycle.impl.LogEnabledBeanPostProcessor;
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleException;
import org.osgi.framework.InvalidSyntaxException;
Modified: james/server/trunk/osgi/src/main/java/org/apache/james/container/osgi/OsgiConfigurationProvider.java
URL: http://svn.apache.org/viewvc/james/server/trunk/osgi/src/main/java/org/apache/james/container/osgi/OsgiConfigurationProvider.java?rev=1050795&r1=1050794&r2=1050795&view=diff
==============================================================================
--- james/server/trunk/osgi/src/main/java/org/apache/james/container/osgi/OsgiConfigurationProvider.java (original)
+++ james/server/trunk/osgi/src/main/java/org/apache/james/container/osgi/OsgiConfigurationProvider.java Sun Dec 19 10:37:42 2010
@@ -23,7 +23,7 @@ import java.io.File;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.commons.configuration.XMLConfiguration;
-import org.apache.james.container.spring.lifecycle.ConfigurationProvider;
+import org.apache.james.container.spring.lifecycle.api.ConfigurationProvider;
/**
* Load configuration files from the specified configuration directory
Modified: james/server/trunk/osgi/src/main/java/org/apache/james/container/osgi/OsgiLogProvider.java
URL: http://svn.apache.org/viewvc/james/server/trunk/osgi/src/main/java/org/apache/james/container/osgi/OsgiLogProvider.java?rev=1050795&r1=1050794&r2=1050795&view=diff
==============================================================================
--- james/server/trunk/osgi/src/main/java/org/apache/james/container/osgi/OsgiLogProvider.java (original)
+++ james/server/trunk/osgi/src/main/java/org/apache/james/container/osgi/OsgiLogProvider.java Sun Dec 19 10:37:42 2010
@@ -20,7 +20,7 @@ package org.apache.james.container.osgi;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.james.container.spring.lifecycle.LogProvider;
+import org.apache.james.container.spring.lifecycle.api.LogProvider;
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org