moving ForwardToDefaultViewInterceptor to interceptor package

caelum · Jan 31, 2011 · 89a4e13 · 89a4e13
1 parent 195c8de
commit 89a4e13
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 10 deletions.
diff --git a/vraptor-core/src/main/java/br/com/caelum/vraptor/core/BaseComponents.java b/vraptor-core/src/main/java/br/com/caelum/vraptor/core/BaseComponents.java
@@ -70,7 +70,6 @@
 import br.com.caelum.vraptor.deserialization.JsonDeserializer;
 import br.com.caelum.vraptor.deserialization.XMLDeserializer;
 import br.com.caelum.vraptor.deserialization.XStreamXMLDeserializer;
-import br.com.caelum.vraptor.extra.ForwardToDefaultViewInterceptor;
 import br.com.caelum.vraptor.http.DefaultFormatResolver;
 import br.com.caelum.vraptor.http.DefaultResourceTranslator;
 import br.com.caelum.vraptor.http.EncodingHandlerFactory;
@@ -94,6 +93,7 @@
 import br.com.caelum.vraptor.interceptor.ExceptionHandlerInterceptor;
 import br.com.caelum.vraptor.interceptor.ExecuteMethodInterceptor;
 import br.com.caelum.vraptor.interceptor.FlashInterceptor;
+import br.com.caelum.vraptor.interceptor.ForwardToDefaultViewInterceptor;
 import br.com.caelum.vraptor.interceptor.InstantiateInterceptor;
 import br.com.caelum.vraptor.interceptor.InterceptorListPriorToExecutionExtractor;
 import br.com.caelum.vraptor.interceptor.InterceptorRegistry;

diff --git a/vraptor-core/src/main/java/br/com/caelum/vraptor/core/DefaultInterceptorStack.java b/vraptor-core/src/main/java/br/com/caelum/vraptor/core/DefaultInterceptorStack.java
@@ -23,7 +23,7 @@
 import org.slf4j.LoggerFactory;
 
 import br.com.caelum.vraptor.InterceptionException;
-import br.com.caelum.vraptor.extra.ForwardToDefaultViewInterceptor;
+import br.com.caelum.vraptor.interceptor.ForwardToDefaultViewInterceptor;
 import br.com.caelum.vraptor.interceptor.Interceptor;
 import br.com.caelum.vraptor.ioc.PrototypeScoped;
 import br.com.caelum.vraptor.resource.ResourceMethod;

diff --git a/vraptor-core/src/main/java/br/com/caelum/vraptor/core/DefaultRequestExecution.java b/vraptor-core/src/main/java/br/com/caelum/vraptor/core/DefaultRequestExecution.java
@@ -21,11 +21,11 @@
 import org.slf4j.LoggerFactory;
 
 import br.com.caelum.vraptor.InterceptionException;
-import br.com.caelum.vraptor.extra.ForwardToDefaultViewInterceptor;
 import br.com.caelum.vraptor.interceptor.DeserializingInterceptor;
 import br.com.caelum.vraptor.interceptor.ExceptionHandlerInterceptor;
 import br.com.caelum.vraptor.interceptor.ExecuteMethodInterceptor;
 import br.com.caelum.vraptor.interceptor.FlashInterceptor;
+import br.com.caelum.vraptor.interceptor.ForwardToDefaultViewInterceptor;
 import br.com.caelum.vraptor.interceptor.InstantiateInterceptor;
 import br.com.caelum.vraptor.interceptor.InterceptorListPriorToExecutionExtractor;
 import br.com.caelum.vraptor.interceptor.OutjectResult;

diff --git a/...xtra/ForwardToDefaultViewInterceptor.java → ...ptor/ForwardToDefaultViewInterceptor.java b/...xtra/ForwardToDefaultViewInterceptor.java → ...ptor/ForwardToDefaultViewInterceptor.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package br.com.caelum.vraptor.extra;
+package br.com.caelum.vraptor.interceptor;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -24,8 +24,6 @@
 import br.com.caelum.vraptor.Intercepts;
 import br.com.caelum.vraptor.Result;
 import br.com.caelum.vraptor.core.InterceptorStack;
