[weld-commits] Weld SVN: r6785 - in extensions/trunk/impl/src: test/java/org/jboss/weld/extensions/test/bean/generic and 1 other directory.

[weld-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2010-07-23 18:12:08 -0400 (Fri, 23 Jul 2010)
New Revision: 6785

Added:
   extensions/trunk/impl/src/main/java/org/jboss/weld/extensions/bean/generic/GenericConfiguration.java
Removed:
   extensions/trunk/impl/src/main/java/org/jboss/weld/extensions/bean/generic/GenericAnnotation.java
Modified:
   extensions/trunk/impl/src/main/java/org/jboss/weld/extensions/bean/generic/GenericBeanExtension.java
   extensions/trunk/impl/src/test/java/org/jboss/weld/extensions/test/bean/generic/Garply.java
Log:
rename GenericAnnotation to GenericConfiguration

Deleted: extensions/trunk/impl/src/main/java/org/jboss/weld/extensions/bean/generic/GenericAnnotation.java
===================================================================
--- extensions/trunk/impl/src/main/java/org/jboss/weld/extensions/bean/generic/GenericAnnotation.java	2010-07-23 22:05:15 UTC (rev 6784)
+++ extensions/trunk/impl/src/main/java/org/jboss/weld/extensions/bean/generic/GenericAnnotation.java	2010-07-23 22:12:08 UTC (rev 6785)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * 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 org.jboss.weld.extensions.bean.generic;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Must be applied to any annotation that is used as a value in @Generic, this
- * may not be needed in the future
- * 
- * TODO Remove
- * 
- * @author Stuart Douglas <stuart at baileyroberts.com.au>
- * 
- */
- at Retention(RetentionPolicy.RUNTIME)
- at Target( { ElementType.TYPE })
-public @interface GenericAnnotation
-{
-
-}

Modified: extensions/trunk/impl/src/main/java/org/jboss/weld/extensions/bean/generic/GenericBeanExtension.java
===================================================================
--- extensions/trunk/impl/src/main/java/org/jboss/weld/extensions/bean/generic/GenericBeanExtension.java	2010-07-23 22:05:15 UTC (rev 6784)
+++ extensions/trunk/impl/src/main/java/org/jboss/weld/extensions/bean/generic/GenericBeanExtension.java	2010-07-23 22:12:08 UTC (rev 6785)
@@ -103,7 +103,7 @@
          {
             for (Annotation annotation : field.getAnnotations())
             {
-               if (annotation.annotationType().isAnnotationPresent(GenericAnnotation.class))
+               if (annotation.annotationType().isAnnotationPresent(GenericConfiguration.class))
                {
                   if (!producerFields.containsKey(type.getJavaClass()))
                   {
@@ -127,7 +127,7 @@
          {
             for (Annotation annotation : method.getAnnotations())
             {
-               if (annotation.annotationType().isAnnotationPresent(GenericAnnotation.class))
+               if (annotation.annotationType().isAnnotationPresent(GenericConfiguration.class))
                {
                   if (!producerFields.containsKey(type.getJavaClass()))
                   {

Copied: extensions/trunk/impl/src/main/java/org/jboss/weld/extensions/bean/generic/GenericConfiguration.java (from rev 6781, extensions/trunk/impl/src/main/java/org/jboss/weld/extensions/bean/generic/GenericAnnotation.java)
===================================================================
--- extensions/trunk/impl/src/main/java/org/jboss/weld/extensions/bean/generic/GenericConfiguration.java	                        (rev 0)
+++ extensions/trunk/impl/src/main/java/org/jboss/weld/extensions/bean/generic/GenericConfiguration.java	2010-07-23 22:12:08 UTC (rev 6785)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * 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 org.jboss.weld.extensions.bean.generic;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * A meta annotation used to indicate that the annotation is used for
+ * configuration of a generic bean
+ * 
+ * @author Stuart Douglas <stuart at baileyroberts.com.au>
+ * 
+ */
+ at Retention(RetentionPolicy.RUNTIME)
+ at Target( { ElementType.TYPE })
+public @interface GenericConfiguration
+{
+
+}

Modified: extensions/trunk/impl/src/test/java/org/jboss/weld/extensions/test/bean/generic/Garply.java
===================================================================
--- extensions/trunk/impl/src/test/java/org/jboss/weld/extensions/test/bean/generic/Garply.java	2010-07-23 22:05:15 UTC (rev 6784)
+++ extensions/trunk/impl/src/test/java/org/jboss/weld/extensions/test/bean/generic/Garply.java	2010-07-23 22:12:08 UTC (rev 6785)
@@ -25,7 +25,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import org.jboss.weld.extensions.bean.generic.GenericAnnotation;
+import org.jboss.weld.extensions.bean.generic.GenericConfiguration;
 
 /**
  * The annotation used to configure a generic bean
@@ -36,7 +36,7 @@
 
 @Retention(RUNTIME)
 @Target({METHOD, FIELD, PARAMETER, TYPE})
- at GenericAnnotation
+ at GenericConfiguration
 public @interface Garply
 {
    String value();