Author: pete.muir(a)jboss.org Date: 2010-04-28 12:21:33 -0400 (Wed, 28 Apr 2010) New Revision: 6188 Added: extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/ extensions/trunk/src/test/java/org/jboss/weld/extensions/test/bean/ extensions/trunk/src/test/java/org/jboss/weld/extensions/test/bean/generic/ Removed: extensions/trunk/src/main/java/org/jboss/weld/extensions/genericbean/ extensions/trunk/src/test/java/org/jboss/weld/extensions/test/genericbean/ Modified: extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/FieldSetter.java extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/Generic.java extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/GenericAnnotation.java extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/GenericBeanInjectionTargetWrapper.java extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/GenericExtension.java extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/InjectConfiguration.java extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/InjectGeneric.java extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/InjectLiteral.java extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/ProducerFieldInjectionTarget.java extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/SyntheticQualifier.java extensions/trunk/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension extensions/trunk/src/test/java/org/jboss/weld/extensions/test/bean/generic/GenericBeanTest.java extensions/trunk/src/test/java/org/jboss/weld/extensions/test/bean/generic/GenericConstructorArgument.java extensions/trunk/src/test/java/org/jboss/weld/extensions/test/bean/generic/GenericDep.java extensions/trunk/src/test/java/org/jboss/weld/extensions/test/bean/generic/GenericMain.java extensions/trunk/src/test/java/org/jboss/weld/extensions/test/bean/generic/GenericProducer.java extensions/trunk/src/test/java/org/jboss/weld/extensions/test/bean/generic/InjectedBean.java extensions/trunk/src/test/java/org/jboss/weld/extensions/test/bean/generic/NormalBean.java extensions/trunk/src/test/java/org/jboss/weld/extensions/test/bean/generic/SomeQualifier.java extensions/trunk/src/test/java/org/jboss/weld/extensions/test/bean/generic/TestAnnotation.java Log: WELDX-98 Copied: extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic (from rev 6185, extensions/trunk/src/main/java/org/jboss/weld/extensions/genericbean) Modified: extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/FieldSetter.java =================================================================== --- extensions/trunk/src/main/java/org/jboss/weld/extensions/genericbean/FieldSetter.java 2010-04-28 15:10:34 UTC (rev 6185) +++ extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/FieldSetter.java 2010-04-28 16:21:33 UTC (rev 6188) @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.extensions.genericbean; +package org.jboss.weld.extensions.bean.generic; import java.lang.reflect.Field; import java.util.Set; Modified: extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/Generic.java =================================================================== --- extensions/trunk/src/main/java/org/jboss/weld/extensions/genericbean/Generic.java 2010-04-28 15:10:34 UTC (rev 6185) +++ extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/Generic.java 2010-04-28 16:21:33 UTC (rev 6188) @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.extensions.genericbean; +package org.jboss.weld.extensions.bean.generic; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; Modified: extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/GenericAnnotation.java =================================================================== --- extensions/trunk/src/main/java/org/jboss/weld/extensions/genericbean/GenericAnnotation.java 2010-04-28 15:10:34 UTC (rev 6185) +++ extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/GenericAnnotation.java 2010-04-28 16:21:33 UTC (rev 6188) @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.extensions.genericbean; +package org.jboss.weld.extensions.bean.generic; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; Modified: extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/GenericBeanInjectionTargetWrapper.java =================================================================== --- extensions/trunk/src/main/java/org/jboss/weld/extensions/genericbean/GenericBeanInjectionTargetWrapper.java 2010-04-28 15:10:34 UTC (rev 6185) +++ extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/GenericBeanInjectionTargetWrapper.java 2010-04-28 16:21:33 UTC (rev 6188) @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.extensions.genericbean; +package org.jboss.weld.extensions.bean.generic; import java.lang.annotation.Annotation; import java.lang.reflect.Field; Modified: extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/GenericExtension.java =================================================================== --- extensions/trunk/src/main/java/org/jboss/weld/extensions/genericbean/GenericExtension.java 2010-04-28 15:10:34 UTC (rev 6185) +++ extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/GenericExtension.java 2010-04-28 16:21:33 UTC (rev 6188) @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.extensions.genericbean; +package org.jboss.weld.extensions.bean.generic; import java.lang.annotation.Annotation; import java.util.ArrayList; Modified: extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/InjectConfiguration.java =================================================================== --- extensions/trunk/src/main/java/org/jboss/weld/extensions/genericbean/InjectConfiguration.java 2010-04-28 15:10:34 UTC (rev 6185) +++ extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/InjectConfiguration.java 2010-04-28 16:21:33 UTC (rev 6188) @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.extensions.genericbean; +package org.jboss.weld.extensions.bean.generic; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; Modified: extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/InjectGeneric.java =================================================================== --- extensions/trunk/src/main/java/org/jboss/weld/extensions/genericbean/InjectGeneric.java 2010-04-28 15:10:34 UTC (rev 6185) +++ extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/InjectGeneric.java 2010-04-28 16:21:33 UTC (rev 6188) @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.extensions.genericbean; +package org.jboss.weld.extensions.bean.generic; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; Modified: extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/InjectLiteral.java =================================================================== --- extensions/trunk/src/main/java/org/jboss/weld/extensions/genericbean/InjectLiteral.java 2010-04-28 15:10:34 UTC (rev 6185) +++ extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/InjectLiteral.java 2010-04-28 16:21:33 UTC (rev 6188) @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.extensions.genericbean; +package org.jboss.weld.extensions.bean.generic; import javax.enterprise.util.AnnotationLiteral; import javax.inject.Inject; Modified: extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/ProducerFieldInjectionTarget.java =================================================================== --- extensions/trunk/src/main/java/org/jboss/weld/extensions/genericbean/ProducerFieldInjectionTarget.java 2010-04-28 15:10:34 UTC (rev 6185) +++ extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/ProducerFieldInjectionTarget.java 2010-04-28 16:21:33 UTC (rev 6188) @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.extensions.genericbean; +package org.jboss.weld.extensions.bean.generic; import java.util.List; import java.util.Set; Modified: extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/SyntheticQualifier.java =================================================================== --- extensions/trunk/src/main/java/org/jboss/weld/extensions/genericbean/SyntheticQualifier.java 2010-04-28 15:10:34 UTC (rev 6185) +++ extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/SyntheticQualifier.java 2010-04-28 16:21:33 UTC (rev 6188) @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.extensions.genericbean; +package org.jboss.weld.extensions.bean.generic; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; Modified: extensions/trunk/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension =================================================================== --- extensions/trunk/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension 2010-04-28 16:13:32 UTC (rev 6187) +++ extensions/trunk/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension 2010-04-28 16:21:33 UTC (rev 6188) @@ -1,4 +1,4 @@ -org.jboss.weld.extensions.genericbean.GenericExtension +org.jboss.weld.extensions.bean.generic.GenericExtension org.jboss.weld.extensions.resourceLoader.servlet.ServletResourceExtension org.jboss.weld.extensions.beanlookup.IdentifiableBeanExtension org.jboss.weld.extensions.CoreExtension Copied: extensions/trunk/src/test/java/org/jboss/weld/extensions/test/bean/generic (from rev 6185, extensions/trunk/src/test/java/org/jboss/weld/extensions/test/genericbean) Modified: extensions/trunk/src/test/java/org/jboss/weld/extensions/test/bean/generic/GenericBeanTest.java =================================================================== --- extensions/trunk/src/test/java/org/jboss/weld/extensions/test/genericbean/GenericBeanTest.java 2010-04-28 15:10:34 UTC (rev 6185) +++ extensions/trunk/src/test/java/org/jboss/weld/extensions/test/bean/generic/GenericBeanTest.java 2010-04-28 16:21:33 UTC (rev 6188) @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.extensions.test.genericbean; +package org.jboss.weld.extensions.test.bean.generic; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.weld.test.AbstractWeldTest; Modified: extensions/trunk/src/test/java/org/jboss/weld/extensions/test/bean/generic/GenericConstructorArgument.java =================================================================== --- extensions/trunk/src/test/java/org/jboss/weld/extensions/test/genericbean/GenericConstructorArgument.java 2010-04-28 15:10:34 UTC (rev 6185) +++ extensions/trunk/src/test/java/org/jboss/weld/extensions/test/bean/generic/GenericConstructorArgument.java 2010-04-28 16:21:33 UTC (rev 6188) @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.extensions.test.genericbean; +package org.jboss.weld.extensions.test.bean.generic; import javax.inject.Inject; -import org.jboss.weld.extensions.genericbean.Generic; +import org.jboss.weld.extensions.bean.generic.Generic; @Generic(TestAnnotation.class) public class GenericConstructorArgument Modified: extensions/trunk/src/test/java/org/jboss/weld/extensions/test/bean/generic/GenericDep.java =================================================================== --- extensions/trunk/src/test/java/org/jboss/weld/extensions/test/genericbean/GenericDep.java 2010-04-28 15:10:34 UTC (rev 6185) +++ extensions/trunk/src/test/java/org/jboss/weld/extensions/test/bean/generic/GenericDep.java 2010-04-28 16:21:33 UTC (rev 6188) @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.extensions.test.genericbean; +package org.jboss.weld.extensions.test.bean.generic; import javax.inject.Inject; -import org.jboss.weld.extensions.genericbean.Generic; +import org.jboss.weld.extensions.bean.generic.Generic; @Generic(TestAnnotation.class) public class GenericDep Modified: extensions/trunk/src/test/java/org/jboss/weld/extensions/test/bean/generic/GenericMain.java =================================================================== --- extensions/trunk/src/test/java/org/jboss/weld/extensions/test/genericbean/GenericMain.java 2010-04-28 15:10:34 UTC (rev 6185) +++ extensions/trunk/src/test/java/org/jboss/weld/extensions/test/bean/generic/GenericMain.java 2010-04-28 16:21:33 UTC (rev 6188) @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.extensions.test.genericbean; +package org.jboss.weld.extensions.test.bean.generic; import javax.inject.Inject; -import org.jboss.weld.extensions.genericbean.Generic; +import org.jboss.weld.extensions.bean.generic.Generic; @Generic(TestAnnotation.class) public class GenericMain Modified: extensions/trunk/src/test/java/org/jboss/weld/extensions/test/bean/generic/GenericProducer.java =================================================================== --- extensions/trunk/src/test/java/org/jboss/weld/extensions/test/genericbean/GenericProducer.java 2010-04-28 15:10:34 UTC (rev 6185) +++ extensions/trunk/src/test/java/org/jboss/weld/extensions/test/bean/generic/GenericProducer.java 2010-04-28 16:21:33 UTC (rev 6188) @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.extensions.test.genericbean; +package org.jboss.weld.extensions.test.bean.generic; import javax.enterprise.inject.Produces; Modified: extensions/trunk/src/test/java/org/jboss/weld/extensions/test/bean/generic/InjectedBean.java =================================================================== --- extensions/trunk/src/test/java/org/jboss/weld/extensions/test/genericbean/InjectedBean.java 2010-04-28 15:10:34 UTC (rev 6185) +++ extensions/trunk/src/test/java/org/jboss/weld/extensions/test/bean/generic/InjectedBean.java 2010-04-28 16:21:33 UTC (rev 6188) @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.extensions.test.genericbean; +package org.jboss.weld.extensions.test.bean.generic; import javax.inject.Inject; Modified: extensions/trunk/src/test/java/org/jboss/weld/extensions/test/bean/generic/NormalBean.java =================================================================== --- extensions/trunk/src/test/java/org/jboss/weld/extensions/test/genericbean/NormalBean.java 2010-04-28 15:10:34 UTC (rev 6185) +++ extensions/trunk/src/test/java/org/jboss/weld/extensions/test/bean/generic/NormalBean.java 2010-04-28 16:21:33 UTC (rev 6188) @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.extensions.test.genericbean; +package org.jboss.weld.extensions.test.bean.generic; public class NormalBean { Modified: extensions/trunk/src/test/java/org/jboss/weld/extensions/test/bean/generic/SomeQualifier.java =================================================================== --- extensions/trunk/src/test/java/org/jboss/weld/extensions/test/genericbean/SomeQualifier.java 2010-04-28 15:10:34 UTC (rev 6185) +++ extensions/trunk/src/test/java/org/jboss/weld/extensions/test/bean/generic/SomeQualifier.java 2010-04-28 16:21:33 UTC (rev 6188) @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.extensions.test.genericbean; +package org.jboss.weld.extensions.test.bean.generic; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; Modified: extensions/trunk/src/test/java/org/jboss/weld/extensions/test/bean/generic/TestAnnotation.java =================================================================== --- extensions/trunk/src/test/java/org/jboss/weld/extensions/test/genericbean/TestAnnotation.java 2010-04-28 15:10:34 UTC (rev 6185) +++ extensions/trunk/src/test/java/org/jboss/weld/extensions/test/bean/generic/TestAnnotation.java 2010-04-28 16:21:33 UTC (rev 6188) @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jboss.weld.extensions.test.genericbean; +package org.jboss.weld.extensions.test.bean.generic; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; -import org.jboss.weld.extensions.genericbean.GenericAnnotation; +import org.jboss.weld.extensions.bean.generic.GenericAnnotation; @Retention(RetentionPolicy.RUNTIME) @GenericAnnotation