Updated imports regarding new annotation packages

Author: chkal

core/src/main/java/org/mvcspec/ozark/MvcContextImpl.java

@@ -24,7 +24,7 @@
 import javax.inject.Inject;
 import javax.inject.Named;
 import javax.mvc.MvcContext;
-import javax.mvc.MvcUriBuilder;
+import javax.mvc.uri.MvcUriBuilder;
 import javax.mvc.security.Csrf;
 import javax.mvc.security.Encoders;
 import javax.servlet.ServletContext;

core/src/main/java/org/mvcspec/ozark/binding/validate/ValidationInterceptorBinding.java

@@ -16,13 +16,14 @@
 package org.mvcspec.ozark.binding.validate;
 
 import javax.interceptor.InterceptorBinding;
+import javax.mvc.Controller;
 import java.lang.annotation.*;
 
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.TYPE;
 
 /**
- * Triggers validation of parameters in {@link javax.mvc.annotation.Controller} methods.
+ * Triggers validation of parameters in {@link Controller} methods.
  * This annotation is added by the CDI extension to all controller methods.
  *
  * @author Dmytro Maidaniuk

core/src/main/java/org/mvcspec/ozark/cdi/OzarkCdiExtension.java

@@ -46,8 +46,8 @@
 import javax.enterprise.event.Observes;
 import javax.enterprise.inject.spi.*;
 import javax.interceptor.Interceptor;
-import javax.mvc.annotation.Controller;
-import javax.mvc.annotation.RedirectScoped;
+import javax.mvc.Controller;
+import javax.mvc.RedirectScoped;
 import javax.mvc.event.MvcEvent;
 import java.lang.reflect.Type;
 import java.util.HashSet;
@@ -158,7 +158,7 @@ public void afterBeanDiscovery(@Observes final AfterBeanDiscovery event, BeanMan
     }
 
     /**
-     * Search for {@link javax.mvc.annotation.Controller} annotation and patch AnnotatedType.
+     * Search for {@link Controller} annotation and patch AnnotatedType.
      * Note: PLATFORM_AFTER is required so we execute AFTER the Hibernate Validator Extension
      */
     public <T> void processAnnotatedType(

core/src/main/java/org/mvcspec/ozark/cdi/RedirectScopeContext.java

@@ -20,7 +20,7 @@
 import javax.enterprise.context.spi.Contextual;
 import javax.enterprise.context.spi.CreationalContext;
 import javax.enterprise.inject.spi.CDI;
-import javax.mvc.annotation.RedirectScoped;
+import javax.mvc.RedirectScoped;
 import java.io.Serializable;
 import java.lang.annotation.Annotation;
 

core/src/main/java/org/mvcspec/ozark/cdi/types/AnnotatedTypeProcessor.java

@@ -19,7 +19,7 @@
 
 import javax.enterprise.inject.spi.AnnotatedMethod;
 import javax.enterprise.inject.spi.AnnotatedType;
-import javax.mvc.annotation.Controller;
+import javax.mvc.Controller;
 import javax.ws.rs.*;
 import java.lang.annotation.Annotation;
 import java.util.Collections;

core/src/main/java/org/mvcspec/ozark/core/ViewRequestFilter.java

@@ -21,7 +21,7 @@
 import javax.annotation.Priority;
 import javax.enterprise.event.Event;
 import javax.inject.Inject;
-import javax.mvc.annotation.Controller;
+import javax.mvc.Controller;
 import javax.mvc.event.BeforeControllerEvent;
 import javax.ws.rs.Priorities;
 import javax.ws.rs.container.ContainerRequestContext;
@@ -35,7 +35,7 @@
  * <p>A JAX-RS request filter that fires a {@link javax.mvc.event.BeforeControllerEvent}
  * after the controller has been matched but before it is called.</p>
  *
- * <p>Given that this filter is annotated with {@link javax.mvc.annotation.Controller},
+ * <p>Given that this filter is annotated with {@link Controller},
  * it will be called before a controller is called. Priority is set to
  * {@link javax.ws.rs.Priorities#ENTITY_CODER} which means it will be executed
  * right before user-defined request filters.</p>

core/src/main/java/org/mvcspec/ozark/core/ViewResponseFilter.java

@@ -22,8 +22,8 @@
 import javax.enterprise.event.Event;
 import javax.inject.Inject;
 import org.mvcspec.ozark.engine.Viewable;
-import javax.mvc.annotation.Controller;
-import javax.mvc.annotation.View;
+import javax.mvc.Controller;
+import javax.mvc.View;
 import javax.mvc.event.AfterControllerEvent;
 import javax.mvc.event.ControllerRedirectEvent;
 import javax.mvc.event.MvcEvent;
@@ -68,7 +68,7 @@
  * {@code text/html}. If the method does not return void (has an entity), the computation
  * of the Content-Type is done by JAX-RS and is available via {@code responseContext}.</p>
  *
- * <p>Given that this filter is annotated with {@link javax.mvc.annotation.Controller}, it
+ * <p>Given that this filter is annotated with {@link Controller}, it
  * will be called after every controller method returns. Priority is set to
  * {@link javax.ws.rs.Priorities#ENTITY_CODER} which means it will be executed
  * after user-defined response filters (response filters are sorted in reverse order).</p>

core/src/main/java/org/mvcspec/ozark/engine/Viewable.java

@@ -15,6 +15,7 @@
  */
 package org.mvcspec.ozark.engine;
 
+import javax.mvc.Controller;
 import javax.mvc.Models;
 import javax.mvc.engine.ViewEngine;
 
@@ -25,7 +26,7 @@
  *
  * @author Santiago Pericas-Geertsen
  * @see javax.mvc.Models
- * @see javax.mvc.annotation.Controller
+ * @see Controller
  * @see javax.mvc.engine.ViewEngine
  * @since 1.0
  */

core/src/main/java/org/mvcspec/ozark/security/CsrfProtectFilter.java

@@ -18,10 +18,10 @@
 import org.mvcspec.ozark.OzarkConfig;
 
 import javax.annotation.Priority;
-import javax.enterprise.inject.Instance;
 import javax.inject.Inject;
-import javax.mvc.annotation.Controller;
+import javax.mvc.Controller;
 import javax.mvc.security.Csrf;
+import javax.mvc.security.CsrfValid;
 import javax.ws.rs.Priorities;
 import javax.ws.rs.container.ContainerRequestContext;
 import javax.ws.rs.container.ContainerResponseContext;
@@ -38,7 +38,7 @@
  * <p>CSRF can be enabled by setting the property {@link javax.mvc.security.Csrf#CSRF_PROTECTION}
  * to {@link javax.mvc.security.Csrf.CsrfOptions#IMPLICIT}, to by setting it to
  * {@link javax.mvc.security.Csrf.CsrfOptions#EXPLICIT} and annotating the desired
- * controllers with {@link javax.mvc.annotation.CsrfValid}. Note that validation only
+ * controllers with {@link CsrfValid}. Note that validation only
  * applies to controllers also annotated by {@link javax.ws.rs.POST}.</p>
  *
  * @author Santiago Pericas-Geertsen

core/src/main/java/org/mvcspec/ozark/security/CsrfValidateInterceptor.java

@@ -20,8 +20,8 @@
 
 import javax.annotation.Priority;
 import javax.inject.Inject;
-import javax.mvc.annotation.Controller;
-import javax.mvc.annotation.CsrfValid;
+import javax.mvc.Controller;
+import javax.mvc.security.CsrfValid;
 import javax.mvc.security.CsrfValidationException;
 import javax.ws.rs.POST;
 import javax.ws.rs.Priorities;