You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wink.apache.org by el...@apache.org on 2009/07/08 16:22:17 UTC
svn commit: r792158 - in /incubator/wink/trunk:
wink-client/src/main/java/org/apache/wink/client/
wink-common/src/main/java/org/apache/wink/common/internal/factory/
wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/
wink-common/src/ma...
Author: elman
Date: Wed Jul 8 14:22:16 2009
New Revision: 792158
URL: http://svn.apache.org/viewvc?rev=792158&view=rev
Log:
rename OFFactory to LifecycleManager
See [WINK-57]
Added:
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/
- copied from r792137, incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/factory/
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/DefaultLifecycleManager.java
- copied, changed from r792137, incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/factory/DefaultOFFactory.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/LifecycleManager.java
- copied, changed from r792137, incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/factory/OFFactory.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/LifecycleManagersRegistry.java
- copied, changed from r792137, incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/factory/OFFactoryRegistry.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/ScopeLifecycleManager.java
- copied, changed from r792137, incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/factory/ScopeOFFactory.java
incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/lifecycle/
- copied from r792137, incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/factory/
incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/LifecycleManagerPostProcessor.java
- copied, changed from r792137, incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/SpringOFFactoryPostProcessor.java
incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/SpringLifecycleManager.java
- copied, changed from r792137, incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/SpringOFFactory.java
Removed:
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/factory/
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/DefaultOFFactory.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/OFFactory.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/OFFactoryRegistry.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/ScopeOFFactory.java
incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/factory/
incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/SpringOFFactory.java
incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/SpringOFFactoryPostProcessor.java
Modified:
incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/RestClient.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/ClassMetadataPrototypeOF.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/CreationUtils.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/ObjectCreationException.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/ObjectFactory.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/SingletonObjectFactory.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/ProvidersRegistry.java
incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/lifecycle/DefaultOFFactoryTest.java
incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/lifecycle/OFFactoryTest.java
incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/lifecycle/ScopableOFFactoryTest.java
incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/ProvidersContextResolverTest.java
incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/ProvidersErrorMapperTest.java
incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/entity/ProvidersMessageBodyTest.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/DeploymentConfiguration.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceInstance.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceRecord.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceRecordFactory.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceRegistry.java
incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/application/ApplicationProcessorTest.java
incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/registry/ResourceRecordFactoryTest.java
incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/DependenciesInjectionPostProcessor.java
incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/SpringObjectFactory.java
incubator/wink/trunk/wink-spring-support/src/main/resources/META-INF/server/wink-core-context.xml
Modified: incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/RestClient.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/RestClient.java?rev=792158&r1=792157&r2=792158&view=diff
==============================================================================
--- incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/RestClient.java (original)
+++ incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/RestClient.java Wed Jul 8 14:22:16 2009
@@ -31,8 +31,8 @@
import org.apache.wink.client.internal.ResourceImpl;
import org.apache.wink.common.WinkApplication;
import org.apache.wink.common.internal.application.ApplicationValidator;
-import org.apache.wink.common.internal.factory.OFFactoryRegistry;
-import org.apache.wink.common.internal.factory.ScopeOFFactory;
+import org.apache.wink.common.internal.lifecycle.LifecycleManagersRegistry;
+import org.apache.wink.common.internal.lifecycle.ScopeLifecycleManager;
import org.apache.wink.common.internal.registry.ProvidersRegistry;
import org.apache.wink.common.internal.registry.metadata.ProviderMetadataCollector;
@@ -114,8 +114,8 @@
private void initProvidersRegistry() {
// setup OFFactoryRegistry to support default and scope
- OFFactoryRegistry ofFactoryRegistry = new OFFactoryRegistry();
- ofFactoryRegistry.addFactoryFactory(new ScopeOFFactory<Object>());
+ LifecycleManagersRegistry ofFactoryRegistry = new LifecycleManagersRegistry();
+ ofFactoryRegistry.addFactoryFactory(new ScopeLifecycleManager<Object>());
providersRegistry = new ProvidersRegistry(ofFactoryRegistry, new ApplicationValidator());
// process all applications
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/ClassMetadataPrototypeOF.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/ClassMetadataPrototypeOF.java?rev=792158&r1=792137&r2=792158&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/ClassMetadataPrototypeOF.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/ClassMetadataPrototypeOF.java Wed Jul 8 14:22:16 2009
@@ -17,7 +17,7 @@
* under the License.
*
*******************************************************************************/
-package org.apache.wink.common.internal.factory;
+package org.apache.wink.common.internal.lifecycle;
import org.apache.wink.common.internal.registry.metadata.ClassMetadata;
import org.apache.wink.common.internal.runtime.RuntimeContext;
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/CreationUtils.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/CreationUtils.java?rev=792158&r1=792137&r2=792158&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/CreationUtils.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/CreationUtils.java Wed Jul 8 14:22:16 2009
@@ -17,7 +17,7 @@
* under the License.
*
*******************************************************************************/
-package org.apache.wink.common.internal.factory;
+package org.apache.wink.common.internal.lifecycle;
import java.io.IOException;
import java.lang.reflect.Constructor;
Copied: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/DefaultLifecycleManager.java (from r792137, incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/factory/DefaultOFFactory.java)
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/DefaultLifecycleManager.java?p2=incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/DefaultLifecycleManager.java&p1=incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/factory/DefaultOFFactory.java&r1=792137&r2=792158&rev=792158&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/factory/DefaultOFFactory.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/DefaultLifecycleManager.java Wed Jul 8 14:22:16 2009
@@ -17,7 +17,7 @@
* under the License.
*
*******************************************************************************/
-package org.apache.wink.common.internal.factory;
+package org.apache.wink.common.internal.lifecycle;
@@ -29,7 +29,7 @@
/**
* <p>
- * Default implementation for OFFactory.
+ * Default implementation for LifecycleManager according to JAX RS (JSR 311).
* <p>
* For <tt>createObjectFactory(T object)</tt> the factory will always return a
* SingletonObjectFactory.
@@ -47,9 +47,9 @@
* @see ClassMetadataPrototypeOF
* @see SimplePrototypeOF
*/
-class DefaultOFFactory<T> implements OFFactory<T> {
+class DefaultLifecycleManager<T> implements LifecycleManager<T> {
- static final Logger logger = LoggerFactory.getLogger(DefaultOFFactory.class);
+ private static final Logger logger = LoggerFactory.getLogger(DefaultLifecycleManager.class);
/**
* The default implementation, returns a SingletonFactory for all objects.
Copied: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/LifecycleManager.java (from r792137, incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/factory/OFFactory.java)
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/LifecycleManager.java?p2=incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/LifecycleManager.java&p1=incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/factory/OFFactory.java&r1=792137&r2=792158&rev=792158&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/factory/OFFactory.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/LifecycleManager.java Wed Jul 8 14:22:16 2009
@@ -17,15 +17,19 @@
* under the License.
*
*******************************************************************************/
-package org.apache.wink.common.internal.factory;
+package org.apache.wink.common.internal.lifecycle;
/**
- * <h3>OFFactory - Object Factory Factory</h3>
+ * <h3>LifecycleManager</h3>
*
+ * Used to create ObjectFactory
+ * @see org.apache.wink.common.internal.factory.ObjectFactory<T>
+ * @see org.apache.wink.common.internal.factory.DefaultLifecycleManager<T>
+ * @see org.apache.wink.common.internal.factory.ScopeLifecycleManager<T>
* @param <T>
- * - type of object that OFFactory handles
+ * - type of object that ObjectFactory handles
*/
-public interface OFFactory<T> {
+public interface LifecycleManager<T> {
ObjectFactory<T> createObjectFactory(T object)
throws ObjectCreationException;
Copied: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/LifecycleManagersRegistry.java (from r792137, incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/factory/OFFactoryRegistry.java)
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/LifecycleManagersRegistry.java?p2=incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/LifecycleManagersRegistry.java&p1=incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/factory/OFFactoryRegistry.java&r1=792137&r2=792158&rev=792158&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/factory/OFFactoryRegistry.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/LifecycleManagersRegistry.java Wed Jul 8 14:22:16 2009
@@ -17,22 +17,21 @@
* under the License.
*
*******************************************************************************/
-package org.apache.wink.common.internal.factory;
+package org.apache.wink.common.internal.lifecycle;
import java.util.LinkedList;
/**
- * Registry of OFFactories.
+ * Registry of LifecycleManagers
*/
-public class OFFactoryRegistry {
-
- private LinkedList<OFFactory<?>> store = new LinkedList<OFFactory<?>>();
+public class LifecycleManagersRegistry {
+ private LinkedList<LifecycleManager<?>> store = new LinkedList<LifecycleManager<?>>();
@SuppressWarnings("unchecked")
- private OFFactory defaultFactoryFactory = new DefaultOFFactory();
+ private LifecycleManager defaultFactoryFactory = new DefaultLifecycleManager();
- public void setFactoryFactoryArray(OFFactory<?>[] factories) {
- for (OFFactory<?> factory : factories) {
+ public void setFactoryFactoryArray(LifecycleManager<?>[] factories) {
+ for (LifecycleManager<?> factory : factories) {
addFactoryFactory(factory);
}
}
@@ -44,7 +43,7 @@
*
* @param factory
*/
- public void addFactoryFactory(OFFactory<?> factory) {
+ public void addFactoryFactory(LifecycleManager<?> factory) {
store.addFirst(factory);
}
@@ -57,7 +56,7 @@
*/
@SuppressWarnings("unchecked")
public <T> ObjectFactory<T> getObjectFactory(T object) {
- for (OFFactory factoryFactory : store) {
+ for (LifecycleManager factoryFactory : store) {
ObjectFactory objectFactory = factoryFactory.createObjectFactory(object);
if (objectFactory != null) {
return objectFactory;
@@ -75,7 +74,7 @@
*/
@SuppressWarnings("unchecked")
public <T> ObjectFactory<T> getObjectFactory(Class<T> cls) {
- for (OFFactory factoryFactory : store) {
+ for (LifecycleManager factoryFactory : store) {
ObjectFactory objectFactory = factoryFactory.createObjectFactory(cls);
if (objectFactory != null) {
return objectFactory;
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/ObjectCreationException.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/ObjectCreationException.java?rev=792158&r1=792137&r2=792158&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/ObjectCreationException.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/ObjectCreationException.java Wed Jul 8 14:22:16 2009
@@ -17,7 +17,7 @@
* under the License.
*
*******************************************************************************/
-package org.apache.wink.common.internal.factory;
+package org.apache.wink.common.internal.lifecycle;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.Response;
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/ObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/ObjectFactory.java?rev=792158&r1=792137&r2=792158&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/ObjectFactory.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/ObjectFactory.java Wed Jul 8 14:22:16 2009
@@ -17,7 +17,7 @@
* under the License.
*
*******************************************************************************/
-package org.apache.wink.common.internal.factory;
+package org.apache.wink.common.internal.lifecycle;
import org.apache.wink.common.internal.runtime.RuntimeContext;
Copied: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/ScopeLifecycleManager.java (from r792137, incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/factory/ScopeOFFactory.java)
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/ScopeLifecycleManager.java?p2=incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/ScopeLifecycleManager.java&p1=incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/factory/ScopeOFFactory.java&r1=792137&r2=792158&rev=792158&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/factory/ScopeOFFactory.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/ScopeLifecycleManager.java Wed Jul 8 14:22:16 2009
@@ -17,7 +17,7 @@
* under the License.
*
*******************************************************************************/
-package org.apache.wink.common.internal.factory;
+package org.apache.wink.common.internal.lifecycle;
import org.apache.wink.common.annotations.Scope;
@@ -26,12 +26,12 @@
import org.apache.wink.common.internal.registry.metadata.ResourceMetadataCollector;
/**
- * Implements a OFFactory that creates objects based on the Scope annotation.
+ * Implements a LifecycleManager that creates objects based on the Scope annotation.
*
* @param <T>
* @see Scope
*/
-public class ScopeOFFactory<T> implements OFFactory<T> {
+public class ScopeLifecycleManager<T> implements LifecycleManager<T> {
public ObjectFactory<T> createObjectFactory(T object) {
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/SingletonObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/SingletonObjectFactory.java?rev=792158&r1=792137&r2=792158&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/SingletonObjectFactory.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/SingletonObjectFactory.java Wed Jul 8 14:22:16 2009
@@ -17,7 +17,7 @@
* under the License.
*
*******************************************************************************/
-package org.apache.wink.common.internal.factory;
+package org.apache.wink.common.internal.lifecycle;
import org.apache.wink.common.internal.runtime.RuntimeContext;
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/ProvidersRegistry.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/ProvidersRegistry.java?rev=792158&r1=792157&r2=792158&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/ProvidersRegistry.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/ProvidersRegistry.java Wed Jul 8 14:22:16 2009
@@ -49,8 +49,8 @@
import org.slf4j.LoggerFactory;
import org.apache.wink.common.WinkApplication;
import org.apache.wink.common.internal.application.ApplicationValidator;
-import org.apache.wink.common.internal.factory.OFFactoryRegistry;
-import org.apache.wink.common.internal.factory.ObjectFactory;
+import org.apache.wink.common.internal.lifecycle.LifecycleManagersRegistry;
+import org.apache.wink.common.internal.lifecycle.ObjectFactory;
import org.apache.wink.common.internal.runtime.RuntimeContext;
import org.apache.wink.common.internal.utils.GenericsUtils;
@@ -74,11 +74,11 @@
private final ProducesMediaTypeMap<MessageBodyWriter<?>> messageBodyWriters = new ProducesMediaTypeMap<MessageBodyWriter<?>>(
MessageBodyWriter.class);
private final ApplicationValidator applicationValidator;
- private final OFFactoryRegistry factoryFactoryRegistry;
+ private final LifecycleManagersRegistry factoryFactoryRegistry;
private final Lock readersLock;
private final Lock writersLock;
- public ProvidersRegistry(OFFactoryRegistry factoryRegistry,
+ public ProvidersRegistry(LifecycleManagersRegistry factoryRegistry,
ApplicationValidator applicationValidator) {
this.factoryFactoryRegistry = factoryRegistry;
this.applicationValidator = applicationValidator;
Modified: incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/lifecycle/DefaultOFFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/lifecycle/DefaultOFFactoryTest.java?rev=792158&r1=792137&r2=792158&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/lifecycle/DefaultOFFactoryTest.java (original)
+++ incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/lifecycle/DefaultOFFactoryTest.java Wed Jul 8 14:22:16 2009
@@ -17,12 +17,12 @@
* under the License.
*
*******************************************************************************/
-package org.apache.wink.common.internal.factory;
+package org.apache.wink.common.internal.lifecycle;
import org.apache.wink.common.DynamicResource;
-import org.apache.wink.common.internal.factory.DefaultOFFactory;
-import org.apache.wink.common.internal.factory.SingletonObjectFactory;
+import org.apache.wink.common.internal.lifecycle.DefaultLifecycleManager;
+import org.apache.wink.common.internal.lifecycle.SingletonObjectFactory;
import junit.framework.TestCase;
@@ -36,7 +36,7 @@
@SuppressWarnings("unchecked")
public void testNull() {
- DefaultOFFactory defaultOFFactory = new DefaultOFFactory();
+ DefaultLifecycleManager defaultOFFactory = new DefaultLifecycleManager();
try {
defaultOFFactory.createObjectFactory(null);
@@ -48,7 +48,7 @@
@SuppressWarnings("unchecked")
public void testResourceBean() {
- DefaultOFFactory defaultOFFactory = new DefaultOFFactory();
+ DefaultLifecycleManager defaultOFFactory = new DefaultLifecycleManager();
try {
defaultOFFactory.createObjectFactory(DynamicResource.class);
@@ -60,7 +60,7 @@
@SuppressWarnings("unchecked")
public void testDummy() {
- DefaultOFFactory defaultOFFactory = new DefaultOFFactory();
+ DefaultLifecycleManager defaultOFFactory = new DefaultLifecycleManager();
assertEquals(SingletonObjectFactory.class,
defaultOFFactory.createObjectFactory(new Dummy()).getClass());
Modified: incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/lifecycle/OFFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/lifecycle/OFFactoryTest.java?rev=792158&r1=792137&r2=792158&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/lifecycle/OFFactoryTest.java (original)
+++ incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/lifecycle/OFFactoryTest.java Wed Jul 8 14:22:16 2009
@@ -17,17 +17,17 @@
* under the License.
*
*******************************************************************************/
-package org.apache.wink.common.internal.factory;
+package org.apache.wink.common.internal.lifecycle;
import javax.ws.rs.Path;
import javax.ws.rs.ext.Provider;
import org.apache.wink.common.annotations.Scope;
import org.apache.wink.common.annotations.Scope.ScopeType;
-import org.apache.wink.common.internal.factory.ClassMetadataPrototypeOF;
-import org.apache.wink.common.internal.factory.OFFactoryRegistry;
-import org.apache.wink.common.internal.factory.ScopeOFFactory;
-import org.apache.wink.common.internal.factory.SingletonObjectFactory;
+import org.apache.wink.common.internal.lifecycle.ClassMetadataPrototypeOF;
+import org.apache.wink.common.internal.lifecycle.LifecycleManagersRegistry;
+import org.apache.wink.common.internal.lifecycle.ScopeLifecycleManager;
+import org.apache.wink.common.internal.lifecycle.SingletonObjectFactory;
import junit.framework.TestCase;
@@ -70,7 +70,7 @@
}
public void testDefault() {
- OFFactoryRegistry factoryRegistry = new OFFactoryRegistry();
+ LifecycleManagersRegistry factoryRegistry = new LifecycleManagersRegistry();
// by default providers are always singletons
assertEquals(SingletonObjectFactory.class,
@@ -108,8 +108,8 @@
@SuppressWarnings("unchecked")
public void testScopeable() {
- OFFactoryRegistry factoryRegistry = new OFFactoryRegistry();
- factoryRegistry.addFactoryFactory(new ScopeOFFactory());
+ LifecycleManagersRegistry factoryRegistry = new LifecycleManagersRegistry();
+ factoryRegistry.addFactoryFactory(new ScopeLifecycleManager());
// default
assertEquals(SingletonObjectFactory.class,
Modified: incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/lifecycle/ScopableOFFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/lifecycle/ScopableOFFactoryTest.java?rev=792158&r1=792137&r2=792158&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/lifecycle/ScopableOFFactoryTest.java (original)
+++ incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/lifecycle/ScopableOFFactoryTest.java Wed Jul 8 14:22:16 2009
@@ -17,9 +17,9 @@
* under the License.
*
*******************************************************************************/
-package org.apache.wink.common.internal.factory;
+package org.apache.wink.common.internal.lifecycle;
-import org.apache.wink.common.internal.factory.ScopeOFFactory;
+import org.apache.wink.common.internal.lifecycle.ScopeLifecycleManager;
import junit.framework.TestCase;
@@ -33,12 +33,12 @@
public void testNull() {
- ScopeOFFactory<Object> scopableOFFactory = new ScopeOFFactory<Object>();
+ ScopeLifecycleManager<Object> scopableOFFactory = new ScopeLifecycleManager<Object>();
assertNull(scopableOFFactory.createObjectFactory(null));
}
public void testNotScopeable() {
- ScopeOFFactory<Object> scopableOFFactory = new ScopeOFFactory<Object>();
+ ScopeLifecycleManager<Object> scopableOFFactory = new ScopeLifecycleManager<Object>();
assertNull(scopableOFFactory.createObjectFactory(Dummy.class));
assertNull(scopableOFFactory.createObjectFactory(new Dummy()));
}
Modified: incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/ProvidersContextResolverTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/ProvidersContextResolverTest.java?rev=792158&r1=792157&r2=792158&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/ProvidersContextResolverTest.java (original)
+++ incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/ProvidersContextResolverTest.java Wed Jul 8 14:22:16 2009
@@ -28,7 +28,7 @@
import javax.ws.rs.ext.Provider;
import org.apache.wink.common.internal.application.ApplicationValidator;
-import org.apache.wink.common.internal.factory.OFFactoryRegistry;
+import org.apache.wink.common.internal.lifecycle.LifecycleManagersRegistry;
import org.apache.wink.common.internal.registry.ProvidersRegistry;
@@ -92,7 +92,7 @@
}
private ProvidersRegistry createProvidersRegistryImpl() {
- ProvidersRegistry providers = new ProvidersRegistry(new OFFactoryRegistry(),
+ ProvidersRegistry providers = new ProvidersRegistry(new LifecycleManagersRegistry(),
new ApplicationValidator());;
return providers;
}
Modified: incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/ProvidersErrorMapperTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/ProvidersErrorMapperTest.java?rev=792158&r1=792157&r2=792158&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/ProvidersErrorMapperTest.java (original)
+++ incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/ProvidersErrorMapperTest.java Wed Jul 8 14:22:16 2009
@@ -29,7 +29,7 @@
import org.apache.wink.common.annotations.Scope;
import org.apache.wink.common.annotations.Scope.ScopeType;
import org.apache.wink.common.internal.application.ApplicationValidator;
-import org.apache.wink.common.internal.factory.OFFactoryRegistry;
+import org.apache.wink.common.internal.lifecycle.LifecycleManagersRegistry;
import org.apache.wink.common.internal.registry.ProvidersRegistry;
import junit.framework.TestCase;
@@ -83,7 +83,7 @@
}
private ProvidersRegistry createProvidersRegistryImpl() {
- ProvidersRegistry providers = new ProvidersRegistry(new OFFactoryRegistry(),
+ ProvidersRegistry providers = new ProvidersRegistry(new LifecycleManagersRegistry(),
new ApplicationValidator());
return providers;
Modified: incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/entity/ProvidersMessageBodyTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/entity/ProvidersMessageBodyTest.java?rev=792158&r1=792157&r2=792158&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/entity/ProvidersMessageBodyTest.java (original)
+++ incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/entity/ProvidersMessageBodyTest.java Wed Jul 8 14:22:16 2009
@@ -38,7 +38,7 @@
import org.apache.wink.common.annotations.Scope;
import org.apache.wink.common.annotations.Scope.ScopeType;
import org.apache.wink.common.internal.application.ApplicationValidator;
-import org.apache.wink.common.internal.factory.OFFactoryRegistry;
+import org.apache.wink.common.internal.lifecycle.LifecycleManagersRegistry;
import org.apache.wink.common.internal.providers.entity.ByteArrayProvider;
import org.apache.wink.common.internal.providers.entity.FileProvider;
import org.apache.wink.common.internal.providers.entity.InputStreamProvider;
@@ -90,7 +90,7 @@
}
private ProvidersRegistry createProvidersRegistryImpl() {
- ProvidersRegistry providers = new ProvidersRegistry(new OFFactoryRegistry(),
+ ProvidersRegistry providers = new ProvidersRegistry(new LifecycleManagersRegistry(),
new ApplicationValidator());
return providers;
}
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/DeploymentConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/DeploymentConfiguration.java?rev=792158&r1=792157&r2=792158&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/DeploymentConfiguration.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/DeploymentConfiguration.java Wed Jul 8 14:22:16 2009
@@ -38,8 +38,8 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.wink.common.internal.application.ApplicationValidator;
-import org.apache.wink.common.internal.factory.OFFactoryRegistry;
-import org.apache.wink.common.internal.factory.ScopeOFFactory;
+import org.apache.wink.common.internal.lifecycle.LifecycleManagersRegistry;
+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;
@@ -91,7 +91,7 @@
// registries
private ProvidersRegistry providersRegistry;
private ResourceRegistry resourceRegistry;
- private OFFactoryRegistry ofFactoryRegistry;
+ private LifecycleManagersRegistry ofFactoryRegistry;
// mappers
private MediaTypeMapper mediaTypeMapper;
@@ -158,11 +158,11 @@
this.mediaTypeMapper = mediaTypeMapper;
}
- public void setOfFactoryRegistry(OFFactoryRegistry ofFactoryRegistry) {
+ public void setOfFactoryRegistry(LifecycleManagersRegistry ofFactoryRegistry) {
this.ofFactoryRegistry = ofFactoryRegistry;
}
- public OFFactoryRegistry getOfFactoryRegistry() {
+ public LifecycleManagersRegistry getOfFactoryRegistry() {
return ofFactoryRegistry;
}
@@ -236,8 +236,8 @@
protected void initRegistries() {
InjectableFactory.setInstance(new ServerInjectableFactory());
if (ofFactoryRegistry == null) {
- ofFactoryRegistry = new OFFactoryRegistry();
- ofFactoryRegistry.addFactoryFactory(new ScopeOFFactory<Object>());
+ ofFactoryRegistry = new LifecycleManagersRegistry();
+ ofFactoryRegistry.addFactoryFactory(new ScopeLifecycleManager<Object>());
}
ApplicationValidator applicationValidator = new ApplicationValidator();
providersRegistry = new ProvidersRegistry(ofFactoryRegistry, applicationValidator);
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceInstance.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceInstance.java?rev=792158&r1=792157&r2=792158&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceInstance.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceInstance.java Wed Jul 8 14:22:16 2009
@@ -22,7 +22,7 @@
package org.apache.wink.server.internal.registry;
-import org.apache.wink.common.internal.factory.ObjectFactory;
+import org.apache.wink.common.internal.lifecycle.ObjectFactory;
import org.apache.wink.common.internal.runtime.RuntimeContext;
import org.apache.wink.common.internal.uritemplate.UriTemplateMatcher;
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceRecord.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceRecord.java?rev=792158&r1=792157&r2=792158&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceRecord.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceRecord.java Wed Jul 8 14:22:16 2009
@@ -25,7 +25,7 @@
import java.util.LinkedList;
import java.util.List;
-import org.apache.wink.common.internal.factory.ObjectFactory;
+import org.apache.wink.common.internal.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: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceRecordFactory.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceRecordFactory.java?rev=792158&r1=792157&r2=792158&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceRecordFactory.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceRecordFactory.java Wed Jul 8 14:22:16 2009
@@ -31,8 +31,8 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.wink.common.DynamicResource;
-import org.apache.wink.common.internal.factory.OFFactoryRegistry;
-import org.apache.wink.common.internal.factory.ObjectFactory;
+import org.apache.wink.common.internal.lifecycle.LifecycleManagersRegistry;
+import org.apache.wink.common.internal.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.UriTemplateProcessor;
@@ -42,13 +42,13 @@
private static final Logger logger = LoggerFactory.getLogger(ResourceRecordFactory.class);
- private final OFFactoryRegistry objectFactoryRegistry;
+ private final LifecycleManagersRegistry objectFactoryRegistry;
private final Map<Class<?>,ResourceRecord> cacheByClass;
private Lock readersLock;
private Lock writersLock;
- public ResourceRecordFactory(OFFactoryRegistry objectFactoryRegistry) {
+ public ResourceRecordFactory(LifecycleManagersRegistry objectFactoryRegistry) {
if (objectFactoryRegistry == null) {
throw new NullPointerException("objectFactoryRegistry");
}
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceRegistry.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceRegistry.java?rev=792158&r1=792157&r2=792158&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceRegistry.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceRegistry.java Wed Jul 8 14:22:16 2009
@@ -41,7 +41,7 @@
import org.apache.wink.common.WinkApplication;
import org.apache.wink.common.http.HttpStatus;
import org.apache.wink.common.internal.application.ApplicationValidator;
-import org.apache.wink.common.internal.factory.OFFactoryRegistry;
+import org.apache.wink.common.internal.lifecycle.LifecycleManagersRegistry;
import org.apache.wink.common.internal.registry.Injectable;
import org.apache.wink.common.internal.registry.metadata.MethodMetadata;
import org.apache.wink.common.internal.runtime.RuntimeContext;
@@ -66,7 +66,7 @@
private Lock writersLock;
private final ApplicationValidator applicationValidator;
- public ResourceRegistry(OFFactoryRegistry factoryRegistry, ApplicationValidator applicationValidator) {
+ public ResourceRegistry(LifecycleManagersRegistry factoryRegistry, ApplicationValidator applicationValidator) {
this.applicationValidator = applicationValidator;
rootResources = new LinkedList<ResourceRecord>();
dirty = false;
Modified: incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/application/ApplicationProcessorTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/application/ApplicationProcessorTest.java?rev=792158&r1=792157&r2=792158&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/application/ApplicationProcessorTest.java (original)
+++ incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/application/ApplicationProcessorTest.java Wed Jul 8 14:22:16 2009
@@ -29,7 +29,7 @@
import org.apache.wink.common.AbstractDynamicResource;
import org.apache.wink.common.WinkApplication;
-import org.apache.wink.common.internal.factory.OFFactoryRegistry;
+import org.apache.wink.common.internal.lifecycle.LifecycleManagersRegistry;
import org.apache.wink.common.internal.providers.entity.FileProvider;
import org.apache.wink.common.internal.providers.entity.StreamingOutputProvider;
import org.apache.wink.common.internal.providers.entity.StringProvider;
@@ -50,7 +50,7 @@
List<Class<?>> classes = new ArrayList<Class<?>>();
public ResourceRegistryMock() {
- super(new OFFactoryRegistry(), null);
+ super(new LifecycleManagersRegistry(), null);
}
public void addResource(Object instance) {
@@ -80,7 +80,7 @@
List<Class<?>> classes = new ArrayList<Class<?>>();
public ProvidersRegistryMock() {
- super(new OFFactoryRegistry(), null);
+ super(new LifecycleManagersRegistry(), null);
}
public boolean addProvider(Class<?> cls) {
Modified: incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/registry/ResourceRecordFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/registry/ResourceRecordFactoryTest.java?rev=792158&r1=792157&r2=792158&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/registry/ResourceRecordFactoryTest.java (original)
+++ incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/registry/ResourceRecordFactoryTest.java Wed Jul 8 14:22:16 2009
@@ -24,7 +24,7 @@
import javax.ws.rs.GET;
import javax.ws.rs.Path;
-import org.apache.wink.common.internal.factory.OFFactoryRegistry;
+import org.apache.wink.common.internal.lifecycle.LifecycleManagersRegistry;
import org.apache.wink.server.internal.registry.ResourceRecord;
import org.apache.wink.server.internal.registry.ResourceRecordFactory;
@@ -52,7 +52,7 @@
}
public void testFactory() {
- ResourceRecordFactory factory = new ResourceRecordFactory(new OFFactoryRegistry());
+ ResourceRecordFactory factory = new ResourceRecordFactory(new LifecycleManagersRegistry());
ResourceRecord record = factory.getResourceRecord(Resource1.class);
assertEquals("/path1", record.getMetadata().getPath());
Modified: incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/DependenciesInjectionPostProcessor.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/DependenciesInjectionPostProcessor.java?rev=792158&r1=792157&r2=792158&view=diff
==============================================================================
--- incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/DependenciesInjectionPostProcessor.java (original)
+++ incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/DependenciesInjectionPostProcessor.java Wed Jul 8 14:22:16 2009
@@ -23,7 +23,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.wink.common.internal.factory.CreationUtils;
+import org.apache.wink.common.internal.lifecycle.CreationUtils;
import org.apache.wink.common.internal.registry.metadata.ClassMetadata;
import org.apache.wink.common.internal.runtime.RuntimeContextTLS;
import org.springframework.beans.BeansException;
@@ -33,7 +33,7 @@
public class DependenciesInjectionPostProcessor implements BeanPostProcessor {
private static final Logger logger = LoggerFactory.getLogger(DependenciesInjectionPostProcessor.class);
- private SpringOFFactory<Object> springOFFactory;
+ private SpringLifecycleManager<Object> springOFFactory;
public Object postProcessAfterInitialization(Object bean, String beanName)
throws BeansException {
@@ -57,7 +57,7 @@
return bean;
}
- public void setSpringOFFactory(SpringOFFactory<Object> springOFFactory) {
+ public void setSpringOFFactory(SpringLifecycleManager<Object> springOFFactory) {
this.springOFFactory = springOFFactory;
}
Copied: incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/LifecycleManagerPostProcessor.java (from r792137, incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/SpringOFFactoryPostProcessor.java)
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/LifecycleManagerPostProcessor.java?p2=incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/LifecycleManagerPostProcessor.java&p1=incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/SpringOFFactoryPostProcessor.java&r1=792137&r2=792158&rev=792158&view=diff
==============================================================================
--- incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/SpringOFFactoryPostProcessor.java (original)
+++ incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/LifecycleManagerPostProcessor.java Wed Jul 8 14:22:16 2009
@@ -33,15 +33,15 @@
/**
* Each time a new bean is created, it's checked if it's Resource, Provider or
- * Dynamic Resource. If this is the case, it's registered in SpringOFFactory.
+ * Dynamic Resource. If this is the case, it's registered in SpringLifecycleManager.
* This bean applies only during the context loading and doesn't effects the
* beans created in runtime.
*/
-public class SpringOFFactoryPostProcessor implements BeanPostProcessor, ApplicationContextAware,
+public class LifecycleManagerPostProcessor implements BeanPostProcessor, ApplicationContextAware,
ApplicationListener {
private ApplicationContext applicationContext;
- private SpringOFFactory<?> springOFFactory;
+ private SpringLifecycleManager<?> springOFFactory;
private boolean loadingOfContextCompleted = false;
public Object postProcessAfterInitialization(final Object bean, final String beanName)
@@ -77,7 +77,7 @@
this.applicationContext = applicationContext;
}
- public void setSpringOFFactory(SpringOFFactory<?> springOFFactory) {
+ public void setSpringOFFactory(SpringLifecycleManager<?> springOFFactory) {
this.springOFFactory = springOFFactory;
}
Copied: incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/SpringLifecycleManager.java (from r792137, incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/SpringOFFactory.java)
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/SpringLifecycleManager.java?p2=incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/SpringLifecycleManager.java&p1=incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/SpringOFFactory.java&r1=792137&r2=792158&rev=792158&view=diff
==============================================================================
--- incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/SpringOFFactory.java (original)
+++ incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/SpringLifecycleManager.java Wed Jul 8 14:22:16 2009
@@ -25,16 +25,16 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.wink.common.DynamicResource;
-import org.apache.wink.common.internal.factory.OFFactory;
-import org.apache.wink.common.internal.factory.ObjectCreationException;
-import org.apache.wink.common.internal.factory.ObjectFactory;
+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.internal.registry.metadata.ProviderMetadataCollector;
import org.apache.wink.common.internal.registry.metadata.ResourceMetadataCollector;
-public class SpringOFFactory<T> implements OFFactory<T> {
+public class SpringLifecycleManager<T> implements LifecycleManager<T> {
- private static final Logger logger = LoggerFactory.getLogger(SpringOFFactory.class);
+ private static final Logger logger = LoggerFactory.getLogger(SpringLifecycleManager.class);
/**
* holds Static Resources and Providers
Modified: incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/SpringObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/SpringObjectFactory.java?rev=792158&r1=792157&r2=792158&view=diff
==============================================================================
--- incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/SpringObjectFactory.java (original)
+++ incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/SpringObjectFactory.java Wed Jul 8 14:22:16 2009
@@ -19,7 +19,7 @@
*******************************************************************************/
package org.apache.wink.spring.internal;
-import org.apache.wink.common.internal.factory.ObjectFactory;
+import org.apache.wink.common.internal.lifecycle.ObjectFactory;
import org.apache.wink.common.internal.registry.metadata.ClassMetadata;
import org.apache.wink.common.internal.runtime.RuntimeContext;
import org.springframework.context.ApplicationContext;
Modified: incubator/wink/trunk/wink-spring-support/src/main/resources/META-INF/server/wink-core-context.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-spring-support/src/main/resources/META-INF/server/wink-core-context.xml?rev=792158&r1=792157&r2=792158&view=diff
==============================================================================
--- incubator/wink/trunk/wink-spring-support/src/main/resources/META-INF/server/wink-core-context.xml (original)
+++ incubator/wink/trunk/wink-spring-support/src/main/resources/META-INF/server/wink-core-context.xml Wed Jul 8 14:22:16 2009
@@ -26,14 +26,14 @@
<!-- Object Factory-Factories definitions -->
- <bean id="symphony.SpringOFFactory" class="org.apache.wink.spring.internal.SpringOFFactory">
+ <bean id="symphony.SpringOFFactory" class="org.apache.wink.spring.internal.SpringLifecycleManager">
</bean>
- <bean id="symphony.offRegistry" class="org.apache.wink.common.internal.factory.OFFactoryRegistry">
+ <bean id="symphony.offRegistry" class="org.apache.wink.common.internal.lifecycle.LifecycleManagersRegistry">
<property name="factoryFactoryArray">
<list>
<ref local="symphony.SpringOFFactory" />
- <bean class="org.apache.wink.common.internal.factory.ScopeOFFactory" />
+ <bean class="org.apache.wink.common.internal.lifecycle.ScopeLifecycleManager" />
</list>
</property>
</bean>
@@ -54,7 +54,7 @@
</bean>
<bean id="symphony.SpringOFFactoryPostProcessor"
- class="org.apache.wink.spring.internal.SpringOFFactoryPostProcessor">
+ class="org.apache.wink.spring.internal.LifecycleManagerPostProcessor">
<property name="springOFFactory">
<ref local="symphony.SpringOFFactory" />
</property>