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/08/26 10:08:20 UTC
svn commit: r807918 - in /incubator/wink/trunk:
wink-client/src/main/java/org/apache/wink/client/internal/handlers/
wink-common/src/main/java/org/apache/wink/common/
wink-common/src/main/java/org/apache/wink/common/internal/contexts/
wink-common/src/ma...
Author: elman
Date: Wed Aug 26 08:08:18 2009
New Revision: 807918
URL: http://svn.apache.org/viewvc?rev=807918&view=rev
Log:
Make RuntimeContext public. See [WINK-151]
Added:
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/RuntimeContext.java
- copied, changed from r807878, incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/runtime/RuntimeContext.java
Removed:
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/runtime/RuntimeContext.java
Modified:
incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/internal/handlers/AbstractConnectionHandler.java
incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/internal/handlers/ClientResponseImpl.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/contexts/ProvidersImpl.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/ObjectFactory.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/PrototypeObjectFactory.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/providers/entity/AssetProvider.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/ContextAccessor.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/Injectable.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/InjectableFactory.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/ProvidersRegistry.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/runtime/AbstractRuntimeContext.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/runtime/RuntimeContextTLS.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/handlers/MessageContext.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/contexts/HttpServletRequestWrapperImpl.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/contexts/HttpServletResponseWrapperImpl.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/ResourceRecordFactory.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceRegistry.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ServerInjectableFactory.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ServletContextAccessor.java
incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/SpringObjectFactory.java
Modified: incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/internal/handlers/AbstractConnectionHandler.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/internal/handlers/AbstractConnectionHandler.java?rev=807918&r1=807917&r2=807918&view=diff
==============================================================================
--- incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/internal/handlers/AbstractConnectionHandler.java (original)
+++ incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/internal/handlers/AbstractConnectionHandler.java Wed Aug 26 08:08:18 2009
@@ -38,8 +38,8 @@
import org.apache.wink.client.handlers.InputStreamAdapter;
import org.apache.wink.client.handlers.OutputStreamAdapter;
import org.apache.wink.client.internal.ClientRuntimeContext;
+import org.apache.wink.common.RuntimeContext;
import org.apache.wink.common.internal.registry.ProvidersRegistry;
-import org.apache.wink.common.internal.runtime.RuntimeContext;
import org.apache.wink.common.internal.runtime.RuntimeContextTLS;
public abstract class AbstractConnectionHandler implements ConnectionHandler {
Modified: incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/internal/handlers/ClientResponseImpl.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/internal/handlers/ClientResponseImpl.java?rev=807918&r1=807917&r2=807918&view=diff
==============================================================================
--- incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/internal/handlers/ClientResponseImpl.java (original)
+++ incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/internal/handlers/ClientResponseImpl.java Wed Aug 26 08:08:18 2009
@@ -33,8 +33,8 @@
import org.apache.wink.client.ClientRuntimeException;
import org.apache.wink.client.EntityType;
import org.apache.wink.client.internal.ClientRuntimeContext;
+import org.apache.wink.common.RuntimeContext;
import org.apache.wink.common.internal.registry.ProvidersRegistry;
-import org.apache.wink.common.internal.runtime.RuntimeContext;
import org.apache.wink.common.internal.runtime.RuntimeContextTLS;
public class ClientResponseImpl extends BaseRequestResponseImpl implements ClientResponse {
Copied: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/RuntimeContext.java (from r807878, incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/runtime/RuntimeContext.java)
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/RuntimeContext.java?p2=incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/RuntimeContext.java&p1=incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/runtime/RuntimeContext.java&r1=807878&r2=807918&rev=807918&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/runtime/RuntimeContext.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/RuntimeContext.java Wed Aug 26 08:08:18 2009
@@ -18,7 +18,7 @@
*
*******************************************************************************/
-package org.apache.wink.common.internal.runtime;
+package org.apache.wink.common;
import java.io.IOException;
import java.io.InputStream;
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/contexts/ProvidersImpl.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/contexts/ProvidersImpl.java?rev=807918&r1=807917&r2=807918&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/contexts/ProvidersImpl.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/contexts/ProvidersImpl.java Wed Aug 26 08:08:18 2009
@@ -30,8 +30,8 @@
import javax.ws.rs.ext.MessageBodyWriter;
import javax.ws.rs.ext.Providers;
+import org.apache.wink.common.RuntimeContext;
import org.apache.wink.common.internal.registry.ProvidersRegistry;
-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=807918&r1=807917&r2=807918&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 Aug 26 08:08:18 2009
@@ -33,11 +33,11 @@
import javax.ws.rs.WebApplicationException;
+import org.apache.wink.common.RuntimeContext;
import org.apache.wink.common.internal.registry.Injectable;
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.internal.runtime.RuntimeContext;
public class CreationUtils {
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=807918&r1=807917&r2=807918&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 Aug 26 08:08:18 2009
@@ -19,7 +19,7 @@
*******************************************************************************/
package org.apache.wink.common.internal.lifecycle;
-import org.apache.wink.common.internal.runtime.RuntimeContext;
+import org.apache.wink.common.RuntimeContext;
public interface ObjectFactory<T> {
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/PrototypeObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/PrototypeObjectFactory.java?rev=807918&r1=807917&r2=807918&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/PrototypeObjectFactory.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/PrototypeObjectFactory.java Wed Aug 26 08:08:18 2009
@@ -19,8 +19,8 @@
*******************************************************************************/
package org.apache.wink.common.internal.lifecycle;
+import org.apache.wink.common.RuntimeContext;
import org.apache.wink.common.internal.registry.metadata.ClassMetadata;
-import org.apache.wink.common.internal.runtime.RuntimeContext;
/**
* Implements ObjectFactory that creates a new object for each call based on its
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=807918&r1=807917&r2=807918&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 Aug 26 08:08:18 2009
@@ -19,7 +19,7 @@
*******************************************************************************/
package org.apache.wink.common.internal.lifecycle;
-import org.apache.wink.common.internal.runtime.RuntimeContext;
+import org.apache.wink.common.RuntimeContext;
/**
* Creates a ObjectFactory that always returns a same instance.
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/AssetProvider.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/AssetProvider.java?rev=807918&r1=807917&r2=807918&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/AssetProvider.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/AssetProvider.java Wed Aug 26 08:08:18 2009
@@ -45,6 +45,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.apache.wink.common.RuntimeContext;
import org.apache.wink.common.annotations.Asset;
import org.apache.wink.common.annotations.Scope;
import org.apache.wink.common.annotations.Scope.ScopeType;
@@ -52,7 +53,6 @@
import org.apache.wink.common.internal.registry.Injectable;
import org.apache.wink.common.internal.registry.InjectableFactory;
import org.apache.wink.common.internal.registry.Injectable.ParamType;
-import org.apache.wink.common.internal.runtime.RuntimeContext;
import org.apache.wink.common.internal.runtime.RuntimeContextTLS;
import org.apache.wink.common.internal.utils.GenericsUtils;
import org.apache.wink.common.internal.utils.MediaTypeUtils;
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/ContextAccessor.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/ContextAccessor.java?rev=807918&r1=807917&r2=807918&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/ContextAccessor.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/ContextAccessor.java Wed Aug 26 08:08:18 2009
@@ -30,7 +30,7 @@
import javax.ws.rs.ext.ContextResolver;
import javax.ws.rs.ext.Providers;
-import org.apache.wink.common.internal.runtime.RuntimeContext;
+import org.apache.wink.common.RuntimeContext;
import org.apache.wink.common.internal.runtime.RuntimeContextTLS;
public class ContextAccessor {
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/Injectable.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/Injectable.java?rev=807918&r1=807917&r2=807918&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/Injectable.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/Injectable.java Wed Aug 26 08:08:18 2009
@@ -34,7 +34,7 @@
import java.util.SortedSet;
import java.util.TreeSet;
-import org.apache.wink.common.internal.runtime.RuntimeContext;
+import org.apache.wink.common.RuntimeContext;
import org.apache.wink.common.internal.utils.GenericsUtils;
/**
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/InjectableFactory.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/InjectableFactory.java?rev=807918&r1=807917&r2=807918&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/InjectableFactory.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/InjectableFactory.java Wed Aug 26 08:08:18 2009
@@ -36,7 +36,7 @@
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.Context;
-import org.apache.wink.common.internal.runtime.RuntimeContext;
+import org.apache.wink.common.RuntimeContext;
import org.apache.wink.common.internal.utils.GenericsUtils;
public class InjectableFactory {
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=807918&r1=807917&r2=807918&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 Aug 26 08:08:18 2009
@@ -49,12 +49,12 @@
import javax.ws.rs.ext.MessageBodyReader;
import javax.ws.rs.ext.MessageBodyWriter;
+import org.apache.wink.common.RuntimeContext;
import org.apache.wink.common.WinkApplication;
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.internal.runtime.RuntimeContext;
import org.apache.wink.common.internal.utils.GenericsUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/runtime/AbstractRuntimeContext.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/runtime/AbstractRuntimeContext.java?rev=807918&r1=807917&r2=807918&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/runtime/AbstractRuntimeContext.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/runtime/AbstractRuntimeContext.java Wed Aug 26 08:08:18 2009
@@ -29,6 +29,8 @@
import javax.ws.rs.core.UriInfo;
import javax.ws.rs.ext.Providers;
+import org.apache.wink.common.RuntimeContext;
+
public abstract class AbstractRuntimeContext implements RuntimeContext {
private HashMap<String, Object> attributes;
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/runtime/RuntimeContextTLS.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/runtime/RuntimeContextTLS.java?rev=807918&r1=807917&r2=807918&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/runtime/RuntimeContextTLS.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/runtime/RuntimeContextTLS.java Wed Aug 26 08:08:18 2009
@@ -20,6 +20,8 @@
package org.apache.wink.common.internal.runtime;
+import org.apache.wink.common.RuntimeContext;
+
public abstract class RuntimeContextTLS {
private static ThreadLocal<RuntimeContext> threadLocal = new ThreadLocal<RuntimeContext>();
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/handlers/MessageContext.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/handlers/MessageContext.java?rev=807918&r1=807917&r2=807918&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/handlers/MessageContext.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/handlers/MessageContext.java Wed Aug 26 08:08:18 2009
@@ -24,7 +24,7 @@
import javax.ws.rs.core.MediaType;
-import org.apache.wink.common.internal.runtime.RuntimeContext;
+import org.apache.wink.common.RuntimeContext;
import org.apache.wink.server.utils.LinkBuilders;
/**
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/contexts/HttpServletRequestWrapperImpl.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/contexts/HttpServletRequestWrapperImpl.java?rev=807918&r1=807917&r2=807918&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/contexts/HttpServletRequestWrapperImpl.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/contexts/HttpServletRequestWrapperImpl.java Wed Aug 26 08:08:18 2009
@@ -35,7 +35,7 @@
import javax.servlet.http.HttpServletRequestWrapper;
import javax.servlet.http.HttpSession;
-import org.apache.wink.common.internal.runtime.RuntimeContext;
+import org.apache.wink.common.RuntimeContext;
import org.apache.wink.common.internal.runtime.RuntimeContextTLS;
/**
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/contexts/HttpServletResponseWrapperImpl.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/contexts/HttpServletResponseWrapperImpl.java?rev=807918&r1=807917&r2=807918&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/contexts/HttpServletResponseWrapperImpl.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/contexts/HttpServletResponseWrapperImpl.java Wed Aug 26 08:08:18 2009
@@ -29,7 +29,7 @@
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpServletResponseWrapper;
-import org.apache.wink.common.internal.runtime.RuntimeContext;
+import org.apache.wink.common.RuntimeContext;
import org.apache.wink.common.internal.runtime.RuntimeContextTLS;
/**
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=807918&r1=807917&r2=807918&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 Aug 26 08:08:18 2009
@@ -20,8 +20,8 @@
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.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/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=807918&r1=807917&r2=807918&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 Aug 26 08:08:18 2009
@@ -27,11 +27,11 @@
import java.util.concurrent.locks.ReentrantReadWriteLock;
import org.apache.wink.common.DynamicResource;
+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.internal.registry.metadata.ClassMetadata;
import org.apache.wink.common.internal.registry.metadata.ResourceMetadataCollector;
-import org.apache.wink.common.internal.runtime.RuntimeContext;
import org.apache.wink.common.internal.uritemplate.UriTemplateProcessor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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=807918&r1=807917&r2=807918&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 Aug 26 08:08:18 2009
@@ -38,6 +38,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.apache.wink.common.RuntimeContext;
import org.apache.wink.common.WinkApplication;
import org.apache.wink.common.http.HttpStatus;
import org.apache.wink.common.internal.application.ApplicationValidator;
@@ -45,7 +46,6 @@
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;
import org.apache.wink.common.internal.uritemplate.UriTemplateMatcher;
import org.apache.wink.common.internal.uritemplate.UriTemplateProcessor;
import org.apache.wink.common.internal.utils.MediaTypeUtils;
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ServerInjectableFactory.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ServerInjectableFactory.java?rev=807918&r1=807917&r2=807918&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ServerInjectableFactory.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ServerInjectableFactory.java Wed Aug 26 08:08:18 2009
@@ -44,13 +44,13 @@
import javax.ws.rs.ext.MessageBodyReader;
import javax.ws.rs.ext.Providers;
+import org.apache.wink.common.RuntimeContext;
import org.apache.wink.common.internal.PathSegmentImpl;
import org.apache.wink.common.internal.registry.BoundInjectable;
import org.apache.wink.common.internal.registry.ContextAccessor;
import org.apache.wink.common.internal.registry.Injectable;
import org.apache.wink.common.internal.registry.InjectableFactory;
import org.apache.wink.common.internal.registry.ValueConvertor.ConversionException;
-import org.apache.wink.common.internal.runtime.RuntimeContext;
import org.apache.wink.common.internal.uri.UriEncoder;
import org.apache.wink.common.internal.utils.MediaTypeUtils;
import org.apache.wink.common.internal.utils.StringUtils;
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ServletContextAccessor.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ServletContextAccessor.java?rev=807918&r1=807917&r2=807918&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ServletContextAccessor.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ServletContextAccessor.java Wed Aug 26 08:08:18 2009
@@ -25,8 +25,8 @@
import javax.servlet.http.HttpServletResponse;
import javax.ws.rs.WebApplicationException;
+import org.apache.wink.common.RuntimeContext;
import org.apache.wink.common.internal.registry.ContextAccessor;
-import org.apache.wink.common.internal.runtime.RuntimeContext;
import org.apache.wink.server.internal.contexts.HttpServletRequestWrapperImpl;
import org.apache.wink.server.internal.contexts.HttpServletResponseWrapperImpl;
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=807918&r1=807917&r2=807918&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 Aug 26 08:08:18 2009
@@ -19,9 +19,9 @@
*******************************************************************************/
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.internal.registry.metadata.ClassMetadata;
-import org.apache.wink.common.internal.runtime.RuntimeContext;
import org.springframework.context.ApplicationContext;
public class SpringObjectFactory implements ObjectFactory<Object> {