Author: norman
Date: Sun Jun 13 18:14:53 2010
New Revision: 954277
URL: http://svn.apache.org/viewvc?rev=954277&view=rev
Log:
Move classes to eliminate strange package structure
Added:
james/server/trunk/core-api/src/main/java/org/apache/james/services/AbstractJSR250InstanceFactory.java
- copied, changed from r954034,
james/server/trunk/core-api/src/main/java/org/apache/james/api/kernel/AbstractJSR250InstanceFactory.java
james/server/trunk/core-api/src/main/java/org/apache/james/services/InstanceFactory.java
- copied, changed from r954034,
james/server/trunk/core-api/src/main/java/org/apache/james/api/kernel/InstanceFactory.java
james/server/trunk/core-api/src/test/java/org/apache/james/services/
- copied from r954034,
james/server/trunk/core-api/src/test/java/org/apache/james/api/kernel/mock/
Removed:
james/server/trunk/core-api/src/main/java/org/apache/james/api/kernel/AbstractJSR250InstanceFactory.java
james/server/trunk/core-api/src/main/java/org/apache/james/api/kernel/InstanceFactory.java
james/server/trunk/core-api/src/test/java/org/apache/james/api/kernel/mock/
Modified:
james/server/trunk/core-api/src/test/java/org/apache/james/services/FakeLoader.java
james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/netty/ProtocolHandlerChainImpl.java
james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/AbstractLoader.java
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/SpringInstanceFactory.java
Copied:
james/server/trunk/core-api/src/main/java/org/apache/james/services/AbstractJSR250InstanceFactory.java
(from r954034,
james/server/trunk/core-api/src/main/java/org/apache/james/api/kernel/AbstractJSR250InstanceFactory.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/core-api/src/main/java/org/apache/james/services/AbstractJSR250InstanceFactory.java?p2=james/server/trunk/core-api/src/main/java/org/apache/james/services/AbstractJSR250InstanceFactory.java&p1=james/server/trunk/core-api/src/main/java/org/apache/james/api/kernel/AbstractJSR250InstanceFactory.java&r1=954034&r2=954277&rev=954277&view=diff
==============================================================================
---
james/server/trunk/core-api/src/main/java/org/apache/james/api/kernel/AbstractJSR250InstanceFactory.java
(original)
+++
james/server/trunk/core-api/src/main/java/org/apache/james/services/AbstractJSR250InstanceFactory.java
Sun Jun 13 18:14:53 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.api.kernel;
+package org.apache.james.services;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
Copied:
james/server/trunk/core-api/src/main/java/org/apache/james/services/InstanceFactory.java
(from r954034,
james/server/trunk/core-api/src/main/java/org/apache/james/api/kernel/InstanceFactory.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/core-api/src/main/java/org/apache/james/services/InstanceFactory.java?p2=james/server/trunk/core-api/src/main/java/org/apache/james/services/InstanceFactory.java&p1=james/server/trunk/core-api/src/main/java/org/apache/james/api/kernel/InstanceFactory.java&r1=954034&r2=954277&rev=954277&view=diff
==============================================================================
---
james/server/trunk/core-api/src/main/java/org/apache/james/api/kernel/InstanceFactory.java
(original)
+++
james/server/trunk/core-api/src/main/java/org/apache/james/services/InstanceFactory.java
Sun Jun 13 18:14:53 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.api.kernel;
+package org.apache.james.services;
/**
* Loads instances of given types.
Modified:
james/server/trunk/core-api/src/test/java/org/apache/james/services/FakeLoader.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/core-api/src/test/java/org/apache/james/services/FakeLoader.java?rev=954277&r1=954034&r2=954277&view=diff
==============================================================================
---
james/server/trunk/core-api/src/test/java/org/apache/james/services/FakeLoader.java
(original)
+++
james/server/trunk/core-api/src/test/java/org/apache/james/services/FakeLoader.java
Sun Jun 13 18:14:53 2010
@@ -22,7 +22,7 @@ package org.apache.james.api.kernel.mock
import java.util.HashMap;
import java.util.Map;
-import org.apache.james.api.kernel.AbstractJSR250InstanceFactory;
+import org.apache.james.services.AbstractJSR250InstanceFactory;
public class FakeLoader extends AbstractJSR250InstanceFactory {
Modified:
james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/netty/ProtocolHandlerChainImpl.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/netty/ProtocolHandlerChainImpl.java?rev=954277&r1=954276&r2=954277&view=diff
==============================================================================
---
james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/netty/ProtocolHandlerChainImpl.java
(original)
+++
james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/netty/ProtocolHandlerChainImpl.java
Sun Jun 13 18:14:53 2010
@@ -31,7 +31,6 @@ import org.apache.commons.configuration.
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.james.api.kernel.AbstractJSR250InstanceFactory;
import org.apache.james.lifecycle.Configurable;
import org.apache.james.lifecycle.LogEnabled;
@@ -39,6 +38,7 @@ import org.apache.james.protocols.api.Ex
import org.apache.james.protocols.api.HandlersPackage;
import org.apache.james.protocols.api.ProtocolHandlerChain;
import org.apache.james.protocols.api.WiringException;
+import org.apache.james.services.AbstractJSR250InstanceFactory;
/**
* Abstract class which HandlerChains should extend
Modified:
james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/AbstractLoader.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/AbstractLoader.java?rev=954277&r1=954276&r2=954277&view=diff
==============================================================================
---
james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/AbstractLoader.java
(original)
+++
james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/AbstractLoader.java
Sun Jun 13 18:14:53 2010
@@ -28,10 +28,10 @@ import javax.annotation.Resource;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.commons.logging.Log;
-import org.apache.james.api.kernel.InstanceFactory;
-import org.apache.james.api.kernel.InstanceFactory.InstanceException;
import org.apache.james.lifecycle.Configurable;
import org.apache.james.lifecycle.LogEnabled;
+import org.apache.james.services.InstanceFactory;
+import org.apache.james.services.InstanceFactory.InstanceException;
import org.apache.mailet.MailetContext;
import org.apache.mailet.MailetException;
Modified:
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/SpringInstanceFactory.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/SpringInstanceFactory.java?rev=954277&r1=954276&r2=954277&view=diff
==============================================================================
---
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/SpringInstanceFactory.java
(original)
+++
james/server/trunk/spring-deployment/src/main/java/org/apache/james/container/spring/SpringInstanceFactory.java
Sun Jun 13 18:14:53 2010
@@ -19,7 +19,7 @@
package org.apache.james.container.spring;
-import org.apache.james.api.kernel.InstanceFactory;
+import org.apache.james.services.InstanceFactory;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.BeanFactoryAware;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
