Author: eric
Date: Mon Dec 20 07:55:07 2010
New Revision: 1051014
URL: http://svn.apache.org/viewvc?rev=1051014&view=rev
Log:
ReAttempt to repackage container-spring project
Added:
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/postprocessor/AbstractJamesBeanPostProcessor.java
- copied, changed from r1051011,
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/postprocessor/AbstractLifeCycleBeanPostProcessor.java
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/provider/
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/provider/configuration/
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/provider/configuration/ConfigurationProvider.java
- copied, changed from r1051011,
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/postprocessor/configurable/provider/ConfigurationProvider.java
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/provider/configuration/ConfigurationProviderImpl.java
- copied, changed from r1051011,
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/postprocessor/configurable/provider/ConfigurationProviderImpl.java
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/provider/log/
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/provider/log/LogProvider.java
- copied, changed from r1051011,
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/postprocessor/logenabled/provider/LogProvider.java
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/provider/log/LogProviderImpl.java
- copied, changed from r1051011,
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/postprocessor/logenabled/provider/LogProviderImpl.java
Removed:
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/postprocessor/AbstractLifeCycleBeanPostProcessor.java
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/postprocessor/configurable/provider/
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/postprocessor/logenabled/provider/
Modified:
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/factory/protocolhandlerchain/ProtocolHandlerChainBeanFactory.java
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/configuration/ConfigurationBeanFactoryPostProcessor.java
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/postprocessor/configurable/ConfigurableBeanPostProcessor.java
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/postprocessor/logenabled/LogEnabledBeanPostProcessor.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/bean/factory/protocolhandlerchain/ProtocolHandlerChainBeanFactory.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/factory/protocolhandlerchain/ProtocolHandlerChainBeanFactory.java?rev=1051014&r1=1051013&r2=1051014&view=diff
==============================================================================
---
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/factory/protocolhandlerchain/ProtocolHandlerChainBeanFactory.java
(original)
+++
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/factory/protocolhandlerchain/ProtocolHandlerChainBeanFactory.java
Mon Dec 20 07:55:07 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.bean.postprocessor.configurable.provider.ConfigurationProvider;
-import
org.apache.james.container.spring.bean.postprocessor.logenabled.provider.LogProvider;
+import
org.apache.james.container.spring.provider.configuration.ConfigurationProvider;
+import org.apache.james.container.spring.provider.log.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/bean/factorypostprocessor/configuration/ConfigurationBeanFactoryPostProcessor.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/configuration/ConfigurationBeanFactoryPostProcessor.java?rev=1051014&r1=1051013&r2=1051014&view=diff
==============================================================================
---
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/configuration/ConfigurationBeanFactoryPostProcessor.java
(original)
+++
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/configuration/ConfigurationBeanFactoryPostProcessor.java
Mon Dec 20 07:55:07 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.bean.postprocessor.configurable.provider.ConfigurationProvider;
+import
org.apache.james.container.spring.provider.configuration.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/bean/postprocessor/AbstractJamesBeanPostProcessor.java
(from r1051011,
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/postprocessor/AbstractLifeCycleBeanPostProcessor.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/postprocessor/AbstractJamesBeanPostProcessor.java?p2=james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/postprocessor/AbstractJamesBeanPostProcessor.java&p1=james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/postprocessor/AbstractLifeCycleBeanPostProcessor.java&r1=1051011&r2=1051014&rev=1051014&view=diff
==============================================================================
---
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/postprocessor/AbstractLifeCycleBeanPostProcessor.java
(original)
+++
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/postprocessor/AbstractJamesBeanPostProcessor.java
Mon Dec 20 07:55:07 2010
@@ -34,7 +34,7 @@ import org.springframework.core.Priority
*
* @param <T>
*/
-public abstract class AbstractLifeCycleBeanPostProcessor<T> implements
BeanPostProcessor, PriorityOrdered, BeanFactoryAware {
+public abstract class AbstractJamesBeanPostProcessor<T> implements
BeanPostProcessor, PriorityOrdered, BeanFactoryAware {
private int order = Ordered.HIGHEST_PRECEDENCE;
private ListableBeanFactory factory;
Modified:
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/postprocessor/configurable/ConfigurableBeanPostProcessor.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/postprocessor/configurable/ConfigurableBeanPostProcessor.java?rev=1051014&r1=1051013&r2=1051014&view=diff
==============================================================================
---
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/postprocessor/configurable/ConfigurableBeanPostProcessor.java
(original)
+++
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/postprocessor/configurable/ConfigurableBeanPostProcessor.java
Mon Dec 20 07:55:07 2010
@@ -19,8 +19,8 @@
package org.apache.james.container.spring.bean.postprocessor.configurable;
import org.apache.commons.configuration.HierarchicalConfiguration;
-import
org.apache.james.container.spring.bean.postprocessor.AbstractLifeCycleBeanPostProcessor;
-import
org.apache.james.container.spring.bean.postprocessor.configurable.provider.ConfigurationProvider;
+import
org.apache.james.container.spring.bean.postprocessor.AbstractJamesBeanPostProcessor;
+import
org.apache.james.container.spring.provider.configuration.ConfigurationProvider;
import org.apache.james.lifecycle.api.Configurable;
/**
@@ -28,7 +28,7 @@ import org.apache.james.lifecycle.api.Co
*
*
*/
-public class ConfigurableBeanPostProcessor extends
AbstractLifeCycleBeanPostProcessor<Configurable> {
+public class ConfigurableBeanPostProcessor extends
AbstractJamesBeanPostProcessor<Configurable> {
private ConfigurationProvider provider;
Modified:
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/postprocessor/logenabled/LogEnabledBeanPostProcessor.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/postprocessor/logenabled/LogEnabledBeanPostProcessor.java?rev=1051014&r1=1051013&r2=1051014&view=diff
==============================================================================
---
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/postprocessor/logenabled/LogEnabledBeanPostProcessor.java
(original)
+++
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/postprocessor/logenabled/LogEnabledBeanPostProcessor.java
Mon Dec 20 07:55:07 2010
@@ -18,8 +18,8 @@
****************************************************************/
package org.apache.james.container.spring.bean.postprocessor.logenabled;
-import
org.apache.james.container.spring.bean.postprocessor.AbstractLifeCycleBeanPostProcessor;
-import
org.apache.james.container.spring.bean.postprocessor.logenabled.provider.LogProvider;
+import
org.apache.james.container.spring.bean.postprocessor.AbstractJamesBeanPostProcessor;
+import org.apache.james.container.spring.provider.log.LogProvider;
import org.apache.james.lifecycle.api.LogEnabled;
/**
@@ -27,7 +27,7 @@ import org.apache.james.lifecycle.api.Lo
*
*
*/
-public class LogEnabledBeanPostProcessor extends
AbstractLifeCycleBeanPostProcessor<LogEnabled> {
+public class LogEnabledBeanPostProcessor extends
AbstractJamesBeanPostProcessor<LogEnabled> {
private LogProvider provider;
Copied:
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/provider/configuration/ConfigurationProvider.java
(from r1051011,
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/postprocessor/configurable/provider/ConfigurationProvider.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/provider/configuration/ConfigurationProvider.java?p2=james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/provider/configuration/ConfigurationProvider.java&p1=james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/postprocessor/configurable/provider/ConfigurationProvider.java&r1=1051011&r2=1051014&rev=1051014&view=diff
==============================================================================
---
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/postprocessor/configurable/provider/ConfigurationProvider.java
(original)
+++
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/provider/configuration/ConfigurationProvider.java
Mon Dec 20 07:55:07 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package
org.apache.james.container.spring.bean.postprocessor.configurable.provider;
+package org.apache.james.container.spring.provider.configuration;
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/provider/configuration/ConfigurationProviderImpl.java
(from r1051011,
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/postprocessor/configurable/provider/ConfigurationProviderImpl.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/provider/configuration/ConfigurationProviderImpl.java?p2=james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/provider/configuration/ConfigurationProviderImpl.java&p1=james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/postprocessor/configurable/provider/ConfigurationProviderImpl.java&r1=1051011&r2=1051014&rev=1051014&view=diff
==============================================================================
---
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/postprocessor/configurable/provider/ConfigurationProviderImpl.java
(original)
+++
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/provider/configuration/ConfigurationProviderImpl.java
Mon Dec 20 07:55:07 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package
org.apache.james.container.spring.bean.postprocessor.configurable.provider;
+package org.apache.james.container.spring.provider.configuration;
import java.io.IOException;
import java.util.HashMap;
Copied:
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/provider/log/LogProvider.java
(from r1051011,
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/postprocessor/logenabled/provider/LogProvider.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/provider/log/LogProvider.java?p2=james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/provider/log/LogProvider.java&p1=james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/postprocessor/logenabled/provider/LogProvider.java&r1=1051011&r2=1051014&rev=1051014&view=diff
==============================================================================
---
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/postprocessor/logenabled/provider/LogProvider.java
(original)
+++
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/provider/log/LogProvider.java
Mon Dec 20 07:55:07 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package
org.apache.james.container.spring.bean.postprocessor.logenabled.provider;
+package org.apache.james.container.spring.provider.log;
import org.apache.commons.logging.Log;
Copied:
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/provider/log/LogProviderImpl.java
(from r1051011,
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/postprocessor/logenabled/provider/LogProviderImpl.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/provider/log/LogProviderImpl.java?p2=james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/provider/log/LogProviderImpl.java&p1=james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/postprocessor/logenabled/provider/LogProviderImpl.java&r1=1051011&r2=1051014&rev=1051014&view=diff
==============================================================================
---
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/postprocessor/logenabled/provider/LogProviderImpl.java
(original)
+++
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/provider/log/LogProviderImpl.java
Mon Dec 20 07:55:07 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package
org.apache.james.container.spring.bean.postprocessor.logenabled.provider;
+package org.apache.james.container.spring.provider.log;
import java.util.HashMap;
import java.util.Iterator;
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=1051014&r1=1051013&r2=1051014&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
Mon Dec 20 07:55:07 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.bean.postprocessor.configurable.provider.ConfigurationProvider;
+import
org.apache.james.container.spring.provider.configuration.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=1051014&r1=1051013&r2=1051014&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
Mon Dec 20 07:55:07 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.bean.postprocessor.logenabled.provider.LogProvider;
+import org.apache.james.container.spring.provider.log.LogProvider;
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
