WBRI-117, update to packaging to PRD2

git-svn-id: http://anonsvn.jboss.org/repos/weld/ri/trunk@1232 1c488680-804c-0410-94cd-c6b725194a0e

webbeans-api/src/main/java/javax/webbeans/Named.java → webbeans-api/src/main/java/javax/annotation/Named.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package javax.webbeans;
+package javax.annotation;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;

webbeans-api/src/main/java/javax/webbeans/NonBinding.java → webbeans-api/src/main/java/javax/annotation/NonBinding.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package javax.webbeans;
+package javax.annotation;
 
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;

webbeans-api/src/main/java/javax/webbeans/Stereotype.java → webbeans-api/src/main/java/javax/annotation/Stereotype.java

@@ -15,7 +15,7 @@
 * limitations under the License.
 */
 
-package javax.webbeans;
+package javax.annotation;
 
 import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;

webbeans-api/src/main/java/javax/webbeans/ApplicationScoped.java → webbeans-api/src/main/java/javax/context/ApplicationScoped.java

@@ -15,7 +15,7 @@
 * limitations under the License.
 */
 
-package javax.webbeans;
+package javax.context;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;

webbeans-api/src/main/java/javax/webbeans/manager/Context.java → webbeans-api/src/main/java/javax/context/Context.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package javax.webbeans.manager;
+package javax.context;
 
 import java.lang.annotation.Annotation;
 

webbeans-api/src/main/java/javax/webbeans/ContextNotActiveException.java → webbeans-api/src/main/java/javax/context/ContextNotActiveException.java

@@ -15,7 +15,9 @@
  * limitations under the License.
  */
 
-package javax.webbeans;
+package javax.context;
+
+import javax.inject.ExecutionException;
 
 /**
  * A ContextNotActiveException is thrown if at a particular point in the

webbeans-api/src/main/java/javax/webbeans/manager/Contextual.java → webbeans-api/src/main/java/javax/context/Contextual.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package javax.webbeans.manager;
+package javax.context;
 
 /**
  * The contract between a Context and an object that has its lifecycle managed

webbeans-api/src/main/java/javax/webbeans/Conversation.java → webbeans-api/src/main/java/javax/context/Conversation.java

@@ -1,4 +1,4 @@
-package javax.webbeans;
+package javax.context;
 
 public interface Conversation {
    public void begin();

webbeans-api/src/main/java/javax/webbeans/ConversationScoped.java → webbeans-api/src/main/java/javax/context/ConversationScoped.java

@@ -15,7 +15,7 @@
 * limitations under the License.
 */
 
-package javax.webbeans;
+package javax.context;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;

webbeans-api/src/main/java/javax/webbeans/Dependent.java → webbeans-api/src/main/java/javax/context/Dependent.java

@@ -15,7 +15,7 @@
 * limitations under the License.
 */
 
-package javax.webbeans;
+package javax.context;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;

webbeans-api/src/main/java/javax/webbeans/RequestScoped.java → webbeans-api/src/main/java/javax/context/RequestScoped.java

@@ -15,7 +15,7 @@
 * limitations under the License.
 */
 
-package javax.webbeans;
+package javax.context;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;

webbeans-api/src/main/java/javax/webbeans/ScopeType.java → webbeans-api/src/main/java/javax/context/ScopeType.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package javax.webbeans;
+package javax.context;
 
 import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;

webbeans-api/src/main/java/javax/webbeans/SessionScoped.java → webbeans-api/src/main/java/javax/context/SessionScoped.java

@@ -15,7 +15,7 @@
 * limitations under the License.
 */
 
-package javax.webbeans;
+package javax.context;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;

webbeans-api/src/main/java/javax/webbeans/Decorates.java → webbeans-api/src/main/java/javax/decorator/Decorates.java

@@ -15,7 +15,7 @@
 * limitations under the License.
 */
 
-package javax.webbeans;
+package javax.decorator;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;

webbeans-api/src/main/java/javax/webbeans/Decorator.java → webbeans-api/src/main/java/javax/decorator/Decorator.java

