You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wink.apache.org by gp...@apache.org on 2013/08/23 19:40:38 UTC
svn commit: r1516945 - in /wink/2.x/trunk:
wink-bv-server/src/main/java/org/apache/wink/bv/server/internal/validation/bv/
wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/
wink-common/src/main/java/org/apache/wink/common/internal/reg...
Author: gpetracek
Date: Fri Aug 23 17:40:36 2013
New Revision: 1516945
URL: http://svn.apache.org/r1516945
Log:
WINK-397 LifecycleManager, ObjectFactory and ObjectCreationException moved to the wink-spi
Added:
wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/spi/
wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/spi/lifecycle/
wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/spi/lifecycle/LifecycleManager.java
- copied, changed from r1511913, wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/LifecycleManager.java
wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/spi/lifecycle/ObjectCreationException.java
- copied, changed from r1511913, wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/ObjectCreationException.java
wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/spi/lifecycle/ObjectFactory.java
- copied, changed from r1511913, wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/ObjectFactory.java
wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/utils/SpiUtils.java
wink/2.x/trunk/wink-jcdi-server/src/main/resources/META-INF/services/org.apache.wink.common.spi.lifecycle.LifecycleManager
Removed:
wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/LifecycleManager.java
wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/ObjectCreationException.java
wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/ObjectFactory.java
wink/2.x/trunk/wink-jcdi-server/src/main/java/org/apache/wink/jcdi/server/internal/CdiDeploymentConfiguration.java
wink/2.x/trunk/wink-jcdi-server/src/main/java/org/apache/wink/jcdi/server/internal/servlet/CdiRestServlet.java
Modified:
wink/2.x/trunk/wink-bv-server/src/main/java/org/apache/wink/bv/server/internal/validation/bv/BeanValidationExceptionMapper.java
wink/2.x/trunk/wink-bv-server/src/main/java/org/apache/wink/bv/server/internal/validation/bv/BeanValidationInvocationValidator.java
wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/CreationUtils.java
wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/DefaultLifecycleManager.java
wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/JSR250LifecycleManager.java
wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/JSR250LifecycleManagerUtils.java
wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/LifecycleManagerUtils.java
wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/LifecycleManagersRegistry.java
wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/PrototypeObjectFactory.java
wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/ScopeLifecycleManager.java
wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/SingletonObjectFactory.java
wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/ProvidersRegistry.java
wink/2.x/trunk/wink-common/src/test/java/org/apache/wink/common/internal/lifecycle/JSR250OFFactoryTest.java
wink/2.x/trunk/wink-guice-server/src/main/java/org/apache/wink/guice/server/internal/lifecycle/GuiceInjectorLifeCycleManager.java
wink/2.x/trunk/wink-guice-server/src/main/java/org/apache/wink/guice/server/internal/lifecycle/WinkGuiceModule.java
wink/2.x/trunk/wink-guice-server/src/main/java/org/apache/wink/guice/server/internal/servlet/GuiceRestServlet.java
wink/2.x/trunk/wink-jcdi-server/src/main/java/org/apache/wink/jcdi/server/internal/CdiAwareObjectFactory.java
wink/2.x/trunk/wink-jcdi-server/src/main/java/org/apache/wink/jcdi/server/internal/CdiLifecycleManager.java
wink/2.x/trunk/wink-jcdi-server/src/test/java/org/apache/wink/jcdi/server/test/WinkCdiTest.java
wink/2.x/trunk/wink-osgi/src/main/java/org/apache/wink/osgi/internal/ThreadRootResourceDeploymentConfiguration.java
wink/2.x/trunk/wink-server/src/main/java/org/apache/wink/server/internal/DeploymentConfiguration.java
wink/2.x/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceInstance.java
wink/2.x/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceRecord.java
wink/2.x/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceRecordFactory.java
wink/2.x/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/RestServlet.java
wink/2.x/trunk/wink-server/src/test/java/org/apache/wink/server/internal/application/ApplicationLifecycleManagamentTest.java
wink/2.x/trunk/wink-server/src/test/java/org/apache/wink/server/internal/application/ApplicationLifecycleManagement2Test.java
wink/2.x/trunk/wink-server/src/test/java/org/apache/wink/server/internal/lifecycle/ProvidersLifecycle1Test.java
wink/2.x/trunk/wink-server/src/test/java/org/apache/wink/server/internal/lifecycle/ProvidersLifecycle2Test.java
wink/2.x/trunk/wink-server/src/test/java/org/apache/wink/server/internal/lifecycle/ResourceLifecycle1Test.java
wink/2.x/trunk/wink-server/src/test/java/org/apache/wink/server/internal/lifecycle/ResourceLifecycle2Test.java
wink/2.x/trunk/wink-server/src/test/java/org/apache/wink/server/internal/lifecycle/ResourceLifecycle3Test.java
wink/2.x/trunk/wink-server/src/test/java/org/apache/wink/server/internal/lifecycle/ResourceLifecycle4Test.java
wink/2.x/trunk/wink-server/src/test/java/org/apache/wink/server/internal/lifecycle/ResourceLifecycle5Test.java
wink/2.x/trunk/wink-server/src/test/java/org/apache/wink/server/internal/lifecycle/ResourceLifecycle6Test.java
wink/2.x/trunk/wink-server/src/test/java/org/apache/wink/server/internal/lifecycle/ResourceLifecycle7Test.java
wink/2.x/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/SpringLifecycleManager.java
wink/2.x/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/SpringObjectFactory.java
Modified: wink/2.x/trunk/wink-bv-server/src/main/java/org/apache/wink/bv/server/internal/validation/bv/BeanValidationExceptionMapper.java
URL: http://svn.apache.org/viewvc/wink/2.x/trunk/wink-bv-server/src/main/java/org/apache/wink/bv/server/internal/validation/bv/BeanValidationExceptionMapper.java?rev=1516945&r1=1516944&r2=1516945&view=diff
==============================================================================
--- wink/2.x/trunk/wink-bv-server/src/main/java/org/apache/wink/bv/server/internal/validation/bv/BeanValidationExceptionMapper.java (original)
+++ wink/2.x/trunk/wink-bv-server/src/main/java/org/apache/wink/bv/server/internal/validation/bv/BeanValidationExceptionMapper.java Fri Aug 23 17:40:36 2013
@@ -20,6 +20,7 @@
package org.apache.wink.bv.server.internal.validation.bv;
import org.apache.wink.bv.server.spi.ConstraintViolationEntityFactory;
+import org.apache.wink.common.utils.SpiUtils;
import javax.validation.ConstraintViolation;
import javax.validation.ValidationException;
@@ -30,7 +31,6 @@ import javax.ws.rs.ext.Provider;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import java.util.ServiceLoader;
import java.util.Set;
@Provider
@@ -68,8 +68,8 @@ public class BeanValidationExceptionMapp
private ConstraintViolationEntityFactory getConstraintViolationEntityFactory(
List<MediaType> acceptableMediaTypes, EntityResult entityResult) {
- ServiceLoader<ConstraintViolationEntityFactory> entityFactories =
- ServiceLoader.load(ConstraintViolationEntityFactory.class); //TODO discuss and add cache
+ List<ConstraintViolationEntityFactory> entityFactories =
+ SpiUtils.loadServices(ConstraintViolationEntityFactory.class); //TODO discuss and add cache
for (MediaType mediaType : acceptableMediaTypes) {
for (ConstraintViolationEntityFactory entityFactory : entityFactories) {
Modified: wink/2.x/trunk/wink-bv-server/src/main/java/org/apache/wink/bv/server/internal/validation/bv/BeanValidationInvocationValidator.java
URL: http://svn.apache.org/viewvc/wink/2.x/trunk/wink-bv-server/src/main/java/org/apache/wink/bv/server/internal/validation/bv/BeanValidationInvocationValidator.java?rev=1516945&r1=1516944&r2=1516945&view=diff
==============================================================================
--- wink/2.x/trunk/wink-bv-server/src/main/java/org/apache/wink/bv/server/internal/validation/bv/BeanValidationInvocationValidator.java (original)
+++ wink/2.x/trunk/wink-bv-server/src/main/java/org/apache/wink/bv/server/internal/validation/bv/BeanValidationInvocationValidator.java Fri Aug 23 17:40:36 2013
@@ -22,7 +22,7 @@ package org.apache.wink.bv.server.intern
import org.apache.wink.common.RuntimeContext;
import org.apache.wink.common.WinkApplication;
import org.apache.wink.common.internal.lifecycle.LifecycleManagersRegistry;
-import org.apache.wink.common.internal.lifecycle.ObjectFactory;
+import org.apache.wink.common.spi.lifecycle.ObjectFactory;
import org.apache.wink.common.internal.registry.ProvidersRegistry;
import org.apache.wink.server.handlers.MessageContext;
import org.apache.wink.server.internal.BootstrappingContext;
Modified: wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/CreationUtils.java
URL: http://svn.apache.org/viewvc/wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/CreationUtils.java?rev=1516945&r1=1516944&r2=1516945&view=diff
==============================================================================
--- wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/CreationUtils.java (original)
+++ wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/CreationUtils.java Fri Aug 23 17:40:36 2013
@@ -38,6 +38,7 @@ import org.apache.wink.common.internal.r
import org.apache.wink.common.internal.registry.InjectableFactory;
import org.apache.wink.common.internal.registry.metadata.ClassMetadata;
import org.apache.wink.common.internal.registry.metadata.ConstructorMetadata;
+import org.apache.wink.common.spi.lifecycle.ObjectCreationException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/DefaultLifecycleManager.java
URL: http://svn.apache.org/viewvc/wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/DefaultLifecycleManager.java?rev=1516945&r1=1516944&r2=1516945&view=diff
==============================================================================
--- wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/DefaultLifecycleManager.java (original)
+++ wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/DefaultLifecycleManager.java Fri Aug 23 17:40:36 2013
@@ -23,6 +23,8 @@ import org.apache.wink.common.internal.i
import org.apache.wink.common.internal.registry.metadata.ApplicationMetadataCollector;
import org.apache.wink.common.internal.registry.metadata.ProviderMetadataCollector;
import org.apache.wink.common.internal.registry.metadata.ResourceMetadataCollector;
+import org.apache.wink.common.spi.lifecycle.LifecycleManager;
+import org.apache.wink.common.spi.lifecycle.ObjectFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/JSR250LifecycleManager.java
URL: http://svn.apache.org/viewvc/wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/JSR250LifecycleManager.java?rev=1516945&r1=1516944&r2=1516945&view=diff
==============================================================================
--- wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/JSR250LifecycleManager.java (original)
+++ wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/JSR250LifecycleManager.java Fri Aug 23 17:40:36 2013
@@ -22,6 +22,8 @@ package org.apache.wink.common.internal.
import org.apache.wink.common.internal.registry.metadata.ApplicationMetadataCollector;
import org.apache.wink.common.internal.registry.metadata.ProviderMetadataCollector;
import org.apache.wink.common.internal.registry.metadata.ResourceMetadataCollector;
+import org.apache.wink.common.spi.lifecycle.LifecycleManager;
+import org.apache.wink.common.spi.lifecycle.ObjectFactory;
/**
* <p>
Modified: wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/JSR250LifecycleManagerUtils.java
URL: http://svn.apache.org/viewvc/wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/JSR250LifecycleManagerUtils.java?rev=1516945&r1=1516944&r2=1516945&view=diff
==============================================================================
--- wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/JSR250LifecycleManagerUtils.java (original)
+++ wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/JSR250LifecycleManagerUtils.java Fri Aug 23 17:40:36 2013
@@ -35,6 +35,8 @@ import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
import org.apache.wink.common.internal.registry.metadata.ClassMetadata;
+import org.apache.wink.common.spi.lifecycle.ObjectCreationException;
+import org.apache.wink.common.spi.lifecycle.ObjectFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/LifecycleManagerUtils.java
URL: http://svn.apache.org/viewvc/wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/LifecycleManagerUtils.java?rev=1516945&r1=1516944&r2=1516945&view=diff
==============================================================================
--- wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/LifecycleManagerUtils.java (original)
+++ wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/LifecycleManagerUtils.java Fri Aug 23 17:40:36 2013
@@ -28,6 +28,8 @@ import org.apache.wink.common.internal.r
import org.apache.wink.common.internal.registry.metadata.ClassMetadata;
import org.apache.wink.common.internal.registry.metadata.ProviderMetadataCollector;
import org.apache.wink.common.internal.registry.metadata.ResourceMetadataCollector;
+import org.apache.wink.common.spi.lifecycle.ObjectCreationException;
+import org.apache.wink.common.spi.lifecycle.ObjectFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/LifecycleManagersRegistry.java
URL: http://svn.apache.org/viewvc/wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/LifecycleManagersRegistry.java?rev=1516945&r1=1516944&r2=1516945&view=diff
==============================================================================
--- wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/LifecycleManagersRegistry.java (original)
+++ wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/LifecycleManagersRegistry.java Fri Aug 23 17:40:36 2013
@@ -19,6 +19,9 @@
*******************************************************************************/
package org.apache.wink.common.internal.lifecycle;
+import org.apache.wink.common.spi.lifecycle.LifecycleManager;
+import org.apache.wink.common.spi.lifecycle.ObjectFactory;
+
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
Modified: wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/PrototypeObjectFactory.java
URL: http://svn.apache.org/viewvc/wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/PrototypeObjectFactory.java?rev=1516945&r1=1516944&r2=1516945&view=diff
==============================================================================
--- wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/PrototypeObjectFactory.java (original)
+++ wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/PrototypeObjectFactory.java Fri Aug 23 17:40:36 2013
@@ -22,6 +22,7 @@ package org.apache.wink.common.internal.
import org.apache.wink.common.RuntimeContext;
import org.apache.wink.common.internal.i18n.Messages;
import org.apache.wink.common.internal.registry.metadata.ClassMetadata;
+import org.apache.wink.common.spi.lifecycle.ObjectFactory;
/**
* Implements ObjectFactory that creates a new object for each call based on its
Modified: wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/ScopeLifecycleManager.java
URL: http://svn.apache.org/viewvc/wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/ScopeLifecycleManager.java?rev=1516945&r1=1516944&r2=1516945&view=diff
==============================================================================
--- wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/ScopeLifecycleManager.java (original)
+++ wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/ScopeLifecycleManager.java Fri Aug 23 17:40:36 2013
@@ -21,6 +21,8 @@ package org.apache.wink.common.internal.
import org.apache.wink.common.annotations.Scope;
import org.apache.wink.common.annotations.Scope.ScopeType;
+import org.apache.wink.common.spi.lifecycle.LifecycleManager;
+import org.apache.wink.common.spi.lifecycle.ObjectFactory;
/**
* Implements a LifecycleManager that creates objects based on the Scope
Modified: wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/SingletonObjectFactory.java
URL: http://svn.apache.org/viewvc/wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/SingletonObjectFactory.java?rev=1516945&r1=1516944&r2=1516945&view=diff
==============================================================================
--- wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/SingletonObjectFactory.java (original)
+++ wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/SingletonObjectFactory.java Fri Aug 23 17:40:36 2013
@@ -20,6 +20,7 @@
package org.apache.wink.common.internal.lifecycle;
import org.apache.wink.common.RuntimeContext;
+import org.apache.wink.common.spi.lifecycle.ObjectFactory;
/**
* Creates a ObjectFactory that always returns a same instance.
Modified: wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/ProvidersRegistry.java
URL: http://svn.apache.org/viewvc/wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/ProvidersRegistry.java?rev=1516945&r1=1516944&r2=1516945&view=diff
==============================================================================
--- wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/ProvidersRegistry.java (original)
+++ wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/ProvidersRegistry.java Fri Aug 23 17:40:36 2013
@@ -50,7 +50,7 @@ import org.apache.wink.common.WinkApplic
import org.apache.wink.common.internal.application.ApplicationValidator;
import org.apache.wink.common.internal.i18n.Messages;
import org.apache.wink.common.internal.lifecycle.LifecycleManagersRegistry;
-import org.apache.wink.common.internal.lifecycle.ObjectFactory;
+import org.apache.wink.common.spi.lifecycle.ObjectFactory;
import org.apache.wink.common.internal.log.Providers;
import org.apache.wink.common.internal.utils.AnnotationUtils;
import org.apache.wink.common.internal.utils.GenericsUtils;
Copied: wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/spi/lifecycle/LifecycleManager.java (from r1511913, wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/LifecycleManager.java)
URL: http://svn.apache.org/viewvc/wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/spi/lifecycle/LifecycleManager.java?p2=wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/spi/lifecycle/LifecycleManager.java&p1=wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/LifecycleManager.java&r1=1511913&r2=1516945&rev=1516945&view=diff
==============================================================================
--- wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/LifecycleManager.java (original)
+++ wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/spi/lifecycle/LifecycleManager.java Fri Aug 23 17:40:36 2013
@@ -17,7 +17,7 @@
* under the License.
*
*******************************************************************************/
-package org.apache.wink.common.internal.lifecycle;
+package org.apache.wink.common.spi.lifecycle;
/**
* <h3>LifecycleManager</h3> Used to create ObjectFactory
Copied: wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/spi/lifecycle/ObjectCreationException.java (from r1511913, wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/ObjectCreationException.java)
URL: http://svn.apache.org/viewvc/wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/spi/lifecycle/ObjectCreationException.java?p2=wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/spi/lifecycle/ObjectCreationException.java&p1=wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/ObjectCreationException.java&r1=1511913&r2=1516945&rev=1516945&view=diff
==============================================================================
--- wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/ObjectCreationException.java (original)
+++ wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/spi/lifecycle/ObjectCreationException.java Fri Aug 23 17:40:36 2013
@@ -17,7 +17,7 @@
* under the License.
*
*******************************************************************************/
-package org.apache.wink.common.internal.lifecycle;
+package org.apache.wink.common.spi.lifecycle;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.Response;
Copied: wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/spi/lifecycle/ObjectFactory.java (from r1511913, wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/ObjectFactory.java)
URL: http://svn.apache.org/viewvc/wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/spi/lifecycle/ObjectFactory.java?p2=wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/spi/lifecycle/ObjectFactory.java&p1=wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/ObjectFactory.java&r1=1511913&r2=1516945&rev=1516945&view=diff
==============================================================================
--- wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/ObjectFactory.java (original)
+++ wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/spi/lifecycle/ObjectFactory.java Fri Aug 23 17:40:36 2013
@@ -17,7 +17,7 @@
* under the License.
*
*******************************************************************************/
-package org.apache.wink.common.internal.lifecycle;
+package org.apache.wink.common.spi.lifecycle;
import org.apache.wink.common.RuntimeContext;
Added: wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/utils/SpiUtils.java
URL: http://svn.apache.org/viewvc/wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/utils/SpiUtils.java?rev=1516945&view=auto
==============================================================================
--- wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/utils/SpiUtils.java (added)
+++ wink/2.x/trunk/wink-common/src/main/java/org/apache/wink/common/utils/SpiUtils.java Fri Aug 23 17:40:36 2013
@@ -0,0 +1,60 @@
+/*******************************************************************************
+ * 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.
+ *
+ *******************************************************************************/
+package org.apache.wink.common.utils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.ServiceLoader;
+
+public abstract class SpiUtils {
+ private SpiUtils() {
+ }
+
+ public static <T> T loadService(Class<T> serviceType) {
+ List<T> result = loadServices(serviceType);
+
+ if (result.isEmpty()) {
+ return null;
+ }
+
+ if (result.size() > 1) {
+ StringBuilder errorMessage = new StringBuilder();
+ for (T serviceInstance : result) {
+ if (errorMessage.length() > 0) {
+ errorMessage.append("; ");
+ }
+ errorMessage.append(serviceInstance.getClass().getName());
+ }
+ errorMessage.append(" found for ");
+ errorMessage.append(serviceType.getName());
+ throw new IllegalStateException(errorMessage.toString());
+ }
+ return result.iterator().next();
+ }
+
+ public static <T> List<T> loadServices(Class<T> serviceType) {
+ List<T> result = new ArrayList<T>();
+
+ for (T serviceInstance : ServiceLoader.load(serviceType)) {
+ result.add(serviceInstance);
+ }
+ return result;
+ }
+}
Modified: wink/2.x/trunk/wink-common/src/test/java/org/apache/wink/common/internal/lifecycle/JSR250OFFactoryTest.java
URL: http://svn.apache.org/viewvc/wink/2.x/trunk/wink-common/src/test/java/org/apache/wink/common/internal/lifecycle/JSR250OFFactoryTest.java?rev=1516945&r1=1516944&r2=1516945&view=diff
==============================================================================
--- wink/2.x/trunk/wink-common/src/test/java/org/apache/wink/common/internal/lifecycle/JSR250OFFactoryTest.java (original)
+++ wink/2.x/trunk/wink-common/src/test/java/org/apache/wink/common/internal/lifecycle/JSR250OFFactoryTest.java Fri Aug 23 17:40:36 2013
@@ -26,6 +26,7 @@ import javax.ws.rs.ext.Provider;
import org.apache.wink.common.RuntimeContext;
import org.apache.wink.common.internal.runtime.RuntimeContextTLS;
+import org.apache.wink.common.spi.lifecycle.ObjectFactory;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
Modified: wink/2.x/trunk/wink-guice-server/src/main/java/org/apache/wink/guice/server/internal/lifecycle/GuiceInjectorLifeCycleManager.java
URL: http://svn.apache.org/viewvc/wink/2.x/trunk/wink-guice-server/src/main/java/org/apache/wink/guice/server/internal/lifecycle/GuiceInjectorLifeCycleManager.java?rev=1516945&r1=1516944&r2=1516945&view=diff
==============================================================================
--- wink/2.x/trunk/wink-guice-server/src/main/java/org/apache/wink/guice/server/internal/lifecycle/GuiceInjectorLifeCycleManager.java (original)
+++ wink/2.x/trunk/wink-guice-server/src/main/java/org/apache/wink/guice/server/internal/lifecycle/GuiceInjectorLifeCycleManager.java Fri Aug 23 17:40:36 2013
@@ -24,9 +24,9 @@ import java.lang.reflect.InvocationTarge
import java.util.List;
import org.apache.wink.common.RuntimeContext;
-import org.apache.wink.common.internal.lifecycle.LifecycleManager;
-import org.apache.wink.common.internal.lifecycle.ObjectCreationException;
-import org.apache.wink.common.internal.lifecycle.ObjectFactory;
+import org.apache.wink.common.spi.lifecycle.LifecycleManager;
+import org.apache.wink.common.spi.lifecycle.ObjectCreationException;
+import org.apache.wink.common.spi.lifecycle.ObjectFactory;
import org.apache.wink.common.internal.registry.Injectable;
import org.apache.wink.common.internal.registry.InjectableFactory;
import org.apache.wink.common.internal.registry.metadata.ApplicationMetadataCollector;
Modified: wink/2.x/trunk/wink-guice-server/src/main/java/org/apache/wink/guice/server/internal/lifecycle/WinkGuiceModule.java
URL: http://svn.apache.org/viewvc/wink/2.x/trunk/wink-guice-server/src/main/java/org/apache/wink/guice/server/internal/lifecycle/WinkGuiceModule.java?rev=1516945&r1=1516944&r2=1516945&view=diff
==============================================================================
--- wink/2.x/trunk/wink-guice-server/src/main/java/org/apache/wink/guice/server/internal/lifecycle/WinkGuiceModule.java (original)
+++ wink/2.x/trunk/wink-guice-server/src/main/java/org/apache/wink/guice/server/internal/lifecycle/WinkGuiceModule.java Fri Aug 23 17:40:36 2013
@@ -24,7 +24,7 @@ import java.security.PrivilegedActionExc
import org.apache.wink.common.internal.i18n.Messages;
import org.apache.wink.common.internal.lifecycle.CreationUtils;
-import org.apache.wink.common.internal.lifecycle.ObjectCreationException;
+import org.apache.wink.common.spi.lifecycle.ObjectCreationException;
import org.apache.wink.common.internal.registry.metadata.ClassMetadata;
import org.apache.wink.common.internal.registry.metadata.ProviderMetadataCollector;
import org.apache.wink.common.internal.registry.metadata.ResourceMetadataCollector;
Modified: wink/2.x/trunk/wink-guice-server/src/main/java/org/apache/wink/guice/server/internal/servlet/GuiceRestServlet.java
URL: http://svn.apache.org/viewvc/wink/2.x/trunk/wink-guice-server/src/main/java/org/apache/wink/guice/server/internal/servlet/GuiceRestServlet.java?rev=1516945&r1=1516944&r2=1516945&view=diff
==============================================================================
--- wink/2.x/trunk/wink-guice-server/src/main/java/org/apache/wink/guice/server/internal/servlet/GuiceRestServlet.java (original)
+++ wink/2.x/trunk/wink-guice-server/src/main/java/org/apache/wink/guice/server/internal/servlet/GuiceRestServlet.java Fri Aug 23 17:40:36 2013
@@ -27,6 +27,7 @@ import org.apache.wink.server.internal.s
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+@Deprecated //TODO same refactoring as in the cdi-module
public class GuiceRestServlet extends RestServlet {
private static final String DEPLYMENT_CONF_PARAM = "deploymentConfiguration";
Modified: wink/2.x/trunk/wink-jcdi-server/src/main/java/org/apache/wink/jcdi/server/internal/CdiAwareObjectFactory.java
URL: http://svn.apache.org/viewvc/wink/2.x/trunk/wink-jcdi-server/src/main/java/org/apache/wink/jcdi/server/internal/CdiAwareObjectFactory.java?rev=1516945&r1=1516944&r2=1516945&view=diff
==============================================================================
--- wink/2.x/trunk/wink-jcdi-server/src/main/java/org/apache/wink/jcdi/server/internal/CdiAwareObjectFactory.java (original)
+++ wink/2.x/trunk/wink-jcdi-server/src/main/java/org/apache/wink/jcdi/server/internal/CdiAwareObjectFactory.java Fri Aug 23 17:40:36 2013
@@ -19,7 +19,7 @@
package org.apache.wink.jcdi.server.internal;
import org.apache.wink.common.RuntimeContext;
-import org.apache.wink.common.internal.lifecycle.ObjectFactory;
+import org.apache.wink.common.spi.lifecycle.ObjectFactory;
import javax.enterprise.context.Dependent;
import javax.enterprise.context.spi.CreationalContext;
Modified: wink/2.x/trunk/wink-jcdi-server/src/main/java/org/apache/wink/jcdi/server/internal/CdiLifecycleManager.java
URL: http://svn.apache.org/viewvc/wink/2.x/trunk/wink-jcdi-server/src/main/java/org/apache/wink/jcdi/server/internal/CdiLifecycleManager.java?rev=1516945&r1=1516944&r2=1516945&view=diff
==============================================================================
--- wink/2.x/trunk/wink-jcdi-server/src/main/java/org/apache/wink/jcdi/server/internal/CdiLifecycleManager.java (original)
+++ wink/2.x/trunk/wink-jcdi-server/src/main/java/org/apache/wink/jcdi/server/internal/CdiLifecycleManager.java Fri Aug 23 17:40:36 2013
@@ -19,9 +19,10 @@
package org.apache.wink.jcdi.server.internal;
import org.apache.wink.common.internal.i18n.Messages;
-import org.apache.wink.common.internal.lifecycle.LifecycleManager;
-import org.apache.wink.common.internal.lifecycle.ObjectCreationException;
-import org.apache.wink.common.internal.lifecycle.ObjectFactory;
+import org.apache.wink.common.spi.lifecycle.LifecycleManager;
+import org.apache.wink.common.spi.lifecycle.ObjectCreationException;
+import org.apache.wink.common.spi.lifecycle.ObjectFactory;
+import org.apache.wink.common.utils.SpiUtils;
import org.apache.wink.jcdi.server.internal.util.CdiUtils;
import org.apache.wink.jcdi.server.spi.BeanManagerResolver;
import org.slf4j.Logger;
@@ -34,12 +35,16 @@ public class CdiLifecycleManager<T> impl
private final BeanManagerResolver beanManagerResolver;
- public CdiLifecycleManager(BeanManagerResolver beanManagerResolver) {
+ public CdiLifecycleManager() {
+ BeanManagerResolver beanManagerResolver = SpiUtils.loadService(BeanManagerResolver.class);
+
+ if (beanManagerResolver == null) {
+ beanManagerResolver = new DefaultBeanManagerResolver();
+ }
this.beanManagerResolver = beanManagerResolver;
logger.trace("CdiLifecycleManager created");
}
-
public ObjectFactory<T> createObjectFactory(T object) throws ObjectCreationException {
logger.trace("createObjectFactory({}) entry", object);
if (object == null) {
Added: wink/2.x/trunk/wink-jcdi-server/src/main/resources/META-INF/services/org.apache.wink.common.spi.lifecycle.LifecycleManager
URL: http://svn.apache.org/viewvc/wink/2.x/trunk/wink-jcdi-server/src/main/resources/META-INF/services/org.apache.wink.common.spi.lifecycle.LifecycleManager?rev=1516945&view=auto
==============================================================================
--- wink/2.x/trunk/wink-jcdi-server/src/main/resources/META-INF/services/org.apache.wink.common.spi.lifecycle.LifecycleManager (added)
+++ wink/2.x/trunk/wink-jcdi-server/src/main/resources/META-INF/services/org.apache.wink.common.spi.lifecycle.LifecycleManager Fri Aug 23 17:40:36 2013
@@ -0,0 +1,18 @@
+# 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.
+
+org.apache.wink.jcdi.server.internal.CdiLifecycleManager
Modified: wink/2.x/trunk/wink-jcdi-server/src/test/java/org/apache/wink/jcdi/server/test/WinkCdiTest.java
URL: http://svn.apache.org/viewvc/wink/2.x/trunk/wink-jcdi-server/src/test/java/org/apache/wink/jcdi/server/test/WinkCdiTest.java?rev=1516945&r1=1516944&r2=1516945&view=diff
==============================================================================
--- wink/2.x/trunk/wink-jcdi-server/src/test/java/org/apache/wink/jcdi/server/test/WinkCdiTest.java (original)
+++ wink/2.x/trunk/wink-jcdi-server/src/test/java/org/apache/wink/jcdi/server/test/WinkCdiTest.java Fri Aug 23 17:40:36 2013
@@ -23,10 +23,10 @@ import org.apache.wink.client.ClientConf
import org.apache.wink.client.Resource;
import org.apache.wink.client.RestClient;
import org.apache.wink.common.model.synd.SyndFeed;
-import org.apache.wink.jcdi.server.internal.servlet.CdiRestServlet;
import org.apache.wink.jcdi.server.test.controller.TestController;
import org.apache.wink.jcdi.server.test.service.SimpleTestService;
import org.apache.wink.jcdi.server.test.util.ArchiveUtils;
+import org.apache.wink.server.internal.servlet.RestServlet;
import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.container.test.api.RunAsClient;
import org.jboss.arquillian.junit.Arquillian;
@@ -66,7 +66,7 @@ public class WinkCdiTest {
" version=\"3.0\">\n" +
" <servlet>\n" +
" <servlet-name>wink-test</servlet-name>\n" +
- " <servlet-class>" + CdiRestServlet.class.getName() + "</servlet-class>\n" +
+ " <servlet-class>" + RestServlet.class.getName() + "</servlet-class>\n" +
" <init-param>\n" +
" <param-name>applicationConfigLocation</param-name>\n" +
" <param-value>/WEB-INF/" + TEST_APPLICATION_FILE_NAME + "</param-value>\n" +
Modified: wink/2.x/trunk/wink-osgi/src/main/java/org/apache/wink/osgi/internal/ThreadRootResourceDeploymentConfiguration.java
URL: http://svn.apache.org/viewvc/wink/2.x/trunk/wink-osgi/src/main/java/org/apache/wink/osgi/internal/ThreadRootResourceDeploymentConfiguration.java?rev=1516945&r1=1516944&r2=1516945&view=diff
==============================================================================
--- wink/2.x/trunk/wink-osgi/src/main/java/org/apache/wink/osgi/internal/ThreadRootResourceDeploymentConfiguration.java (original)
+++ wink/2.x/trunk/wink-osgi/src/main/java/org/apache/wink/osgi/internal/ThreadRootResourceDeploymentConfiguration.java Fri Aug 23 17:40:36 2013
@@ -28,7 +28,7 @@ import javax.ws.rs.WebApplicationExcepti
import org.apache.wink.common.RuntimeContext;
import org.apache.wink.common.internal.lifecycle.LifecycleManagersRegistry;
-import org.apache.wink.common.internal.lifecycle.ObjectFactory;
+import org.apache.wink.common.spi.lifecycle.ObjectFactory;
import org.apache.wink.common.internal.registry.metadata.ClassMetadata;
import org.apache.wink.common.internal.registry.metadata.ResourceMetadataCollector;
import org.apache.wink.common.internal.uritemplate.UriTemplateMatcher;
Modified: wink/2.x/trunk/wink-server/src/main/java/org/apache/wink/server/internal/DeploymentConfiguration.java
URL: http://svn.apache.org/viewvc/wink/2.x/trunk/wink-server/src/main/java/org/apache/wink/server/internal/DeploymentConfiguration.java?rev=1516945&r1=1516944&r2=1516945&view=diff
==============================================================================
--- wink/2.x/trunk/wink-server/src/main/java/org/apache/wink/server/internal/DeploymentConfiguration.java (original)
+++ wink/2.x/trunk/wink-server/src/main/java/org/apache/wink/server/internal/DeploymentConfiguration.java Fri Aug 23 17:40:36 2013
@@ -26,11 +26,13 @@ import org.apache.wink.common.internal.a
import org.apache.wink.common.internal.i18n.Messages;
import org.apache.wink.common.internal.lifecycle.JSR250LifecycleManager;
import org.apache.wink.common.internal.lifecycle.LifecycleManagersRegistry;
-import org.apache.wink.common.internal.lifecycle.ObjectFactory;
+import org.apache.wink.common.spi.lifecycle.LifecycleManager;
+import org.apache.wink.common.spi.lifecycle.ObjectFactory;
import org.apache.wink.common.internal.lifecycle.ScopeLifecycleManager;
import org.apache.wink.common.internal.registry.InjectableFactory;
import org.apache.wink.common.internal.registry.ProvidersRegistry;
import org.apache.wink.common.internal.utils.FileLoader;
+import org.apache.wink.common.utils.SpiUtils;
import org.apache.wink.server.handlers.Handler;
import org.apache.wink.server.handlers.HandlersFactory;
import org.apache.wink.server.handlers.MediaTypeMapperFactory;
@@ -363,6 +365,10 @@ public class DeploymentConfiguration imp
ofFactoryRegistry = new LifecycleManagersRegistry();
ofFactoryRegistry.addFactoryFactory(new ScopeLifecycleManager<Object>());
ofFactoryRegistry.addFactoryFactory(new JSR250LifecycleManager<Object>());
+
+ for (LifecycleManager lifecycleManager : SpiUtils.loadServices(LifecycleManager.class)) {
+ ofFactoryRegistry.addFactoryFactory(lifecycleManager);
+ }
}
ApplicationValidator applicationValidator = new ApplicationValidator();
providersRegistry = new ProvidersRegistry(ofFactoryRegistry, applicationValidator);
Modified: wink/2.x/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceInstance.java
URL: http://svn.apache.org/viewvc/wink/2.x/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceInstance.java?rev=1516945&r1=1516944&r2=1516945&view=diff
==============================================================================
--- wink/2.x/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceInstance.java (original)
+++ wink/2.x/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceInstance.java Fri Aug 23 17:40:36 2013
@@ -21,7 +21,7 @@
package org.apache.wink.server.internal.registry;
import org.apache.wink.common.RuntimeContext;
-import org.apache.wink.common.internal.lifecycle.ObjectFactory;
+import org.apache.wink.common.spi.lifecycle.ObjectFactory;
import org.apache.wink.common.internal.uritemplate.UriTemplateMatcher;
/**
Modified: wink/2.x/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceRecord.java
URL: http://svn.apache.org/viewvc/wink/2.x/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceRecord.java?rev=1516945&r1=1516944&r2=1516945&view=diff
==============================================================================
--- wink/2.x/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceRecord.java (original)
+++ wink/2.x/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceRecord.java Fri Aug 23 17:40:36 2013
@@ -24,7 +24,7 @@ import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
-import org.apache.wink.common.internal.lifecycle.ObjectFactory;
+import org.apache.wink.common.spi.lifecycle.ObjectFactory;
import org.apache.wink.common.internal.registry.metadata.ClassMetadata;
import org.apache.wink.common.internal.registry.metadata.MethodMetadata;
import org.apache.wink.common.internal.uritemplate.UriTemplateMatcher;
Modified: wink/2.x/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceRecordFactory.java
URL: http://svn.apache.org/viewvc/wink/2.x/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceRecordFactory.java?rev=1516945&r1=1516944&r2=1516945&view=diff
==============================================================================
--- wink/2.x/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceRecordFactory.java (original)
+++ wink/2.x/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceRecordFactory.java Fri Aug 23 17:40:36 2013
@@ -39,7 +39,7 @@ import org.apache.wink.common.DynamicRes
import org.apache.wink.common.RuntimeContext;
import org.apache.wink.common.internal.i18n.Messages;
import org.apache.wink.common.internal.lifecycle.LifecycleManagersRegistry;
-import org.apache.wink.common.internal.lifecycle.ObjectFactory;
+import org.apache.wink.common.spi.lifecycle.ObjectFactory;
import org.apache.wink.common.internal.registry.Injectable;
import org.apache.wink.common.internal.registry.Injectable.ParamType;
import org.apache.wink.common.internal.registry.metadata.ClassMetadata;
Modified: wink/2.x/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/RestServlet.java
URL: http://svn.apache.org/viewvc/wink/2.x/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/RestServlet.java?rev=1516945&r1=1516944&r2=1516945&view=diff
==============================================================================
--- wink/2.x/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/RestServlet.java (original)
+++ wink/2.x/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/RestServlet.java Fri Aug 23 17:40:36 2013
@@ -31,7 +31,7 @@ import javax.servlet.http.HttpServletRes
import javax.ws.rs.core.Application;
import org.apache.wink.common.internal.i18n.Messages;
-import org.apache.wink.common.internal.lifecycle.ObjectFactory;
+import org.apache.wink.common.spi.lifecycle.ObjectFactory;
import org.apache.wink.common.internal.properties.WinkSystemProperties;
import org.apache.wink.common.internal.utils.ClassUtils;
import org.apache.wink.server.internal.DeploymentConfiguration;
Modified: wink/2.x/trunk/wink-server/src/test/java/org/apache/wink/server/internal/application/ApplicationLifecycleManagamentTest.java
URL: http://svn.apache.org/viewvc/wink/2.x/trunk/wink-server/src/test/java/org/apache/wink/server/internal/application/ApplicationLifecycleManagamentTest.java?rev=1516945&r1=1516944&r2=1516945&view=diff
==============================================================================
--- wink/2.x/trunk/wink-server/src/test/java/org/apache/wink/server/internal/application/ApplicationLifecycleManagamentTest.java (original)
+++ wink/2.x/trunk/wink-server/src/test/java/org/apache/wink/server/internal/application/ApplicationLifecycleManagamentTest.java Fri Aug 23 17:40:36 2013
@@ -23,9 +23,9 @@ import java.util.Set;
import javax.ws.rs.core.Application;
-import org.apache.wink.common.internal.lifecycle.LifecycleManager;
+import org.apache.wink.common.spi.lifecycle.LifecycleManager;
import org.apache.wink.common.internal.lifecycle.LifecycleManagersRegistry;
-import org.apache.wink.common.internal.lifecycle.ObjectFactory;
+import org.apache.wink.common.spi.lifecycle.ObjectFactory;
import org.apache.wink.server.internal.DeploymentConfiguration;
import org.apache.wink.server.internal.servlet.MockServletInvocationTest;
import org.jmock.Expectations;
Modified: wink/2.x/trunk/wink-server/src/test/java/org/apache/wink/server/internal/application/ApplicationLifecycleManagement2Test.java
URL: http://svn.apache.org/viewvc/wink/2.x/trunk/wink-server/src/test/java/org/apache/wink/server/internal/application/ApplicationLifecycleManagement2Test.java?rev=1516945&r1=1516944&r2=1516945&view=diff
==============================================================================
--- wink/2.x/trunk/wink-server/src/test/java/org/apache/wink/server/internal/application/ApplicationLifecycleManagement2Test.java (original)
+++ wink/2.x/trunk/wink-server/src/test/java/org/apache/wink/server/internal/application/ApplicationLifecycleManagement2Test.java Fri Aug 23 17:40:36 2013
@@ -23,9 +23,9 @@ import java.util.Set;
import javax.ws.rs.core.Application;
-import org.apache.wink.common.internal.lifecycle.LifecycleManager;
+import org.apache.wink.common.spi.lifecycle.LifecycleManager;
import org.apache.wink.common.internal.lifecycle.LifecycleManagersRegistry;
-import org.apache.wink.common.internal.lifecycle.ObjectFactory;
+import org.apache.wink.common.spi.lifecycle.ObjectFactory;
import org.apache.wink.server.internal.DeploymentConfiguration;
import org.apache.wink.server.internal.servlet.MockServletInvocationTest;
import org.jmock.Expectations;
Modified: wink/2.x/trunk/wink-server/src/test/java/org/apache/wink/server/internal/lifecycle/ProvidersLifecycle1Test.java
URL: http://svn.apache.org/viewvc/wink/2.x/trunk/wink-server/src/test/java/org/apache/wink/server/internal/lifecycle/ProvidersLifecycle1Test.java?rev=1516945&r1=1516944&r2=1516945&view=diff
==============================================================================
--- wink/2.x/trunk/wink-server/src/test/java/org/apache/wink/server/internal/lifecycle/ProvidersLifecycle1Test.java (original)
+++ wink/2.x/trunk/wink-server/src/test/java/org/apache/wink/server/internal/lifecycle/ProvidersLifecycle1Test.java Fri Aug 23 17:40:36 2013
@@ -40,9 +40,9 @@ import javax.ws.rs.ext.MessageBodyWriter
import javax.ws.rs.ext.Provider;
import org.apache.wink.common.RuntimeContext;
-import org.apache.wink.common.internal.lifecycle.LifecycleManager;
+import org.apache.wink.common.spi.lifecycle.LifecycleManager;
import org.apache.wink.common.internal.lifecycle.LifecycleManagersRegistry;
-import org.apache.wink.common.internal.lifecycle.ObjectFactory;
+import org.apache.wink.common.spi.lifecycle.ObjectFactory;
import org.apache.wink.server.internal.DeploymentConfiguration;
import org.apache.wink.server.internal.servlet.MockServletInvocationTest;
import org.apache.wink.test.mock.MockRequestConstructor;
Modified: wink/2.x/trunk/wink-server/src/test/java/org/apache/wink/server/internal/lifecycle/ProvidersLifecycle2Test.java
URL: http://svn.apache.org/viewvc/wink/2.x/trunk/wink-server/src/test/java/org/apache/wink/server/internal/lifecycle/ProvidersLifecycle2Test.java?rev=1516945&r1=1516944&r2=1516945&view=diff
==============================================================================
--- wink/2.x/trunk/wink-server/src/test/java/org/apache/wink/server/internal/lifecycle/ProvidersLifecycle2Test.java (original)
+++ wink/2.x/trunk/wink-server/src/test/java/org/apache/wink/server/internal/lifecycle/ProvidersLifecycle2Test.java Fri Aug 23 17:40:36 2013
@@ -40,9 +40,9 @@ import javax.ws.rs.ext.MessageBodyWriter
import javax.ws.rs.ext.Provider;
import org.apache.wink.common.RuntimeContext;
-import org.apache.wink.common.internal.lifecycle.LifecycleManager;
+import org.apache.wink.common.spi.lifecycle.LifecycleManager;
import org.apache.wink.common.internal.lifecycle.LifecycleManagersRegistry;
-import org.apache.wink.common.internal.lifecycle.ObjectFactory;
+import org.apache.wink.common.spi.lifecycle.ObjectFactory;
import org.apache.wink.server.internal.DeploymentConfiguration;
import org.apache.wink.server.internal.servlet.MockServletInvocationTest;
import org.apache.wink.test.mock.MockRequestConstructor;
Modified: wink/2.x/trunk/wink-server/src/test/java/org/apache/wink/server/internal/lifecycle/ResourceLifecycle1Test.java
URL: http://svn.apache.org/viewvc/wink/2.x/trunk/wink-server/src/test/java/org/apache/wink/server/internal/lifecycle/ResourceLifecycle1Test.java?rev=1516945&r1=1516944&r2=1516945&view=diff
==============================================================================
--- wink/2.x/trunk/wink-server/src/test/java/org/apache/wink/server/internal/lifecycle/ResourceLifecycle1Test.java (original)
+++ wink/2.x/trunk/wink-server/src/test/java/org/apache/wink/server/internal/lifecycle/ResourceLifecycle1Test.java Fri Aug 23 17:40:36 2013
@@ -23,9 +23,9 @@ import javax.servlet.ServletException;
import javax.ws.rs.core.Response.Status;
import org.apache.wink.common.RuntimeContext;
-import org.apache.wink.common.internal.lifecycle.LifecycleManager;
+import org.apache.wink.common.spi.lifecycle.LifecycleManager;
import org.apache.wink.common.internal.lifecycle.LifecycleManagersRegistry;
-import org.apache.wink.common.internal.lifecycle.ObjectFactory;
+import org.apache.wink.common.spi.lifecycle.ObjectFactory;
import org.apache.wink.server.internal.DeploymentConfiguration;
import org.apache.wink.test.mock.MockRequestConstructor;
import org.jmock.Expectations;
Modified: wink/2.x/trunk/wink-server/src/test/java/org/apache/wink/server/internal/lifecycle/ResourceLifecycle2Test.java
URL: http://svn.apache.org/viewvc/wink/2.x/trunk/wink-server/src/test/java/org/apache/wink/server/internal/lifecycle/ResourceLifecycle2Test.java?rev=1516945&r1=1516944&r2=1516945&view=diff
==============================================================================
--- wink/2.x/trunk/wink-server/src/test/java/org/apache/wink/server/internal/lifecycle/ResourceLifecycle2Test.java (original)
+++ wink/2.x/trunk/wink-server/src/test/java/org/apache/wink/server/internal/lifecycle/ResourceLifecycle2Test.java Fri Aug 23 17:40:36 2013
@@ -23,9 +23,9 @@ import javax.servlet.ServletException;
import javax.ws.rs.core.Response.Status;
import org.apache.wink.common.RuntimeContext;
-import org.apache.wink.common.internal.lifecycle.LifecycleManager;
+import org.apache.wink.common.spi.lifecycle.LifecycleManager;
import org.apache.wink.common.internal.lifecycle.LifecycleManagersRegistry;
-import org.apache.wink.common.internal.lifecycle.ObjectFactory;
+import org.apache.wink.common.spi.lifecycle.ObjectFactory;
import org.apache.wink.server.internal.DeploymentConfiguration;
import org.apache.wink.test.mock.MockRequestConstructor;
import org.jmock.Expectations;
Modified: wink/2.x/trunk/wink-server/src/test/java/org/apache/wink/server/internal/lifecycle/ResourceLifecycle3Test.java
URL: http://svn.apache.org/viewvc/wink/2.x/trunk/wink-server/src/test/java/org/apache/wink/server/internal/lifecycle/ResourceLifecycle3Test.java?rev=1516945&r1=1516944&r2=1516945&view=diff
==============================================================================
--- wink/2.x/trunk/wink-server/src/test/java/org/apache/wink/server/internal/lifecycle/ResourceLifecycle3Test.java (original)
+++ wink/2.x/trunk/wink-server/src/test/java/org/apache/wink/server/internal/lifecycle/ResourceLifecycle3Test.java Fri Aug 23 17:40:36 2013
@@ -23,9 +23,9 @@ import javax.servlet.ServletException;
import javax.ws.rs.core.Response.Status;
import org.apache.wink.common.RuntimeContext;
-import org.apache.wink.common.internal.lifecycle.LifecycleManager;
+import org.apache.wink.common.spi.lifecycle.LifecycleManager;
import org.apache.wink.common.internal.lifecycle.LifecycleManagersRegistry;
-import org.apache.wink.common.internal.lifecycle.ObjectFactory;
+import org.apache.wink.common.spi.lifecycle.ObjectFactory;
import org.apache.wink.server.internal.DeploymentConfiguration;
import org.apache.wink.test.mock.MockRequestConstructor;
import org.jmock.Expectations;
Modified: wink/2.x/trunk/wink-server/src/test/java/org/apache/wink/server/internal/lifecycle/ResourceLifecycle4Test.java
URL: http://svn.apache.org/viewvc/wink/2.x/trunk/wink-server/src/test/java/org/apache/wink/server/internal/lifecycle/ResourceLifecycle4Test.java?rev=1516945&r1=1516944&r2=1516945&view=diff
==============================================================================
--- wink/2.x/trunk/wink-server/src/test/java/org/apache/wink/server/internal/lifecycle/ResourceLifecycle4Test.java (original)
+++ wink/2.x/trunk/wink-server/src/test/java/org/apache/wink/server/internal/lifecycle/ResourceLifecycle4Test.java Fri Aug 23 17:40:36 2013
@@ -23,9 +23,9 @@ import javax.servlet.ServletException;
import javax.ws.rs.core.Response.Status;
import org.apache.wink.common.RuntimeContext;
-import org.apache.wink.common.internal.lifecycle.LifecycleManager;
+import org.apache.wink.common.spi.lifecycle.LifecycleManager;
import org.apache.wink.common.internal.lifecycle.LifecycleManagersRegistry;
-import org.apache.wink.common.internal.lifecycle.ObjectFactory;
+import org.apache.wink.common.spi.lifecycle.ObjectFactory;
import org.apache.wink.server.internal.DeploymentConfiguration;
import org.apache.wink.test.mock.MockRequestConstructor;
import org.jmock.Expectations;
Modified: wink/2.x/trunk/wink-server/src/test/java/org/apache/wink/server/internal/lifecycle/ResourceLifecycle5Test.java
URL: http://svn.apache.org/viewvc/wink/2.x/trunk/wink-server/src/test/java/org/apache/wink/server/internal/lifecycle/ResourceLifecycle5Test.java?rev=1516945&r1=1516944&r2=1516945&view=diff
==============================================================================
--- wink/2.x/trunk/wink-server/src/test/java/org/apache/wink/server/internal/lifecycle/ResourceLifecycle5Test.java (original)
+++ wink/2.x/trunk/wink-server/src/test/java/org/apache/wink/server/internal/lifecycle/ResourceLifecycle5Test.java Fri Aug 23 17:40:36 2013
@@ -30,9 +30,9 @@ import javax.ws.rs.ext.ExceptionMapper;
import javax.ws.rs.ext.Provider;
import org.apache.wink.common.RuntimeContext;
-import org.apache.wink.common.internal.lifecycle.LifecycleManager;
+import org.apache.wink.common.spi.lifecycle.LifecycleManager;
import org.apache.wink.common.internal.lifecycle.LifecycleManagersRegistry;
-import org.apache.wink.common.internal.lifecycle.ObjectFactory;
+import org.apache.wink.common.spi.lifecycle.ObjectFactory;
import org.apache.wink.server.internal.DeploymentConfiguration;
import org.apache.wink.test.mock.MockRequestConstructor;
import org.jmock.Expectations;
Modified: wink/2.x/trunk/wink-server/src/test/java/org/apache/wink/server/internal/lifecycle/ResourceLifecycle6Test.java
URL: http://svn.apache.org/viewvc/wink/2.x/trunk/wink-server/src/test/java/org/apache/wink/server/internal/lifecycle/ResourceLifecycle6Test.java?rev=1516945&r1=1516944&r2=1516945&view=diff
==============================================================================
--- wink/2.x/trunk/wink-server/src/test/java/org/apache/wink/server/internal/lifecycle/ResourceLifecycle6Test.java (original)
+++ wink/2.x/trunk/wink-server/src/test/java/org/apache/wink/server/internal/lifecycle/ResourceLifecycle6Test.java Fri Aug 23 17:40:36 2013
@@ -28,9 +28,9 @@ import javax.ws.rs.ext.ExceptionMapper;
import javax.ws.rs.ext.Provider;
import org.apache.wink.common.RuntimeContext;
-import org.apache.wink.common.internal.lifecycle.LifecycleManager;
+import org.apache.wink.common.spi.lifecycle.LifecycleManager;
import org.apache.wink.common.internal.lifecycle.LifecycleManagersRegistry;
-import org.apache.wink.common.internal.lifecycle.ObjectFactory;
+import org.apache.wink.common.spi.lifecycle.ObjectFactory;
import org.apache.wink.server.internal.DeploymentConfiguration;
import org.apache.wink.test.mock.MockRequestConstructor;
import org.jmock.Expectations;
Modified: wink/2.x/trunk/wink-server/src/test/java/org/apache/wink/server/internal/lifecycle/ResourceLifecycle7Test.java
URL: http://svn.apache.org/viewvc/wink/2.x/trunk/wink-server/src/test/java/org/apache/wink/server/internal/lifecycle/ResourceLifecycle7Test.java?rev=1516945&r1=1516944&r2=1516945&view=diff
==============================================================================
--- wink/2.x/trunk/wink-server/src/test/java/org/apache/wink/server/internal/lifecycle/ResourceLifecycle7Test.java (original)
+++ wink/2.x/trunk/wink-server/src/test/java/org/apache/wink/server/internal/lifecycle/ResourceLifecycle7Test.java Fri Aug 23 17:40:36 2013
@@ -28,9 +28,9 @@ import javax.ws.rs.ext.ExceptionMapper;
import javax.ws.rs.ext.Provider;
import org.apache.wink.common.RuntimeContext;
-import org.apache.wink.common.internal.lifecycle.LifecycleManager;
+import org.apache.wink.common.spi.lifecycle.LifecycleManager;
import org.apache.wink.common.internal.lifecycle.LifecycleManagersRegistry;
-import org.apache.wink.common.internal.lifecycle.ObjectFactory;
+import org.apache.wink.common.spi.lifecycle.ObjectFactory;
import org.apache.wink.server.internal.DeploymentConfiguration;
import org.apache.wink.test.mock.MockRequestConstructor;
import org.jmock.Expectations;
Modified: wink/2.x/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/SpringLifecycleManager.java
URL: http://svn.apache.org/viewvc/wink/2.x/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/SpringLifecycleManager.java?rev=1516945&r1=1516944&r2=1516945&view=diff
==============================================================================
--- wink/2.x/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/SpringLifecycleManager.java (original)
+++ wink/2.x/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/SpringLifecycleManager.java Fri Aug 23 17:40:36 2013
@@ -24,9 +24,9 @@ import java.util.Map;
import org.apache.wink.common.DynamicResource;
import org.apache.wink.common.internal.i18n.Messages;
-import org.apache.wink.common.internal.lifecycle.LifecycleManager;
-import org.apache.wink.common.internal.lifecycle.ObjectCreationException;
-import org.apache.wink.common.internal.lifecycle.ObjectFactory;
+import org.apache.wink.common.spi.lifecycle.LifecycleManager;
+import org.apache.wink.common.spi.lifecycle.ObjectCreationException;
+import org.apache.wink.common.spi.lifecycle.ObjectFactory;
import org.apache.wink.common.internal.registry.metadata.ProviderMetadataCollector;
import org.apache.wink.common.internal.registry.metadata.ResourceMetadataCollector;
import org.slf4j.Logger;
Modified: wink/2.x/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/SpringObjectFactory.java
URL: http://svn.apache.org/viewvc/wink/2.x/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/SpringObjectFactory.java?rev=1516945&r1=1516944&r2=1516945&view=diff
==============================================================================
--- wink/2.x/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/SpringObjectFactory.java (original)
+++ wink/2.x/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/SpringObjectFactory.java Fri Aug 23 17:40:36 2013
@@ -20,7 +20,7 @@
package org.apache.wink.spring.internal;
import org.apache.wink.common.RuntimeContext;
-import org.apache.wink.common.internal.lifecycle.ObjectFactory;
+import org.apache.wink.common.spi.lifecycle.ObjectFactory;
import org.apache.wink.common.internal.registry.metadata.ClassMetadata;
import org.springframework.context.ApplicationContext;