-import br.com.caelum.vraptor.interceptor.ExecuteMethodInterceptor;
-import br.com.caelum.vraptor.interceptor.Interceptor;
 import br.com.caelum.vraptor.resource.ResourceMethod;
 import br.com.caelum.vraptor.view.Results;
 

diff --git a/vraptor-core/src/main/java/br/com/caelum/vraptor/interceptor/OutjectResult.java b/vraptor-core/src/main/java/br/com/caelum/vraptor/interceptor/OutjectResult.java
@@ -28,7 +28,6 @@
 import br.com.caelum.vraptor.Result;
 import br.com.caelum.vraptor.core.InterceptorStack;
 import br.com.caelum.vraptor.core.MethodInfo;
-import br.com.caelum.vraptor.extra.ForwardToDefaultViewInterceptor;
 import br.com.caelum.vraptor.resource.ResourceMethod;
 
 /**

diff --git a/...or-core/src/main/java/br/com/caelum/vraptor/interceptor/download/DownloadInterceptor.java b/...or-core/src/main/java/br/com/caelum/vraptor/interceptor/download/DownloadInterceptor.java
@@ -33,8 +33,8 @@
 import br.com.caelum.vraptor.Result;
 import br.com.caelum.vraptor.core.InterceptorStack;
 import br.com.caelum.vraptor.core.MethodInfo;
-import br.com.caelum.vraptor.extra.ForwardToDefaultViewInterceptor;
 import br.com.caelum.vraptor.interceptor.ExecuteMethodInterceptor;
+import br.com.caelum.vraptor.interceptor.ForwardToDefaultViewInterceptor;
 import br.com.caelum.vraptor.interceptor.Interceptor;
 import br.com.caelum.vraptor.ioc.RequestScoped;
 import br.com.caelum.vraptor.resource.ResourceMethod;

diff --git a/vraptor-core/src/main/java/br/com/caelum/vraptor/jersey/JerseyView.java b/vraptor-core/src/main/java/br/com/caelum/vraptor/jersey/JerseyView.java
@@ -5,7 +5,7 @@
 import br.com.caelum.vraptor.InterceptionException;
 import br.com.caelum.vraptor.Result;
 import br.com.caelum.vraptor.core.InterceptorStack;
-import br.com.caelum.vraptor.extra.ForwardToDefaultViewInterceptor;
+import br.com.caelum.vraptor.interceptor.ForwardToDefaultViewInterceptor;
 import br.com.caelum.vraptor.interceptor.Interceptor;
 import br.com.caelum.vraptor.ioc.Component;
 import br.com.caelum.vraptor.ioc.RequestScoped;

diff --git a/vraptor-core/src/test/java/br/com/caelum/vraptor/core/DefaultRequestExecutionTest.java b/vraptor-core/src/test/java/br/com/caelum/vraptor/core/DefaultRequestExecutionTest.java
@@ -27,10 +27,10 @@
 import org.mockito.MockitoAnnotations;
 
 import br.com.caelum.vraptor.InterceptionException;
-import br.com.caelum.vraptor.extra.ForwardToDefaultViewInterceptor;
 import br.com.caelum.vraptor.interceptor.DeserializingInterceptor;
 import br.com.caelum.vraptor.interceptor.ExecuteMethodInterceptor;
 import br.com.caelum.vraptor.interceptor.FlashInterceptor;
+import br.com.caelum.vraptor.interceptor.ForwardToDefaultViewInterceptor;
 import br.com.caelum.vraptor.interceptor.InstantiateInterceptor;
 import br.com.caelum.vraptor.interceptor.InterceptorListPriorToExecutionExtractor;
 import br.com.caelum.vraptor.interceptor.OutjectResult;

diff --git a/...r-core/src/test/java/br/com/caelum/vraptor/extra/ForwardToDefaultViewInterceptorTest.java b/...r-core/src/test/java/br/com/caelum/vraptor/extra/ForwardToDefaultViewInterceptorTest.java
@@ -26,6 +26,7 @@
 import org.junit.Test;
 
 import br.com.caelum.vraptor.Result;
+import br.com.caelum.vraptor.interceptor.ForwardToDefaultViewInterceptor;
 import br.com.caelum.vraptor.view.PageResult;
 
 public class ForwardToDefaultViewInterceptorTest {