@@ -15,7 +15,7 @@
 * limitations under the License.
 */
 
-package javax.webbeans;
+package javax.decorator;
 
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
@@ -24,6 +24,8 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
+import javax.annotation.Stereotype;
+
 /**
  * Specifies that a class is a Web Beans decorator.
  * 

webbeans-api/src/main/java/javax/webbeans/AfterTransactionCompletion.java → webbeans-api/src/main/java/javax/event/AfterTransactionCompletion.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package javax.webbeans;
+package javax.event;
 
 import static java.lang.annotation.ElementType.PARAMETER;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;

webbeans-api/src/main/java/javax/webbeans/AfterTransactionFailure.java → webbeans-api/src/main/java/javax/event/AfterTransactionFailure.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package javax.webbeans;
+package javax.event;
 
 import static java.lang.annotation.ElementType.PARAMETER;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;

webbeans-api/src/main/java/javax/webbeans/AfterTransactionSuccess.java → webbeans-api/src/main/java/javax/event/AfterTransactionSuccess.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package javax.webbeans;
+package javax.event;
 
 import static java.lang.annotation.ElementType.PARAMETER;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;

webbeans-api/src/main/java/javax/webbeans/BeforeTransactionCompletion.java → webbeans-api/src/main/java/javax/event/BeforeTransactionCompletion.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package javax.webbeans;
+package javax.event;
 
 import static java.lang.annotation.ElementType.PARAMETER;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;

webbeans-api/src/main/java/javax/webbeans/Event.java → webbeans-api/src/main/java/javax/event/Event.java

@@ -15,7 +15,7 @@
 * limitations under the License.
 */
 
-package javax.webbeans;
+package javax.event;
 
 import java.lang.annotation.Annotation;
 

webbeans-api/src/main/java/javax/webbeans/Fires.java → webbeans-api/src/main/java/javax/event/Fires.java

@@ -14,7 +14,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package javax.webbeans;
+package javax.event;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
@@ -26,6 +26,8 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
+import javax.inject.BindingType;
+
 /**
  * Annotates a variable to be injected with an Event object that can be fired and 
  * observed by observer methods

webbeans-api/src/main/java/javax/webbeans/IfExists.java → webbeans-api/src/main/java/javax/event/IfExists.java

@@ -15,7 +15,7 @@
 * limitations under the License.
 */
 
-package javax.webbeans;
+package javax.event;
 
 import static java.lang.annotation.ElementType.PARAMETER;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;

webbeans-api/src/main/java/javax/webbeans/Observer.java → webbeans-api/src/main/java/javax/event/Observer.java

@@ -1,4 +1,4 @@
-package javax.webbeans;
+package javax.event;
 
 /**
  * The contract between the Web Bean manager and a Web Beans observer object.

webbeans-api/src/main/java/javax/webbeans/ObserverException.java → webbeans-api/src/main/java/javax/event/ObserverException.java

@@ -15,7 +15,9 @@
 * limitations under the License.
 */
 
-package javax.webbeans;
+package javax.event;
+
+import javax.inject.ExecutionException;
 
 /**
  * 

webbeans-api/src/main/java/javax/webbeans/Observes.java → webbeans-api/src/main/java/javax/event/Observes.java

@@ -15,7 +15,7 @@
 * limitations under the License.
 */
 
-package javax.webbeans;
+package javax.event;
 
 import static java.lang.annotation.ElementType.PARAMETER;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;

webbeans-api/src/main/java/javax/webbeans/AmbiguousDependencyException.java → webbeans-api/src/main/java/javax/inject/AmbiguousDependencyException.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package javax.webbeans;
+package javax.inject;
 
 /**
  * An AmbiguousDependencyException is thrown when within the set of enabled Web

webbeans-api/src/main/java/javax/webbeans/AnnotationLiteral.java → webbeans-api/src/main/java/javax/inject/AnnotationLiteral.java

@@ -15,7 +15,7 @@
 * limitations under the License.
 */
 
