Merge pull request #35 from caelum/removingVRaptorScopes

Removing VRaptor scopes

vraptor-core/src/main/java/br/com/caelum/vraptor4/Controller.java

@@ -2,17 +2,17 @@
  * Copyright (c) 2009 Caelum - www.caelum.com.br/opensource
  * All rights reserved.
  *
- * Licensed under the Apache License, Version 2.0 (the "License"); 
- * you may not use this file except in compliance with the License. 
- * You may obtain a copy of the License at 
- * 
- * 	http://www.apache.org/licenses/LICENSE-2.0 
- * 
- * Unless required by applicable law or agreed to in writing, software 
- * distributed under the License is distributed on an "AS IS" BASIS, 
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
- * See the License for the specific language governing permissions and 
- * limitations under the License. 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * 	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package br.com.caelum.vraptor4;
@@ -23,7 +23,8 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import br.com.caelum.vraptor4.ioc.RequestScoped;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Stereotype;
 
 /**
  * Controllers are entry points for requests; i.e, requests are handled by VRaptor Controllers.
@@ -34,7 +35,7 @@
 @Target(ElementType.TYPE)
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
-@javax.enterprise.inject.Stereotype
+@Stereotype
 @RequestScoped
 public @interface Controller {
 }

vraptor-core/src/main/java/br/com/caelum/vraptor4/Intercepts.java

@@ -23,10 +23,11 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import javax.enterprise.context.RequestScoped;
+
 import br.com.caelum.vraptor4.interceptor.ExecuteMethodInterceptor;
 import br.com.caelum.vraptor4.interceptor.InstantiateInterceptor;
 import br.com.caelum.vraptor4.interceptor.Interceptor;
-import br.com.caelum.vraptor4.ioc.RequestScoped;
 
 /**
  * Notifies vraptor to use this interceptor in the interceptor stack.<br>

vraptor-core/src/main/java/br/com/caelum/vraptor4/config/ApplicationConfiguration.java

@@ -17,11 +17,10 @@
 
 package br.com.caelum.vraptor4.config;
 
+import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
 import javax.servlet.http.HttpServletRequest;
 
-import br.com.caelum.vraptor4.ioc.RequestScoped;
-
 /**
  * Basic implementation of an application configuration.<br>
  *

vraptor-core/src/main/java/br/com/caelum/vraptor4/controller/DefaultControllerNotFoundHandler.java

@@ -19,12 +19,12 @@
 
 import java.io.IOException;
 
+import javax.enterprise.context.ApplicationScoped;
 import javax.servlet.FilterChain;
 import javax.servlet.ServletException;
 
 import br.com.caelum.vraptor4.InterceptionException;
 import br.com.caelum.vraptor4.core.RequestInfo;
-import br.com.caelum.vraptor4.ioc.ApplicationScoped;
 
 /**
  * Default 404 component. It defers the request back to container

vraptor-core/src/main/java/br/com/caelum/vraptor4/controller/DefaultMethodNotAllowedHandler.java

@@ -20,11 +20,11 @@
 import java.io.IOException;
 import java.util.Set;
 
+import javax.enterprise.context.ApplicationScoped;
 import javax.servlet.http.HttpServletResponse;
 
 import br.com.caelum.vraptor4.InterceptionException;
 import br.com.caelum.vraptor4.core.RequestInfo;
-import br.com.caelum.vraptor4.ioc.ApplicationScoped;
 
 /**
  * Default implementation which sets the header and send an error response.

vraptor-core/src/main/java/br/com/caelum/vraptor4/converter/BigDecimalConverter.java

@@ -2,17 +2,17 @@
  * Copyright (c) 2009 Caelum - www.caelum.com.br/opensource
  * All rights reserved.
  *
- * Licensed under the Apache License, Version 2.0 (the "License"); 
- * you may not use this file except in compliance with the License. 
- * You may obtain a copy of the License at 
- * 
- * 	http://www.apache.org/licenses/LICENSE-2.0 
- * 
- * Unless required by applicable law or agreed to in writing, software 
- * distributed under the License is distributed on an "AS IS" BASIS, 
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
- * See the License for the specific language governing permissions and 
- * limitations under the License. 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * 	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package br.com.caelum.vraptor4.converter;
 
@@ -22,9 +22,10 @@
 import java.text.MessageFormat;
 import java.util.ResourceBundle;
 
+import javax.enterprise.context.ApplicationScoped;
+
 import br.com.caelum.vraptor4.Convert;
 import br.com.caelum.vraptor4.Converter;
-import br.com.caelum.vraptor4.ioc.ApplicationScoped;
 
 /**
  * VRaptor's BigDecimal converter.
@@ -39,7 +40,7 @@ public BigDecimal convert(String value, Class<? extends BigDecimal> type, Resour
 		if (isNullOrEmpty(value)) {
 			return null;
 		}
-		
+
 		try {
 			return new BigDecimal(value);
 		} catch (NumberFormatException e) {

vraptor-core/src/main/java/br/com/caelum/vraptor4/converter/BigIntegerConverter.java

@@ -2,17 +2,17 @@
  * Copyright (c) 2009 Caelum - www.caelum.com.br/opensource
  * All rights reserved.
  *
- * Licensed under the Apache License, Version 2.0 (the "License"); 
- * you may not use this file except in compliance with the License. 
- * You may obtain a copy of the License at 
- * 
- * 	http://www.apache.org/licenses/LICENSE-2.0 
- * 
- * Unless required by applicable law or agreed to in writing, software 
- * distributed under the License is distributed on an "AS IS" BASIS, 
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
- * See the License for the specific language governing permissions and 
- * limitations under the License. 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * 	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package br.com.caelum.vraptor4.converter;
 
@@ -22,9 +22,10 @@
 import java.text.MessageFormat;
 import java.util.ResourceBundle;
 
+import javax.enterprise.context.ApplicationScoped;
+
 import br.com.caelum.vraptor4.Convert;
 import br.com.caelum.vraptor4.Converter;
-import br.com.caelum.vraptor4.ioc.ApplicationScoped;
 
 /**
  * VRaptor's BigInteger converter.
@@ -39,7 +40,7 @@ public BigInteger convert(String value, Class<? extends BigInteger> type, Resour
 	    if (isNullOrEmpty(value)) {
 			return null;
 		}
-	    
+
 		try {
 			return new BigInteger(value);
 		} catch (NumberFormatException e) {

vraptor-core/src/main/java/br/com/caelum/vraptor4/converter/BooleanConverter.java

@@ -25,9 +25,10 @@
 import java.util.ResourceBundle;
 import java.util.Set;
 
+import javax.enterprise.context.ApplicationScoped;
+
 import br.com.caelum.vraptor4.Convert;
 import br.com.caelum.vraptor4.Converter;
-import br.com.caelum.vraptor4.ioc.ApplicationScoped;
 
 /**
  * VRaptor's Boolean converter.

vraptor-core/src/main/java/br/com/caelum/vraptor4/converter/ByteConverter.java

@@ -22,9 +22,10 @@
 import java.text.MessageFormat;
 import java.util.ResourceBundle;
 
+import javax.enterprise.context.ApplicationScoped;
+
 import br.com.caelum.vraptor4.Convert;
 import br.com.caelum.vraptor4.Converter;
-import br.com.caelum.vraptor4.ioc.ApplicationScoped;
 
 /**
  * VRaptor's Byte converter.

vraptor-core/src/main/java/br/com/caelum/vraptor4/converter/CharacterConverter.java

@@ -22,9 +22,10 @@
 import java.text.MessageFormat;
 import java.util.ResourceBundle;
 
+import javax.enterprise.context.ApplicationScoped;
+
 import br.com.caelum.vraptor4.Convert;
 import br.com.caelum.vraptor4.Converter;
-import br.com.caelum.vraptor4.ioc.ApplicationScoped;
 
 /**
  * VRaptor's Character converter.

vraptor-core/src/main/java/br/com/caelum/vraptor4/converter/DoubleConverter.java

@@ -22,9 +22,10 @@
 import java.text.MessageFormat;
 import java.util.ResourceBundle;
 
+import javax.enterprise.context.ApplicationScoped;
+
 import br.com.caelum.vraptor4.Convert;
 import br.com.caelum.vraptor4.Converter;
-import br.com.caelum.vraptor4.ioc.ApplicationScoped;
 
 /**
  * VRaptor's Double converter.

vraptor-core/src/main/java/br/com/caelum/vraptor4/converter/FloatConverter.java

@@ -22,9 +22,10 @@
 import java.text.MessageFormat;
 import java.util.ResourceBundle;
 
+import javax.enterprise.context.ApplicationScoped;
+
 import br.com.caelum.vraptor4.Convert;
 import br.com.caelum.vraptor4.Converter;
-import br.com.caelum.vraptor4.ioc.ApplicationScoped;
 
 /**
  * VRaptor's Float converter.

vraptor-core/src/main/java/br/com/caelum/vraptor4/converter/IntegerConverter.java

@@ -22,9 +22,10 @@
 import java.text.MessageFormat;
 import java.util.ResourceBundle;
 
+import javax.enterprise.context.ApplicationScoped;
+
 import br.com.caelum.vraptor4.Convert;
 import br.com.caelum.vraptor4.Converter;
-import br.com.caelum.vraptor4.ioc.ApplicationScoped;
 
 /**
  * VRaptor's Integer converter.

vraptor-core/src/main/java/br/com/caelum/vraptor4/converter/LocaleBasedCalendarConverter.java

@@ -27,12 +27,12 @@
 import java.util.Locale;
 import java.util.ResourceBundle;
 
+import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
 
 import br.com.caelum.vraptor4.Convert;
 import br.com.caelum.vraptor4.Converter;
 import br.com.caelum.vraptor4.core.Localization;
-import br.com.caelum.vraptor4.ioc.RequestScoped;
 
 /**
  * Locale based calendar converter.

vraptor-core/src/main/java/br/com/caelum/vraptor4/converter/LocaleBasedDateConverter.java

@@ -25,12 +25,12 @@
 import java.util.Locale;
 import java.util.ResourceBundle;
 
+import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
 
 import br.com.caelum.vraptor4.Convert;
 import br.com.caelum.vraptor4.Converter;
 import br.com.caelum.vraptor4.core.Localization;
-import br.com.caelum.vraptor4.ioc.RequestScoped;
 
 /**
  * Locale based date converter.

vraptor-core/src/main/java/br/com/caelum/vraptor4/converter/LocaleBasedTimeConverter.java

@@ -10,10 +10,11 @@
 import java.util.ResourceBundle;
 import java.util.regex.Pattern;
 
+import javax.enterprise.context.RequestScoped;
+
 import br.com.caelum.vraptor4.Convert;
 import br.com.caelum.vraptor4.Converter;
 import br.com.caelum.vraptor4.core.Localization;
-import br.com.caelum.vraptor4.ioc.RequestScoped;
 
 @Convert(Time.class)
 @RequestScoped

vraptor-core/src/main/java/br/com/caelum/vraptor4/converter/LongConverter.java

@@ -22,9 +22,10 @@
 import java.text.MessageFormat;
 import java.util.ResourceBundle;
 
+import javax.enterprise.context.ApplicationScoped;
+
 import br.com.caelum.vraptor4.Convert;
 import br.com.caelum.vraptor4.Converter;
-import br.com.caelum.vraptor4.ioc.ApplicationScoped;
 
 /**
  * VRaptor's Long converter.

vraptor-core/src/main/java/br/com/caelum/vraptor4/converter/PrimitiveBooleanConverter.java

@@ -22,9 +22,10 @@
 
 import java.util.ResourceBundle;
 
+import javax.enterprise.context.ApplicationScoped;
+
 import br.com.caelum.vraptor4.Convert;
 import br.com.caelum.vraptor4.Converter;
-import br.com.caelum.vraptor4.ioc.ApplicationScoped;
 
 /**
  * VRaptor's primitive boolean converter.

vraptor-core/src/main/java/br/com/caelum/vraptor4/converter/PrimitiveByteConverter.java

@@ -22,9 +22,10 @@
 import java.text.MessageFormat;
 import java.util.ResourceBundle;
 
+import javax.enterprise.context.ApplicationScoped;
+
 import br.com.caelum.vraptor4.Convert;
 import br.com.caelum.vraptor4.Converter;
-import br.com.caelum.vraptor4.ioc.ApplicationScoped;
 
 /**
  * VRaptor's primitive byte converter.

vraptor-core/src/main/java/br/com/caelum/vraptor4/converter/PrimitiveCharConverter.java

@@ -22,9 +22,10 @@
 import java.text.MessageFormat;
 import java.util.ResourceBundle;
 
+import javax.enterprise.context.ApplicationScoped;
+
 import br.com.caelum.vraptor4.Convert;
 import br.com.caelum.vraptor4.Converter;
-import br.com.caelum.vraptor4.ioc.ApplicationScoped;
 
 /**
  * VRaptor's primitive char converter.

vraptor-core/src/main/java/br/com/caelum/vraptor4/converter/PrimitiveDoubleConverter.java

@@ -22,9 +22,10 @@
 import java.text.MessageFormat;
 import java.util.ResourceBundle;
 
+import javax.enterprise.context.ApplicationScoped;
+
 import br.com.caelum.vraptor4.Convert;
 import br.com.caelum.vraptor4.Converter;
-import br.com.caelum.vraptor4.ioc.ApplicationScoped;
 
 /**
  * VRaptor's primitive double converter.

vraptor-core/src/main/java/br/com/caelum/vraptor4/converter/PrimitiveFloatConverter.java

@@ -22,9 +22,10 @@
 import java.text.MessageFormat;
 import java.util.ResourceBundle;
 
+import javax.enterprise.context.ApplicationScoped;
+
 import br.com.caelum.vraptor4.Convert;
 import br.com.caelum.vraptor4.Converter;
-import br.com.caelum.vraptor4.ioc.ApplicationScoped;
 
 /**
  * VRaptor's primitive float converter.

vraptor-core/src/main/java/br/com/caelum/vraptor4/converter/PrimitiveIntConverter.java

@@ -22,9 +22,10 @@
 import java.text.MessageFormat;
 import java.util.ResourceBundle;
 
+import javax.enterprise.context.ApplicationScoped;
+
 import br.com.caelum.vraptor4.Convert;
 import br.com.caelum.vraptor4.Converter;
-import br.com.caelum.vraptor4.ioc.ApplicationScoped;
 
 /**
  * VRaptor's primitive int converter.