Author: marius.bogoevici Date: 2010-03-01 15:33:43 -0500 (Mon, 01 Mar 2010) New Revision: 5969 Added: core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/ExtraSpecialLiteral.java Modified: core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/ExtraSpecial.java core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/PigSty.java Log: Refactoring ExtraSpecial/ExtraSpecialLiteral to work around compilation problems encountered in different environments. Modified: core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/ExtraSpecial.java =================================================================== --- core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/ExtraSpecial.java 2010-03-01 10:17:01 UTC (rev 5968) +++ core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/ExtraSpecial.java 2010-03-01 20:33:43 UTC (rev 5969) @@ -1,8 +1,8 @@ /* * 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. + * Copyright 2010, Red Hat, Inc. and/or its affiliates, 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. @@ -25,7 +25,6 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.enterprise.util.AnnotationLiteral; import javax.inject.Qualifier; @Qualifier @@ -34,13 +33,4 @@ public @interface ExtraSpecial { - static class ExtraSpecialLiteral extends AnnotationLiteral<ExtraSpecial> implements ExtraSpecial - { - - private ExtraSpecialLiteral() {} - - } - - public static final ExtraSpecial INSTANCE = new ExtraSpecialLiteral(); - } Added: core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/ExtraSpecialLiteral.java =================================================================== --- core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/ExtraSpecialLiteral.java (rev 0) +++ core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/ExtraSpecialLiteral.java 2010-03-01 20:33:43 UTC (rev 5969) @@ -0,0 +1,29 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2010, Red Hat, Inc. and/or its affiliates, 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.tests.injectionPoint; + +import javax.enterprise.util.AnnotationLiteral; + +public class ExtraSpecialLiteral extends AnnotationLiteral<ExtraSpecial> implements ExtraSpecial +{ + public static final ExtraSpecial INSTANCE = new ExtraSpecialLiteral(); + + private ExtraSpecialLiteral() { + } + +} Modified: core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/PigSty.java =================================================================== --- core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/PigSty.java 2010-03-01 10:17:01 UTC (rev 5968) +++ core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/PigSty.java 2010-03-01 20:33:43 UTC (rev 5969) @@ -1,3 +1,20 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2010, Red Hat, Inc. and/or its affiliates, 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.tests.injectionPoint; import javax.enterprise.inject.Instance; @@ -9,7 +26,7 @@ public Pig getPig() { - return pig.select(ExtraSpecial.INSTANCE).get(); + return pig.select(ExtraSpecialLiteral.INSTANCE).get(); } }