-package javax.webbeans;
+package javax.inject;
 
 /**
  * Supports inline instantiation of annotation types.
@@ -32,6 +32,7 @@
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 
+
 public abstract class AnnotationLiteral<T extends Annotation> implements
       Annotation
 {

webbeans-api/src/main/java/javax/webbeans/BindingType.java → webbeans-api/src/main/java/javax/inject/BindingType.java

@@ -15,7 +15,7 @@
 * limitations under the License.
 */
 
-package javax.webbeans;
+package javax.inject;
 
 import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;

webbeans-api/src/main/java/javax/webbeans/CreationException.java → webbeans-api/src/main/java/javax/inject/CreationException.java

@@ -15,7 +15,7 @@
 * limitations under the License.
 */
 
-package javax.webbeans;
+package javax.inject;
 
 /**
  * 

webbeans-api/src/main/java/javax/webbeans/Current.java → webbeans-api/src/main/java/javax/inject/Current.java

@@ -15,7 +15,7 @@
 * limitations under the License.
 */
 
-package javax.webbeans;
+package javax.inject;
 
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.PARAMETER;

webbeans-api/src/main/java/javax/webbeans/DefinitionException.java → webbeans-api/src/main/java/javax/inject/DefinitionException.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package javax.webbeans;
+package javax.inject;
 
 /**
  * 

webbeans-api/src/main/java/javax/webbeans/DeploymentException.java → webbeans-api/src/main/java/javax/inject/DeploymentException.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package javax.webbeans;
+package javax.inject;
 
 /**
  * 

webbeans-api/src/main/java/javax/webbeans/DeploymentType.java → webbeans-api/src/main/java/javax/inject/DeploymentType.java

@@ -15,7 +15,7 @@
 * limitations under the License.
 */
 
-package javax.webbeans;
+package javax.inject;
 
 import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;

webbeans-api/src/main/java/javax/webbeans/Disposes.java → webbeans-api/src/main/java/javax/inject/Disposes.java

@@ -15,7 +15,7 @@
 * limitations under the License.
 */
 
-package javax.webbeans;
+package javax.inject;
 
 import static java.lang.annotation.ElementType.PARAMETER;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;

webbeans-api/src/main/java/javax/webbeans/DuplicateBindingTypeException.java → webbeans-api/src/main/java/javax/inject/DuplicateBindingTypeException.java

@@ -14,7 +14,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package javax.webbeans;
+package javax.inject;
 
 /**
  * This exception is thrown whenever more than one binding type instance of the

webbeans-api/src/main/java/javax/webbeans/ExecutionException.java → webbeans-api/src/main/java/javax/inject/ExecutionException.java

@@ -16,7 +16,7 @@
  */
 
 
-package javax.webbeans;
+package javax.inject;
 
 /**
  * 

webbeans-api/src/main/java/javax/webbeans/IllegalProductException.java → webbeans-api/src/main/java/javax/inject/IllegalProductException.java

@@ -14,7 +14,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package javax.webbeans;
+package javax.inject;
 
 /**
  */

webbeans-api/src/main/java/javax/webbeans/InconsistentSpecializationException.java → webbeans-api/src/main/java/javax/inject/InconsistentSpecializationException.java

@@ -16,7 +16,7 @@
  */
 
 
-package javax.webbeans;
+package javax.inject;
 
 /**
  * 

webbeans-api/src/main/java/javax/webbeans/Initializer.java → webbeans-api/src/main/java/javax/inject/Initializer.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package javax.webbeans;
+package javax.inject;
 
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.CONSTRUCTOR;

webbeans-api/src/main/java/javax/webbeans/Instance.java → webbeans-api/src/main/java/javax/inject/Instance.java

@@ -15,10 +15,11 @@
  * limitations under the License.
  */
 
-package javax.webbeans;
+package javax.inject;
 
 import java.lang.annotation.Annotation;
 
+
 /**
  * An interface for looking up web beans of a particular type.
  * 

webbeans-api/src/main/java/javax/webbeans/New.java → webbeans-api/src/main/java/javax/inject/New.java

@@ -15,7 +15,7 @@
 * limitations under the License.
 */
 
-package javax.webbeans;
+package javax.inject;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.PARAMETER;