diff --git a/pom.xml b/pom.xml index c8930ac65..4b1ebade9 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ br.com.caelum vraptor - 4.0.0-beta-3 + 4.0.0-beta-4-SNAPSHOT org.hamcrest @@ -111,12 +111,6 @@ br.com.caelum.vraptor vraptor-simplemail 1.3.2-SNAPSHOT - - - br.com.caelum - vraptor - - br.com.caelum.vraptor4 diff --git a/src/main/java/br/com/caelum/brutal/converters/UploadedFileConverter.java b/src/main/java/br/com/caelum/brutal/converters/UploadedFileConverter.java index 5c145c01c..d1e04f336 100644 --- a/src/main/java/br/com/caelum/brutal/converters/UploadedFileConverter.java +++ b/src/main/java/br/com/caelum/brutal/converters/UploadedFileConverter.java @@ -5,7 +5,7 @@ import br.com.caelum.vraptor.Convert; import br.com.caelum.vraptor.converter.Converter; -import br.com.caelum.vraptor.interceptor.multipart.UploadedFile; +import br.com.caelum.vraptor.observer.upload.UploadedFile; @Convert(UploadedFile.class) public class UploadedFileConverter implements Converter{ diff --git a/src/main/java/br/com/caelum/brutal/interceptors/ConversionErrorsInterceptor.java b/src/main/java/br/com/caelum/brutal/interceptors/ConversionErrorsInterceptor.java index 8c1d154fd..544e42632 100644 --- a/src/main/java/br/com/caelum/brutal/interceptors/ConversionErrorsInterceptor.java +++ b/src/main/java/br/com/caelum/brutal/interceptors/ConversionErrorsInterceptor.java @@ -6,13 +6,11 @@ import br.com.caelum.vraptor.Intercepts; import br.com.caelum.vraptor.controller.ControllerMethod; 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.interceptor.ParametersInstantiatorInterceptor; import br.com.caelum.vraptor.validator.Validator; import br.com.caelum.vraptor.view.Results; -@Intercepts(after=ParametersInstantiatorInterceptor.class, before=ExecuteMethodInterceptor.class) +@Intercepts public class ConversionErrorsInterceptor implements Interceptor { @Inject private Validator validator; diff --git a/src/main/java/br/com/caelum/brutal/interceptors/PimpMyControllerInterceptor.java b/src/main/java/br/com/caelum/brutal/interceptors/PimpMyControllerInterceptor.java index 7f1409fa6..b72ba45a1 100644 --- a/src/main/java/br/com/caelum/brutal/interceptors/PimpMyControllerInterceptor.java +++ b/src/main/java/br/com/caelum/brutal/interceptors/PimpMyControllerInterceptor.java @@ -9,10 +9,9 @@ import br.com.caelum.vraptor.Result; import br.com.caelum.vraptor.controller.ControllerMethod; import br.com.caelum.vraptor.core.InterceptorStack; -import br.com.caelum.vraptor.interceptor.ExecuteMethodInterceptor; import br.com.caelum.vraptor.interceptor.Interceptor; -@Intercepts(before = ExecuteMethodInterceptor.class) +@Intercepts public class PimpMyControllerInterceptor implements Interceptor { @Inject private Result result;