JBoss Tools SVN: r35451 - in trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui: marker and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-10-06 20:13:14 -0400 (Thu, 06 Oct 2011)
New Revision: 35451
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.properties
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddAnnotationMarkerResolution.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIProblemMarkerResolutionGenerator.java
Log:
Quick fixes for problem markers in beans.xml https://issues.jboss.org/browse/JBIDE-9833
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.properties
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.properties 2011-10-07 00:12:43 UTC (rev 35450)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.properties 2011-10-07 00:13:14 UTC (rev 35451)
@@ -92,10 +92,10 @@
ADD_ANNOTATION_MARKER_RESOLUTION_TITLE=Add @{0} annotation to ''{1}'' {2}
DELETE_ANNOTATION_MARKER_RESOLUTION_TITLE=Delete @{0} annotation from ''{1}'' {2}
CHANGE_ANNOTATION_MARKER_RESOLUTION_TITLE=Change ''{0}'' annotation to {1}
-CREATE_BEAN_CLASS_TITLE=Create ''{0}'' Bean Class
-CREATE_STEREOTYPE_TITLE=Create ''{0}'' Stereotype
-CREATE_INTERCEPTOR_TITLE=Create ''{0}'' Interceptor
-CREATE_DECORATOR_TITLE=Create ''{0}'' Decorator
+CREATE_BEAN_CLASS_TITLE=Create ''{0}'' CDI Bean Class
+CREATE_STEREOTYPE_TITLE=Create ''{0}'' CDI Stereotype
+CREATE_INTERCEPTOR_TITLE=Create ''{0}'' CDI Interceptor
+CREATE_DECORATOR_TITLE=Create ''{0}'' CDI Decorator
QUESTION=Question
DECREASING_FIELD_VISIBILITY_MAY_CAUSE_COMPILATION_PROBLEMS=Decreasing field visibility may cause compilation problems. Do you want to continue?
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddAnnotationMarkerResolution.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddAnnotationMarkerResolution.java 2011-10-07 00:12:43 UTC (rev 35450)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddAnnotationMarkerResolution.java 2011-10-07 00:13:14 UTC (rev 35451)
@@ -17,7 +17,6 @@
import org.eclipse.jdt.core.IField;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.ILocalVariable;
-import org.eclipse.jdt.core.IMember;
import org.eclipse.jdt.core.IMethod;
import org.eclipse.jdt.core.IType;
import org.eclipse.osgi.util.NLS;
@@ -51,11 +50,6 @@
label = NLS.bind(CDIUIMessages.ADD_ANNOTATION_MARKER_RESOLUTION_TITLE, new String[]{shortName, element.getElementName(), type});
}
- public AddAnnotationMarkerResolution(String classQualifiedName, String annotationQualifiedName){
- this.qualifiedName = annotationQualifiedName;
-
- }
-
public String getLabel() {
return label;
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIProblemMarkerResolutionGenerator.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIProblemMarkerResolutionGenerator.java 2011-10-07 00:12:43 UTC (rev 35450)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIProblemMarkerResolutionGenerator.java 2011-10-07 00:13:14 UTC (rev 35451)
@@ -17,6 +17,7 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.jdt.core.Flags;
import org.eclipse.jdt.core.IAnnotatable;
@@ -24,6 +25,7 @@
import org.eclipse.jdt.core.ICompilationUnit;
import org.eclipse.jdt.core.IField;
import org.eclipse.jdt.core.IJavaElement;
+import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.ILocalVariable;
import org.eclipse.jdt.core.IMember;
import org.eclipse.jdt.core.IMethod;
@@ -52,7 +54,6 @@
import org.jboss.tools.common.java.IAnnotationDeclaration;
import org.jboss.tools.common.model.util.EclipseJavaUtil;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
-import org.jboss.tools.jst.web.ui.WebUiPlugin;
/**
* @author Daniel Azarov
@@ -506,13 +507,19 @@
new CreateCDIElementMarkerResolution(file.getProject(), text, CreateCDIElementMarkerResolution.CREATE_STEREOTYPE)
};
}else if(messageId == CDIValidationErrorManager.ILLEGAL_ALTERNATIVE_BEAN_CLASS_ID){
- return new IMarkerResolution[] {
- new AddAnnotationMarkerResolution(text, CDIConstants.ALTERNATIVE_ANNOTATION_TYPE_NAME)
- };
+ IJavaElement element = findJavaElementByQualifiedName(file.getProject(), text);
+ if(element != null){
+ return new IMarkerResolution[] {
+ new AddAnnotationMarkerResolution(element, CDIConstants.ALTERNATIVE_ANNOTATION_TYPE_NAME)
+ };
+ }
}else if(messageId == CDIValidationErrorManager.ILLEGAL_ALTERNATIVE_ANNOTATION_ID){
- return new IMarkerResolution[] {
- new AddAnnotationMarkerResolution(text, CDIConstants.ALTERNATIVE_ANNOTATION_TYPE_NAME)
- };
+ IJavaElement element = findJavaElementByQualifiedName(file.getProject(), text);
+ if(element != null){
+ return new IMarkerResolution[] {
+ new AddAnnotationMarkerResolution(element, CDIConstants.ALTERNATIVE_ANNOTATION_TYPE_NAME)
+ };
+ }
}else if(messageId == CDIValidationErrorManager.UNKNOWN_DECORATOR_BEAN_CLASS_NAME_ID){
return new IMarkerResolution[] {
new CreateCDIElementMarkerResolution(file.getProject(), text, CreateCDIElementMarkerResolution.CREATE_DECORATOR)
@@ -526,6 +533,17 @@
return new IMarkerResolution[] {};
}
+ private IJavaElement findJavaElementByQualifiedName(IProject project, String qualifiedName){
+ IJavaProject javaProject = EclipseUtil.getJavaProject(project);
+ try {
+ return javaProject.findType(qualifiedName);
+ } catch (JavaModelException ex) {
+ CDIUIPlugin.getDefault().logError(ex);
+ }
+
+ return null;
+ }
+
private IType findNamedDeclarationType(ICDIProject cdiProject, IType type, boolean isItDecorator){
IType declarationType = null;
IBean bean = null;
14 years, 10 months
- 1
- 0
JBoss Tools SVN: r35450 - tags/jbosstools-3.2.1.Final/documentation/guides/JBDS_Release_Notes/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-10-06 20:12:43 -0400 (Thu, 06 Oct 2011)
New Revision: 35450
Modified:
tags/jbosstools-3.2.1.Final/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml
Log:
updated for brew
Modified: tags/jbosstools-3.2.1.Final/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml
===================================================================
--- tags/jbosstools-3.2.1.Final/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml 2011-10-06 23:55:48 UTC (rev 35449)
+++ tags/jbosstools-3.2.1.Final/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml 2011-10-07 00:12:43 UTC (rev 35450)
@@ -8,7 +8,7 @@
<productname>JBoss Developer Studio</productname>
<productnumber>4.1</productnumber>
<edition>0</edition>
- <pubsnumber>11</pubsnumber>
+ <pubsnumber>12</pubsnumber>
<abstract>
<para>
These release notes contain important information related to the JBoss Developer Studio. New features, known issues, resources, and other current issues are addressed here.
14 years, 10 months
- 1
- 0
JBoss Tools SVN: r35449 - in trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test: .settings and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-10-06 19:55:48 -0400 (Thu, 06 Oct 2011)
New Revision: 35449
Added:
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/.settings/
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/.settings/org.eclipse.jdt.core.prefs
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/CDISeamSolderCoreAllTests.java
Log:
JBIDE-9852
https://issues.jboss.org/browse/JBIDE-9852
Tests for seam solder migrated to 3.1.
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/.settings/org.eclipse.jdt.core.prefs 2011-10-06 23:55:48 UTC (rev 35449)
@@ -0,0 +1,8 @@
+#Fri Sep 30 12:13:47 PDT 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/.settings/org.eclipse.jdt.core.prefs
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/CDISeamSolderCoreAllTests.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/CDISeamSolderCoreAllTests.java 2011-10-06 23:55:38 UTC (rev 35448)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/CDISeamSolderCoreAllTests.java 2011-10-06 23:55:48 UTC (rev 35449)
@@ -48,10 +48,10 @@
suite31.addTestSuite(DefaultBeanTest.class);
suite31.addTestSuite(UnwrapsTest.class);
- suiteAll.addTest(suite31);
+ suiteAll.addTest(suite);
suiteAll.addTestSuite(ValidationExceptionTest.class); // This test should be added last!
- return suite;
+ return suiteAll;
}
}
\ No newline at end of file
14 years, 10 months
- 1
- 0
JBoss Tools SVN: r35448 - branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-10-06 19:55:38 -0400 (Thu, 06 Oct 2011)
New Revision: 35448
Modified:
branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml
branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/Overview.xml
Log:
updated to remove invalid info
Modified: branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml
===================================================================
--- branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml 2011-10-06 23:54:48 UTC (rev 35447)
+++ branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml 2011-10-06 23:55:38 UTC (rev 35448)
@@ -8,7 +8,7 @@
<productname>JBoss Developer Studio</productname>
<productnumber>4.1</productnumber>
<edition>4.1.1</edition>
- <pubsnumber>26</pubsnumber>
+ <pubsnumber>27</pubsnumber>
<abstract>
<para>
These release notes contain important information related to the JBoss Developer Studio. New features, known issues, resources, and other current issues are addressed here.
Modified: branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/Overview.xml
===================================================================
--- branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/Overview.xml 2011-10-06 23:54:48 UTC (rev 35447)
+++ branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/Overview.xml 2011-10-06 23:55:38 UTC (rev 35448)
@@ -19,7 +19,7 @@
</para>
</listitem>
</itemizedlist>
- <important>
+<!-- <important>
<para>
If you are installing on a Linux distribution you must set the following limits in <filename>/etc/security/limits.conf</filename> upon installation completion and before running JBoss Developer Studio:
</para>
@@ -33,7 +33,7 @@
<para>
For further installation instructions see the Getting Started Guide for this release, available at: <ulink url="http://docs.redhat.com/docs/en-US/JBoss_Developer_Studio/index.html">http://docs.redhat.com/docs/en-US/JBoss_Developer_Studio/index.html</ulink>
</para>
- </important>
+ </important> -->
<!-- Old 'new' feature list for JBDS 4.0.0 left as a guide -->
<!-- <itemizedlist>
<listitem>
14 years, 10 months
- 1
- 0
JBoss Tools SVN: r35447 - tags/jbosstools-3.2.1.Final/documentation/guides/JBDS_Release_Notes/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-10-06 19:54:48 -0400 (Thu, 06 Oct 2011)
New Revision: 35447
Modified:
tags/jbosstools-3.2.1.Final/documentation/guides/JBDS_Release_Notes/en-US/Overview.xml
Log:
updated to remove invalid info - info was meant for JBDS 5 and thus added to those release notes
Modified: tags/jbosstools-3.2.1.Final/documentation/guides/JBDS_Release_Notes/en-US/Overview.xml
===================================================================
--- tags/jbosstools-3.2.1.Final/documentation/guides/JBDS_Release_Notes/en-US/Overview.xml 2011-10-06 23:53:24 UTC (rev 35446)
+++ tags/jbosstools-3.2.1.Final/documentation/guides/JBDS_Release_Notes/en-US/Overview.xml 2011-10-06 23:54:48 UTC (rev 35447)
@@ -74,7 +74,7 @@
</para>
</listitem>
</itemizedlist>
- <important>
+<!-- <important>
<para>
If you are installing on a Linux distribution you must set the following limits in <filename>/etc/security/limits.conf</filename> upon installation completion and before running JBoss Developer Studio:
</para>
@@ -88,7 +88,7 @@
<para>
For further installation instructions see the Getting Started Guide for this release, available at: <ulink url="http://docs.redhat.com/docs/en-US/JBoss_Developer_Studio/index.html">http://docs.redhat.com/docs/en-US/JBoss_Developer_Studio/index.html</ulink>
</para>
- </important>
+ </important> -->
<!-- Old 'new' feature list for JBDS 4.0.0 left as a guide -->
<!-- <itemizedlist>
<listitem>
14 years, 10 months
- 1
- 0
JBoss Tools SVN: r35446 - in trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test: projects/CDIDependentSolderTest and 45 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-10-06 19:53:24 -0400 (Thu, 06 Oct 2011)
New Revision: 35446
Added:
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest30/
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest30/.classpath
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest30/.project
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest30/.settings/
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest30/.settings/org.eclipse.jdt.core.prefs
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest30/bin/
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest30/src/
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest30/src/org/
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest30/src/org/jboss/
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest30/src/org/jboss/defaultbean/
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest30/src/org/jboss/defaultbean/Town2.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/lib/solder-api.jar
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/lib/solder-impl.jar
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/.classpath
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/.project
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/.settings/
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/.settings/org.eclipse.jdt.core.prefs
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/.settings/org.jboss.ide.eclipse.as.core.prefs
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/META-INF/
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/META-INF/beans.xml
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/bin/
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/lib/
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/lib/cdi-api.jar
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/lib/cdi-solder-birds.jar
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/lib/javax.inject.jar
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/lib/seam-solder.jar
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/defaultbean/
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/defaultbean/Big.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/defaultbean/Cozy.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/defaultbean/Home.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/defaultbean/Huge.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/defaultbean/KingsHome.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/defaultbean/MyDefaultHome.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/defaultbean/MyNewHome.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/defaultbean/Palace.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/defaultbean/Small.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/defaultbean/Town.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/exact/
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/exact/FishFactory.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/exact/IFish.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/exact/Salmon.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/exact/Shark.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/fullyqualified/
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/fullyqualified/Cat.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/fullyqualified/Elephant.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/fullyqualified/Mouse.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/fullyqualified/package-info.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/BrokenGenericBean.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/BrokenGenericType.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/MyBean.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/MyBean2.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/MyBean3.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/MyBean4.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/MyBeanInjections.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/MyConfiguration.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/MyConfigurationProducer.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/MyEvent.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/MyExtendedConfiguration.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/MyGenericBean.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/MyGenericBean2.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/MyGenericType.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/Qualifier1.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/Qualifier2.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/Qualifier3.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/Qualifier4.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/ACMEQueue.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/DispatcherPolicy.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/Durable.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/DurableMessageLogger.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/DurableQueueConfiguration.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/DurableQueueConfiguration.notgeneric
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/DurableQueueConfiguration.original
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/DurableQueueConfiguration.vetoed
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/DurableQueueConfiguration.wrongtype
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/MessageDispatcher.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/MessageLogger.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/MessageManager.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/MessageQueue.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/MessageSystemConfiguration.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/MyMessageQueues.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/Payload.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/QueueManager.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic3/
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic3/Configuration.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic3/ConfigurationPointProducer.duplicates
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic3/ConfigurationPointProducer.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic3/ConfigurationPointProducer.original
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic3/GenericAnnotation.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic3/Qualifier1.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic3/Qualifier2.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic4/
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic4/ACMEQueue.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic4/DispatcherPolicy.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic4/Durable.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic4/DurableMessageLogger.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic4/MessageDispatcher.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic4/MessageLogger.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic4/MessageManager.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic4/MessageQueue.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic4/MessageSystemConfiguration.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic4/MyMessageQueues.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic4/Payload.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic4/QueueManager.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/logger/
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/logger/LogAccess.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/logger/MyBundle.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/logger/MyLogger.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/named/
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/named/Dog.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/named/Racoon.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/named/package-info.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/requires/
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/requires/Bear.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/requires/Bee.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/requires/Dragonfly.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/requires/Flower.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/requires/Fly.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/service/
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/service/QueryService.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/service/UserListManager.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/service/UserQuery.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/somevetoed/
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/somevetoed/Lion.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/somevetoed/Lynx.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/unwraps/
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/unwraps/Current.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/unwraps/Permission.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/unwraps/Unwrapped.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/vetoed/
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/vetoed/Tiger.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/vetoed/package-info.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/v30/
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/v30/BeanNamingTest.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/v30/CDISeamSolderCoreAllTests30.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/v30/DefaultBeanTest.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/v30/ExactTest.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/v30/GenericBeanTest.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/v30/GenericBeanValidationTest.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/v30/MessageLoggerTest.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/v30/SeamSolderTest.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/v30/SeamSolderTestSetup.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/v30/ServiceHandlerTest.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/v30/UnwrapsTest.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/v30/VetoTest.java
Removed:
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/lib/seam-solder.jar
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest/.classpath
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/.classpath
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/KingsHome.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/MyDefaultHome.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/exact/FishFactory.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/fullyqualified/Elephant.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/fullyqualified/package-info.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic/BrokenGenericBean.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic/BrokenGenericType.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic/MyGenericBean.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic/MyGenericBean2.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic/MyGenericType.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/ACMEQueue.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/DurableQueueConfiguration.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/DurableQueueConfiguration.notgeneric
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/DurableQueueConfiguration.original
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/DurableQueueConfiguration.vetoed
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/DurableQueueConfiguration.wrongtype
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/MessageDispatcher.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/MessageManager.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/QueueManager.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic3/GenericAnnotation.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/ACMEQueue.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/MessageDispatcher.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/MessageManager.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/QueueManager.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/logger/LogAccess.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/logger/MyBundle.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/logger/MyLogger.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/named/Dog.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/named/package-info.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/requires/Bear.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/requires/Bee.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/requires/Dragonfly.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/requires/Fly.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/service/QueryService.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/somevetoed/Lion.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/unwraps/Unwrapped.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/vetoed/package-info.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/BeanNamingTest.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/CDISeamSolderCoreAllTests.java
Log:
JBIDE-9852
https://issues.jboss.org/browse/JBIDE-9852
Tests for seam solder migrated to 3.1.
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest/.classpath
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest/.classpath 2011-10-06 23:51:32 UTC (rev 35445)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest/.classpath 2011-10-06 23:53:24 UTC (rev 35446)
@@ -4,7 +4,8 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="/CDISolderTest/lib/cdi-api.jar"/>
<classpathentry kind="lib" path="/CDISolderTest/lib/javax.inject.jar"/>
- <classpathentry kind="lib" path="/CDISolderTest/lib/seam-solder.jar"/>
+ <classpathentry kind="lib" path="/CDISolderTest/lib/solder-api.jar"/>
+ <classpathentry kind="lib" path="/CDISolderTest/lib/solder-impl.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/CDISolderTest"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest30/.classpath
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest30/.classpath (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest30/.classpath 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="lib" path="/CDISolderTest30/lib/cdi-api.jar"/>
+ <classpathentry kind="lib" path="/CDISolderTest30/lib/javax.inject.jar"/>
+ <classpathentry kind="lib" path="/CDISolderTest30/lib/seam-solder.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/CDISolderTest30"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest30/.classpath
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest30/.project
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest30/.project (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest30/.project 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>CDIDependentSolderTest30</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.jboss.tools.jst.web.kb.kbbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.jboss.tools.cdi.core.cdibuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.jboss.tools.jst.web.kb.kbnature</nature>
+ <nature>org.jboss.tools.cdi.core.cdinature</nature>
+ </natures>
+</projectDescription>
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest30/.project
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest30/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest30/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest30/.settings/org.eclipse.jdt.core.prefs 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,12 @@
+#Tue Aug 09 10:58:56 PDT 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest30/.settings/org.eclipse.jdt.core.prefs
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest30/src/org/jboss/defaultbean/Town2.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest30/src/org/jboss/defaultbean/Town2.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest30/src/org/jboss/defaultbean/Town2.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,26 @@
+package org.jboss.defaultbean;
+
+import javax.inject.Inject;
+
+public class Town2 {
+
+ @Inject
+ @Small
+ Home small;
+
+ @Inject
+ @Big
+ Home big;
+
+ @Inject
+ @Huge
+ Home huge;
+
+ @Inject
+ @Cozy
+ Home cozy;
+
+ @Inject
+ Home ruins;
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDIDependentSolderTest30/src/org/jboss/defaultbean/Town2.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/.classpath
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/.classpath 2011-10-06 23:51:32 UTC (rev 35445)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/.classpath 2011-10-06 23:53:24 UTC (rev 35446)
@@ -4,7 +4,8 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="lib" path="lib/cdi-api.jar"/>
<classpathentry kind="lib" path="lib/javax.inject.jar"/>
- <classpathentry kind="lib" path="lib/seam-solder.jar"/>
+ <classpathentry kind="lib" path="lib/solder-api.jar"/>
+ <classpathentry kind="lib" path="lib/solder-impl.jar"/>
<classpathentry kind="lib" path="lib/cdi-solder-birds.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Deleted: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/lib/seam-solder.jar
===================================================================
(Binary files differ)
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/lib/solder-api.jar
===================================================================
(Binary files differ)
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/lib/solder-api.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/lib/solder-impl.jar
===================================================================
(Binary files differ)
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/lib/solder-impl.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/KingsHome.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/KingsHome.java 2011-10-06 23:51:32 UTC (rev 35445)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/KingsHome.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -2,7 +2,7 @@
import javax.enterprise.inject.Produces;
-import org.jboss.seam.solder.bean.defaultbean.DefaultBean;
+import org.jboss.solder.bean.defaultbean.DefaultBean;
public class KingsHome implements Home {
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/MyDefaultHome.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/MyDefaultHome.java 2011-10-06 23:51:32 UTC (rev 35445)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/defaultbean/MyDefaultHome.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -2,7 +2,7 @@
import javax.enterprise.inject.Produces;
-import org.jboss.seam.solder.bean.defaultbean.DefaultBean;
+import org.jboss.solder.bean.defaultbean.DefaultBean;
@DefaultBean(Home.class)
@Small
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/exact/FishFactory.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/exact/FishFactory.java 2011-10-06 23:51:32 UTC (rev 35445)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/exact/FishFactory.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -3,7 +3,7 @@
import javax.enterprise.inject.Produces;
import javax.inject.Inject;
-import org.jboss.seam.solder.core.Exact;
+import org.jboss.solder.core.Exact;
public class FishFactory {
@Inject
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/fullyqualified/Elephant.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/fullyqualified/Elephant.java 2011-10-06 23:51:32 UTC (rev 35445)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/fullyqualified/Elephant.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -4,7 +4,7 @@
import javax.inject.Named;
import org.jboss.named.Dog;
-import org.jboss.seam.solder.core.FullyQualified;
+import org.jboss.solder.core.FullyQualified;
@FullyQualified(Dog.class)
public class Elephant {
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/fullyqualified/package-info.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/fullyqualified/package-info.java 2011-10-06 23:51:32 UTC (rev 35445)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/fullyqualified/package-info.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -3,4 +3,4 @@
package org.jboss.fullyqualified;
import javax.inject.Named;
-import org.jboss.seam.solder.core.FullyQualified;
+import org.jboss.solder.core.FullyQualified;
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic/BrokenGenericBean.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic/BrokenGenericBean.java 2011-10-06 23:51:32 UTC (rev 35445)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic/BrokenGenericBean.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -2,8 +2,8 @@
import javax.inject.Inject;
-import org.jboss.seam.solder.bean.generic.Generic;
-import org.jboss.seam.solder.bean.generic.GenericConfiguration;
+import org.jboss.solder.bean.generic.Generic;
+import org.jboss.solder.bean.generic.GenericConfiguration;
@GenericConfiguration(Override.class)
public class BrokenGenericBean {
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic/BrokenGenericType.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic/BrokenGenericType.java 2011-10-06 23:51:32 UTC (rev 35445)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic/BrokenGenericType.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -1,6 +1,6 @@
package org.jboss.generic;
-import org.jboss.seam.solder.bean.generic.GenericType;
+import org.jboss.solder.bean.generic.GenericType;
@GenericType(MyGenericBean.class)
public @interface BrokenGenericType {
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic/MyGenericBean.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic/MyGenericBean.java 2011-10-06 23:51:32 UTC (rev 35445)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic/MyGenericBean.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -3,9 +3,9 @@
import javax.enterprise.inject.Produces;
import javax.inject.Inject;
-import org.jboss.seam.solder.bean.generic.ApplyScope;
-import org.jboss.seam.solder.bean.generic.Generic;
-import org.jboss.seam.solder.bean.generic.GenericConfiguration;
+import org.jboss.solder.bean.generic.ApplyScope;
+import org.jboss.solder.bean.generic.Generic;
+import org.jboss.solder.bean.generic.GenericConfiguration;
@GenericConfiguration(MyGenericType.class)
public class MyGenericBean {
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic/MyGenericBean2.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic/MyGenericBean2.java 2011-10-06 23:51:32 UTC (rev 35445)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic/MyGenericBean2.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -6,9 +6,9 @@
import javax.enterprise.inject.Produces;
import javax.inject.Inject;
-import org.jboss.seam.solder.bean.generic.ApplyScope;
-import org.jboss.seam.solder.bean.generic.Generic;
-import org.jboss.seam.solder.bean.generic.GenericConfiguration;
+import org.jboss.solder.bean.generic.ApplyScope;
+import org.jboss.solder.bean.generic.Generic;
+import org.jboss.solder.bean.generic.GenericConfiguration;
@GenericConfiguration(MyGenericType.class)
public class MyGenericBean2 {
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic/MyGenericType.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic/MyGenericType.java 2011-10-06 23:51:32 UTC (rev 35445)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic/MyGenericType.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -1,6 +1,6 @@
package org.jboss.generic;
-import org.jboss.seam.solder.bean.generic.GenericType;
+import org.jboss.solder.bean.generic.GenericType;
@GenericType(MyConfiguration.class)
public @interface MyGenericType {
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/ACMEQueue.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/ACMEQueue.java 2011-10-06 23:51:32 UTC (rev 35445)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/ACMEQueue.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -2,7 +2,7 @@
import java.lang.annotation.Retention;
-import org.jboss.seam.solder.bean.generic.GenericType;
+import org.jboss.solder.bean.generic.GenericType;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
@Retention(RUNTIME)
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/DurableQueueConfiguration.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/DurableQueueConfiguration.java 2011-10-06 23:51:32 UTC (rev 35445)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/DurableQueueConfiguration.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -2,7 +2,7 @@
import javax.enterprise.context.ConversationScoped;
-import org.jboss.seam.solder.core.Veto;
+import org.jboss.solder.core.Veto;
//@Veto
@Durable
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/DurableQueueConfiguration.notgeneric
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/DurableQueueConfiguration.notgeneric 2011-10-06 23:51:32 UTC (rev 35445)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/DurableQueueConfiguration.notgeneric 2011-10-06 23:53:24 UTC (rev 35446)
@@ -2,7 +2,7 @@
import javax.enterprise.context.ConversationScoped;
-import org.jboss.seam.solder.core.Veto;
+import org.jboss.solder.core.Veto;
//@Veto
@Durable
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/DurableQueueConfiguration.original
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/DurableQueueConfiguration.original 2011-10-06 23:51:32 UTC (rev 35445)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/DurableQueueConfiguration.original 2011-10-06 23:53:24 UTC (rev 35446)
@@ -2,7 +2,7 @@
import javax.enterprise.context.ConversationScoped;
-import org.jboss.seam.solder.core.Veto;
+import org.jboss.solder.core.Veto;
//@Veto
@Durable
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/DurableQueueConfiguration.vetoed
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/DurableQueueConfiguration.vetoed 2011-10-06 23:51:32 UTC (rev 35445)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/DurableQueueConfiguration.vetoed 2011-10-06 23:53:24 UTC (rev 35446)
@@ -2,7 +2,7 @@
import javax.enterprise.context.ConversationScoped;
-import org.jboss.seam.solder.core.Veto;
+import org.jboss.solder.core.Veto;
@Veto
@Durable
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/DurableQueueConfiguration.wrongtype
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/DurableQueueConfiguration.wrongtype 2011-10-06 23:51:32 UTC (rev 35445)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/DurableQueueConfiguration.wrongtype 2011-10-06 23:53:24 UTC (rev 35446)
@@ -2,7 +2,7 @@
import javax.enterprise.context.ConversationScoped;
-import org.jboss.seam.solder.core.Veto;
+import org.jboss.solder.core.Veto;
//@Veto
@Durable
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/MessageDispatcher.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/MessageDispatcher.java 2011-10-06 23:51:32 UTC (rev 35445)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/MessageDispatcher.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -1,6 +1,6 @@
package org.jboss.generic2;
-import org.jboss.seam.solder.messages.Message;
+import org.jboss.solder.messages.Message;
public interface MessageDispatcher {
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/MessageManager.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/MessageManager.java 2011-10-06 23:51:32 UTC (rev 35445)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/MessageManager.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -3,9 +3,9 @@
import javax.enterprise.inject.Produces;
import javax.inject.Inject;
-import org.jboss.seam.solder.bean.generic.ApplyScope;
-import org.jboss.seam.solder.bean.generic.Generic;
-import org.jboss.seam.solder.bean.generic.GenericConfiguration;
+import org.jboss.solder.bean.generic.ApplyScope;
+import org.jboss.solder.bean.generic.Generic;
+import org.jboss.solder.bean.generic.GenericConfiguration;
@GenericConfiguration(ACMEQueue.class)
class MessageManager {
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/QueueManager.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/QueueManager.java 2011-10-06 23:51:32 UTC (rev 35445)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic2/QueueManager.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -4,9 +4,9 @@
import javax.enterprise.inject.Produces;
import javax.inject.Inject;
-import org.jboss.seam.solder.bean.generic.ApplyScope;
-import org.jboss.seam.solder.bean.generic.Generic;
-import org.jboss.seam.solder.bean.generic.GenericConfiguration;
+import org.jboss.solder.bean.generic.ApplyScope;
+import org.jboss.solder.bean.generic.Generic;
+import org.jboss.solder.bean.generic.GenericConfiguration;
import java.io.Serializable;
@GenericConfiguration(ACMEQueue.class)
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic3/GenericAnnotation.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic3/GenericAnnotation.java 2011-10-06 23:51:32 UTC (rev 35445)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic3/GenericAnnotation.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -2,7 +2,7 @@
import java.lang.annotation.Retention;
-import org.jboss.seam.solder.bean.generic.GenericType;
+import org.jboss.solder.bean.generic.GenericType;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
@Retention(RUNTIME)
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/ACMEQueue.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/ACMEQueue.java 2011-10-06 23:51:32 UTC (rev 35445)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/ACMEQueue.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -2,7 +2,7 @@
import java.lang.annotation.Retention;
-import org.jboss.seam.solder.bean.generic.GenericType;
+import org.jboss.solder.bean.generic.GenericType;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
@Retention(RUNTIME)
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/MessageDispatcher.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/MessageDispatcher.java 2011-10-06 23:51:32 UTC (rev 35445)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/MessageDispatcher.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -1,6 +1,6 @@
package org.jboss.generic4;
-import org.jboss.seam.solder.messages.Message;
+import org.jboss.solder.messages.Message;
public interface MessageDispatcher {
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/MessageManager.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/MessageManager.java 2011-10-06 23:51:32 UTC (rev 35445)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/MessageManager.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -3,9 +3,9 @@
import javax.enterprise.inject.Produces;
import javax.inject.Inject;
-import org.jboss.seam.solder.bean.generic.ApplyScope;
-import org.jboss.seam.solder.bean.generic.Generic;
-import org.jboss.seam.solder.bean.generic.GenericConfiguration;
+import org.jboss.solder.bean.generic.ApplyScope;
+import org.jboss.solder.bean.generic.Generic;
+import org.jboss.solder.bean.generic.GenericConfiguration;
@GenericConfiguration(ACMEQueue.class)
class MessageManager {
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/QueueManager.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/QueueManager.java 2011-10-06 23:51:32 UTC (rev 35445)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic4/QueueManager.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -4,9 +4,9 @@
import javax.enterprise.inject.Produces;
import javax.inject.Inject;
-import org.jboss.seam.solder.bean.generic.ApplyScope;
-import org.jboss.seam.solder.bean.generic.Generic;
-import org.jboss.seam.solder.bean.generic.GenericConfiguration;
+import org.jboss.solder.bean.generic.ApplyScope;
+import org.jboss.solder.bean.generic.Generic;
+import org.jboss.solder.bean.generic.GenericConfiguration;
import java.io.Serializable;
@GenericConfiguration(ACMEQueue.class)
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/logger/LogAccess.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/logger/LogAccess.java 2011-10-06 23:51:32 UTC (rev 35445)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/logger/LogAccess.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -2,7 +2,7 @@
import javax.inject.Inject;
-import org.jboss.seam.solder.messages.MessageBundle;
+import org.jboss.solder.messages.MessageBundle;
public class LogAccess {
@Inject MyLogger logger;
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/logger/MyBundle.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/logger/MyBundle.java 2011-10-06 23:51:32 UTC (rev 35445)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/logger/MyBundle.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -1,6 +1,6 @@
package org.jboss.logger;
-import org.jboss.seam.solder.messages.MessageBundle;
+import org.jboss.solder.messages.MessageBundle;
@MessageBundle
public interface MyBundle {
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/logger/MyLogger.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/logger/MyLogger.java 2011-10-06 23:51:32 UTC (rev 35445)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/logger/MyLogger.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -2,7 +2,7 @@
import javax.inject.Named;
-import org.jboss.seam.solder.logging.MessageLogger;
+import org.jboss.solder.logging.MessageLogger;
@MessageLogger
@Named("logger1")
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/named/Dog.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/named/Dog.java 2011-10-06 23:51:32 UTC (rev 35445)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/named/Dog.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -4,7 +4,7 @@
import javax.inject.Named;
import org.jboss.fullyqualified.Elephant;
-import org.jboss.seam.solder.core.FullyQualified;
+import org.jboss.solder.core.FullyQualified;
public class Dog {
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/named/package-info.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/named/package-info.java 2011-10-06 23:51:32 UTC (rev 35445)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/named/package-info.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -2,4 +2,4 @@
package org.jboss.named;
import javax.inject.Named;
-import org.jboss.seam.solder.core.FullyQualified;
+import org.jboss.solder.core.FullyQualified;
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/requires/Bear.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/requires/Bear.java 2011-10-06 23:51:32 UTC (rev 35445)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/requires/Bear.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -1,6 +1,6 @@
package org.jboss.requires;
-import org.jboss.seam.solder.core.Requires;
+import org.jboss.solder.core.Requires;
import javax.inject.Named;
@Requires("org.jboss.requires.Beehive")
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/requires/Bee.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/requires/Bee.java 2011-10-06 23:51:32 UTC (rev 35445)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/requires/Bee.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -2,7 +2,7 @@
import javax.inject.Named;
-import org.jboss.seam.solder.core.Requires;
+import org.jboss.solder.core.Requires;
@Requires({"org.jboss.requires.Beehive", "org.jboss.requires.Flower"})
@Named("bee")
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/requires/Dragonfly.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/requires/Dragonfly.java 2011-10-06 23:51:32 UTC (rev 35445)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/requires/Dragonfly.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -2,7 +2,7 @@
import javax.inject.Named;
-import org.jboss.seam.solder.core.Requires;
+import org.jboss.solder.core.Requires;
@Requires({"org.jboss.requires.Fly", "org.jboss.requires.Flower"})
@Named("dragonfly")
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/requires/Fly.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/requires/Fly.java 2011-10-06 23:51:32 UTC (rev 35445)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/requires/Fly.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -2,7 +2,7 @@
import javax.inject.Named;
-import org.jboss.seam.solder.core.Requires;
+import org.jboss.solder.core.Requires;
@Requires("org.jboss.requires.Flower")
@Named
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/service/QueryService.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/service/QueryService.java 2011-10-06 23:51:32 UTC (rev 35445)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/service/QueryService.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -2,7 +2,7 @@
import java.util.List;
-import org.jboss.seam.solder.serviceHandler.ServiceHandlerType;
+import org.jboss.solder.serviceHandler.ServiceHandlerType;
@ServiceHandlerType(List.class)
public @interface QueryService {
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/somevetoed/Lion.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/somevetoed/Lion.java 2011-10-06 23:51:32 UTC (rev 35445)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/somevetoed/Lion.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -2,7 +2,7 @@
import javax.inject.Named;
-import org.jboss.seam.solder.core.Veto;
+import org.jboss.solder.core.Veto;
@Veto
@Named("lion")
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/unwraps/Unwrapped.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/unwraps/Unwrapped.java 2011-10-06 23:51:32 UTC (rev 35445)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/unwraps/Unwrapped.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -2,7 +2,7 @@
import javax.inject.Inject;
-import org.jboss.seam.solder.unwraps.Unwraps;
+import org.jboss.solder.unwraps.Unwraps;
public class Unwrapped {
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/vetoed/package-info.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/vetoed/package-info.java 2011-10-06 23:51:32 UTC (rev 35445)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/vetoed/package-info.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -1,5 +1,5 @@
@Veto
package org.jboss.vetoed;
-import org.jboss.seam.solder.core.Veto;
+import org.jboss.solder.core.Veto;
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/.classpath
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/.classpath (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/.classpath 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="lib" path="lib/cdi-api.jar"/>
+ <classpathentry kind="lib" path="lib/javax.inject.jar"/>
+ <classpathentry kind="lib" path="lib/seam-solder.jar"/>
+ <classpathentry kind="lib" path="lib/cdi-solder-birds.jar"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/.classpath
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/.project
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/.project (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/.project 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>CDISolderTest30</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.jboss.tools.cdi.core.cdibuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.jboss.tools.jst.web.kb.kbbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.jboss.tools.cdi.core.cdinature</nature>
+ <nature>org.jboss.tools.jst.web.kb.kbnature</nature>
+ </natures>
+</projectDescription>
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/.project
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/.settings/org.eclipse.jdt.core.prefs 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,12 @@
+#Thu Sep 02 19:40:42 MSD 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/.settings/org.eclipse.jdt.core.prefs
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/.settings/org.jboss.ide.eclipse.as.core.prefs
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/.settings/org.jboss.ide.eclipse.as.core.prefs (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/.settings/org.jboss.ide.eclipse.as.core.prefs 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,3 @@
+#Tue Sep 21 16:45:15 MSD 2010
+eclipse.preferences.version=1
+org.jboss.ide.eclipse.as.core.singledeployable.deployableList=
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/.settings/org.jboss.ide.eclipse.as.core.prefs
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/META-INF/beans.xml
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/META-INF/beans.xml (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/META-INF/beans.xml 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<beans xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:drools="urn:java:org.jboss.seam.drools:org.jboss.seam.drools.config"
+ xmlns:plidm="urn:java:org.jboss.seam.security.management.picketlink"
+ xmlns:s="urn:java:ee"
+ xmlns:security="urn:java:org.jboss.seam.security.permission"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation=" http://java.sun.com/xml/ns/javaee http://jboss.org/schema/cdi/beans_1_0.xsd">
+ <drools:RuleResources>
+ <s:replaces/>
+ <security:SecurityRulesConfig/>
+ <drools:resources>
+ <s:value>classpath;security-rules.drl;DRL</s:value>
+ </drools:resources>
+ </drools:RuleResources>
+ <drools:DroolsConfig>
+ <s:modifies/>
+ <security:SecurityRulesConfig/>
+ <drools:ruleResources>
+ <s:Inject/>
+ <security:SecurityRulesConfig/>
+ </drools:ruleResources>
+ </drools:DroolsConfig>
+ <plidm:JpaIdentityStoreConfiguration>
+ <s:replaces/>
+ <plidm:identityClass>org.jboss.seam.example.ticketmonster.model.IdentityObject</plidm:identityClass>
+ <plidm:credentialClass>org.jboss.seam.example.ticketmonster.model.IdentityObjectCredential</plidm:credentialClass>
+ <plidm:relationshipClass>org.jboss.seam.example.ticketmonster.model.IdentityObjectRelationship</plidm:relationshipClass>
+ <plidm:roleTypeClass>org.jboss.seam.example.ticketmonster.model.IdentityRoleName</plidm:roleTypeClass>
+ </plidm:JpaIdentityStoreConfiguration>
+ <decorators>
+ <class>c</class>
+ </decorators>
+ <alternatives>
+ <stereotype>s</stereotype>
+ </alternatives>
+</beans>
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/META-INF/beans.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/lib/cdi-api.jar
===================================================================
(Binary files differ)
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/lib/cdi-api.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/lib/cdi-solder-birds.jar
===================================================================
(Binary files differ)
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/lib/cdi-solder-birds.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/lib/javax.inject.jar
===================================================================
(Binary files differ)
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/lib/javax.inject.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/lib/seam-solder.jar
===================================================================
(Binary files differ)
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/lib/seam-solder.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/defaultbean/Big.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/defaultbean/Big.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/defaultbean/Big.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,21 @@
+package org.jboss.defaultbean;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@Qualifier
+@Target({ TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Documented
+public @interface Big {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/defaultbean/Big.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/defaultbean/Cozy.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/defaultbean/Cozy.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/defaultbean/Cozy.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,21 @@
+package org.jboss.defaultbean;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@Qualifier
+@Target({ TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Documented
+public @interface Cozy {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/defaultbean/Cozy.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/defaultbean/Home.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/defaultbean/Home.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/defaultbean/Home.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,5 @@
+package org.jboss.defaultbean;
+
+public interface Home {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/defaultbean/Home.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/defaultbean/Huge.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/defaultbean/Huge.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/defaultbean/Huge.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,21 @@
+package org.jboss.defaultbean;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@Qualifier
+@Target({ TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Documented
+public @interface Huge {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/defaultbean/Huge.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/defaultbean/KingsHome.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/defaultbean/KingsHome.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/defaultbean/KingsHome.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,24 @@
+package org.jboss.defaultbean;
+
+import javax.enterprise.inject.Produces;
+
+import org.jboss.seam.solder.bean.defaultbean.DefaultBean;
+
+public class KingsHome implements Home {
+
+ @Produces
+ @Big
+ @DefaultBean(Home.class)
+ KingsHome getDefault() {
+ return this;
+ }
+
+ @Produces
+ @Huge
+ @DefaultBean(Home.class)
+ KingsHome getExclusive() {
+ return this;
+ }
+
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/defaultbean/KingsHome.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/defaultbean/MyDefaultHome.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/defaultbean/MyDefaultHome.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/defaultbean/MyDefaultHome.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,18 @@
+package org.jboss.defaultbean;
+
+import javax.enterprise.inject.Produces;
+
+import org.jboss.seam.solder.bean.defaultbean.DefaultBean;
+
+(a)DefaultBean(Home.class)
+@Small
+public class MyDefaultHome implements Home {
+
+ @Produces
+ @Cozy
+ Home cozy = new MyDefaultHome();
+
+ @Produces
+ Home old = new MyDefaultHome();
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/defaultbean/MyDefaultHome.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/defaultbean/MyNewHome.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/defaultbean/MyNewHome.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/defaultbean/MyNewHome.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,6 @@
+package org.jboss.defaultbean;
+
+@Cozy
+public class MyNewHome implements Home {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/defaultbean/MyNewHome.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/defaultbean/Palace.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/defaultbean/Palace.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/defaultbean/Palace.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,6 @@
+package org.jboss.defaultbean;
+
+@Huge
+public class Palace implements Home {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/defaultbean/Palace.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/defaultbean/Small.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/defaultbean/Small.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/defaultbean/Small.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,21 @@
+package org.jboss.defaultbean;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@Qualifier
+@Target({ TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Documented
+public @interface Small {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/defaultbean/Small.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/defaultbean/Town.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/defaultbean/Town.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/defaultbean/Town.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,26 @@
+package org.jboss.defaultbean;
+
+import javax.inject.Inject;
+
+public class Town {
+
+ @Inject
+ @Small
+ Home small;
+
+ @Inject
+ @Big
+ Home big;
+
+ @Inject
+ @Huge
+ Home huge;
+
+ @Inject
+ @Cozy
+ Home cozy;
+
+ @Inject
+ Home ruins;
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/defaultbean/Town.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/exact/FishFactory.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/exact/FishFactory.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/exact/FishFactory.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,21 @@
+package org.jboss.exact;
+
+import javax.enterprise.inject.Produces;
+import javax.inject.Inject;
+
+import org.jboss.seam.solder.core.Exact;
+
+public class FishFactory {
+ @Inject
+ @Exact(Salmon.class)
+ IFish peacefulFish;
+
+ @Inject
+ @Exact(Shark.class)
+ IFish dangerousFish;
+
+ @Produces
+ public IFish getTastyFish((a)Exact(Salmon.class) IFish fish) {
+ return fish;
+ }
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/exact/FishFactory.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/exact/IFish.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/exact/IFish.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/exact/IFish.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,5 @@
+package org.jboss.exact;
+
+public interface IFish {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/exact/IFish.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/exact/Salmon.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/exact/Salmon.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/exact/Salmon.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,5 @@
+package org.jboss.exact;
+
+public class Salmon implements IFish {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/exact/Salmon.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/exact/Shark.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/exact/Shark.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/exact/Shark.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,5 @@
+package org.jboss.exact;
+
+public class Shark implements IFish {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/exact/Shark.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/fullyqualified/Cat.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/fullyqualified/Cat.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/fullyqualified/Cat.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,5 @@
+package org.jboss.fullyqualified;
+
+public class Cat {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/fullyqualified/Cat.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/fullyqualified/Elephant.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/fullyqualified/Elephant.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/fullyqualified/Elephant.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,33 @@
+package org.jboss.fullyqualified;
+
+import javax.enterprise.inject.Produces;
+import javax.inject.Named;
+
+import org.jboss.named.Dog;
+import org.jboss.seam.solder.core.FullyQualified;
+
+(a)FullyQualified(Dog.class)
+public class Elephant {
+
+ @Produces
+ @Named("tail")
+ String getTail() {
+ return "";
+ }
+
+ @Produces
+ @Named("trunk")
+ @FullyQualified(Dog.class)
+ String getTrunk() {
+ return "";
+ }
+
+ @Produces
+ @Named("ear")
+ String ear;
+
+ @Produces
+ @Named("eye")
+ @FullyQualified(Dog.class)
+ String eye;
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/fullyqualified/Elephant.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/fullyqualified/Mouse.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/fullyqualified/Mouse.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/fullyqualified/Mouse.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,7 @@
+package org.jboss.fullyqualified;
+
+import javax.inject.Named;
+
+@Named("rodent")
+public class Mouse {
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/fullyqualified/Mouse.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/fullyqualified/package-info.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/fullyqualified/package-info.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/fullyqualified/package-info.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,6 @@
+@Named
+@FullyQualified
+package org.jboss.fullyqualified;
+
+import javax.inject.Named;
+import org.jboss.seam.solder.core.FullyQualified;
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/fullyqualified/package-info.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/BrokenGenericBean.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/BrokenGenericBean.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/BrokenGenericBean.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,12 @@
+package org.jboss.generic;
+
+import javax.inject.Inject;
+
+import org.jboss.seam.solder.bean.generic.Generic;
+import org.jboss.seam.solder.bean.generic.GenericConfiguration;
+
+(a)GenericConfiguration(Override.class)
+public class BrokenGenericBean {
+ int x;
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/BrokenGenericBean.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/BrokenGenericType.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/BrokenGenericType.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/BrokenGenericType.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,8 @@
+package org.jboss.generic;
+
+import org.jboss.seam.solder.bean.generic.GenericType;
+
+(a)GenericType(MyGenericBean.class)
+public @interface BrokenGenericType {
+ boolean value();
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/BrokenGenericType.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/MyBean.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/MyBean.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/MyBean.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,17 @@
+package org.jboss.generic;
+
+/**
+ * Beans of this type are produced by MyGenericBean.createMyFirstBean()
+ * for every of 5 configurations.
+ * It is injected
+ * - into fields first1, first2, first3, first4, first5 of MyBeanInjections
+ * to check each configuration.
+ * - into generic injection field 'c' of MyGenericField2.
+ * - into generic parameter of injection method setMyBean
+ * - into type parameter of Event typed fields event1 and event2 of MyBeanInjections.
+ */
+public class MyBean {
+
+ public MyBean(String s) {}
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/MyBean.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/MyBean2.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/MyBean2.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/MyBean2.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,14 @@
+package org.jboss.generic;
+
+/**
+ * Beans of this type are produced by MyGenericBean.createMySecondBean()
+ * for every of 5 configurations.
+ * It is injected into fields second1, second2, second3 of MyBeanInjections
+ * to check some configurations.
+ *
+ */
+public class MyBean2 {
+
+ public MyBean2(String s) {}
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/MyBean2.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/MyBean3.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/MyBean3.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/MyBean3.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,15 @@
+package org.jboss.generic;
+
+/**
+ * Beans of this type are produced by MyGenericBean.myThirdBean
+ * for every of 5 configurations.
+ * It is injected
+ * - into fields third1, third2, third3, third4, third5 of MyBeanInjections
+ * to check each configuration.
+ *
+ */
+public class MyBean3 {
+
+ public MyBean3(String s) {}
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/MyBean3.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/MyBean4.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/MyBean4.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/MyBean4.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,15 @@
+package org.jboss.generic;
+
+/**
+ * Beans of this type are produced by MyGenericBean2.myFourthBean
+ * for every of 5 configurations.
+ * It is injected
+ * - into parameters fourth1, fourth2, fourth3, fourth4, fourth5 of
+ * method MyBeanInjections.setAllMyBean4 to check each configuration.
+ *
+ */
+public class MyBean4 {
+
+ public MyBean4(String s) {}
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/MyBean4.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/MyBeanInjections.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/MyBeanInjections.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/MyBeanInjections.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,122 @@
+package org.jboss.generic;
+
+import javax.enterprise.event.Event;
+import javax.enterprise.inject.Any;
+import javax.enterprise.inject.Default;
+import javax.inject.Inject;
+
+public class MyBeanInjections {
+
+ /**
+ * Injected method producer MyGenericBean.createMyFirstBean()
+ * Configuration produced by MyConfigurationProducer.getOneConfig()
+ */
+ @Inject
+ MyBean first1;
+
+ /**
+ * Injected method producer MyGenericBean.createMyFirstBean()
+ * Configuration produced by MyConfigurationProducer.getSecondConfig()
+ */
+ @Inject
+ @Qualifier1
+ MyBean first2;
+
+ /**
+ * Injected method producer MyGenericBean.createMyFirstBean()
+ * Configuration produced by MyExtendedConfiguration
+ */
+ @Inject
+ @Qualifier2
+ MyBean first3;
+
+ /**
+ * Injected method producer MyGenericBean.createMyFirstBean()
+ * Configuration produced by MyConfigurationProducer.fourthConfig
+ */
+ @Inject
+ @Qualifier4("Fourth")
+ MyBean first4;
+
+ /**
+ * Injected method producer MyGenericBean.createMyFirstBean()
+ * Configuration produced by MyConfigurationProducer.fifthConfig
+ */
+ @Inject
+ @Qualifier4("Fifth")
+ MyBean first5;
+
+ @Inject
+ MyBean2 second1;
+
+ @Inject
+ @Qualifier1
+ MyBean2 second2;
+
+ @Inject
+ @Qualifier2
+ MyBean2 second3;
+
+ /**
+ * Injected field producer MyGenericBean.myThirdBean
+ * Configuration produced by MyConfigurationProducer.getOneConfig()
+ */
+ @Inject
+ MyBean3 third1;
+
+ /**
+ * Injected field producer MyGenericBean.myThirdBean
+ * Configuration produced by MyConfigurationProducer.getSecondConfig()
+ */
+ @Inject
+ @Qualifier1
+ MyBean3 third2;
+
+ /**
+ * Injected field producer MyGenericBean.myThirdBean
+ * Configuration produced by MyExtendedConfiguration
+ */
+ @Inject
+ @Qualifier2
+ MyBean3 third3;
+
+ /**
+ * Injected field producer MyGenericBean.myThirdBean
+ * Configuration produced by MyConfigurationProducer.fourthConfig
+ */
+ @Inject
+ @Qualifier4("Fourth")
+ MyBean3 third4;
+
+ /**
+ * Injected field producer MyGenericBean.myThirdBean
+ * Configuration produced by MyConfigurationProducer.fifthConfig
+ */
+ @Inject
+ @Qualifier4("Fifth")
+ MyBean3 third5;
+
+ @Inject
+ void setAllMyBean4(@Default MyBean4 fourth1,
+ @Qualifier1 MyBean4 fourth2,
+ @Qualifier2 MyBean4 fourth3,
+ @Qualifier4("Fourth") MyBean4 fourth4,
+ @Qualifier4("Fifth") MyBean4 fourth5
+ ) {
+
+ }
+
+ @Inject
+ @Any
+ Event<MyBean> event1;
+
+ @Inject
+ @Qualifier1
+ Event<MyBean> event2;
+
+ @Inject
+ @Qualifier2
+ Event<MyBean> event3;
+
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/MyBeanInjections.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/MyConfiguration.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/MyConfiguration.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/MyConfiguration.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,8 @@
+package org.jboss.generic;
+
+public class MyConfiguration {
+ public MyConfiguration(String s) {
+ // TODO Auto-generated constructor stub
+ }
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/MyConfiguration.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/MyConfigurationProducer.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/MyConfigurationProducer.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/MyConfigurationProducer.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,47 @@
+package org.jboss.generic;
+
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.inject.Default;
+import javax.enterprise.inject.Produces;
+
+public class MyConfigurationProducer {
+
+ /**
+ * Configuration created by field producer.
+ */
+ @Produces
+ @MyGenericType("first")
+ @Default
+ MyConfiguration getOneConfig() {
+ return null;
+ }
+
+ /**
+ * Configuration created by method producer with specified scope.
+ */
+ @Produces
+ @MyGenericType("second")
+ @Qualifier1
+ @SessionScoped
+ MyConfiguration getSecondConfig() {
+ return null;
+ }
+
+ /**
+ * Configuration created by field producer; qualifier has value.
+ */
+ @Produces
+ @MyGenericType("fourth")
+ @Qualifier4("Fourth")
+ MyConfiguration fourthConfig = new MyConfiguration("fourth");
+
+ /**
+ * Configuration created by field producer with specified scope; qualifier has value.
+ */
+ @Produces
+ @MyGenericType("fifth")
+ @Qualifier4("Fifth")
+ @SessionScoped
+ MyConfiguration fifthConfig = new MyConfiguration("fifth");
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/MyConfigurationProducer.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/MyEvent.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/MyEvent.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/MyEvent.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,5 @@
+package org.jboss.generic;
+
+public class MyEvent {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/MyEvent.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/MyExtendedConfiguration.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/MyExtendedConfiguration.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/MyExtendedConfiguration.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,12 @@
+package org.jboss.generic;
+
+/**
+ * Configuration created by bean extending config type.
+ */
+@MyGenericType("third")
+@Qualifier2
+public class MyExtendedConfiguration extends MyConfiguration {
+ public MyExtendedConfiguration() {
+ super("");
+ }
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/MyExtendedConfiguration.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/MyGenericBean.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/MyGenericBean.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/MyGenericBean.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,29 @@
+package org.jboss.generic;
+
+import javax.enterprise.inject.Produces;
+import javax.inject.Inject;
+
+import org.jboss.seam.solder.bean.generic.ApplyScope;
+import org.jboss.seam.solder.bean.generic.Generic;
+import org.jboss.seam.solder.bean.generic.GenericConfiguration;
+
+(a)GenericConfiguration(MyGenericType.class)
+public class MyGenericBean {
+ @Inject
+ @Generic
+ MyConfiguration config;
+
+ @Inject
+ MyGenericType type;
+
+ @Produces @ApplyScope
+ MyBean createMyFirstBean() {
+ //use config here
+ return new MyBean("bean1");
+ }
+
+ @Produces @ApplyScope
+ MyBean3 myThirdBean = new MyBean3("bean3");
+
+ //add other producers
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/MyGenericBean.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/MyGenericBean2.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/MyGenericBean2.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/MyGenericBean2.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,47 @@
+package org.jboss.generic;
+
+import javax.enterprise.event.Event;
+import javax.enterprise.event.Observes;
+import javax.enterprise.inject.Default;
+import javax.enterprise.inject.Produces;
+import javax.inject.Inject;
+
+import org.jboss.seam.solder.bean.generic.ApplyScope;
+import org.jboss.seam.solder.bean.generic.Generic;
+import org.jboss.seam.solder.bean.generic.GenericConfiguration;
+
+(a)GenericConfiguration(MyGenericType.class)
+public class MyGenericBean2 {
+ @Inject
+ @Generic
+ MyConfiguration config;
+
+ @Inject
+ @Generic
+ MyBean c;
+
+ @Inject
+ void setMyBean(@Generic MyBean c) {}
+
+ @Inject
+ @Generic
+ MyBean3 c3;
+
+ @Inject
+ MyGenericType type;
+
+ @Produces
+ MyBean2 createMySecondBean() {
+ //use config here
+ return new MyBean2("");
+ }
+
+ @Produces @ApplyScope
+ MyBean4 myFourthBean = new MyBean4("bean4");
+
+ void myObserver(@Observes MyBean bean) {
+
+ }
+
+ //add other producers
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/MyGenericBean2.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/MyGenericType.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/MyGenericType.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/MyGenericType.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,8 @@
+package org.jboss.generic;
+
+import org.jboss.seam.solder.bean.generic.GenericType;
+
+(a)GenericType(MyConfiguration.class)
+public @interface MyGenericType {
+ String value();
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/MyGenericType.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/Qualifier1.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/Qualifier1.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/Qualifier1.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,21 @@
+package org.jboss.generic;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@Qualifier
+@Target({ TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Documented
+public @interface Qualifier1 {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/Qualifier1.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/Qualifier2.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/Qualifier2.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/Qualifier2.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,21 @@
+package org.jboss.generic;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@Qualifier
+@Target({ TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Documented
+public @interface Qualifier2 {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/Qualifier2.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/Qualifier3.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/Qualifier3.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/Qualifier3.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,21 @@
+package org.jboss.generic;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@Qualifier
+@Target({ TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Documented
+public @interface Qualifier3 {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/Qualifier3.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/Qualifier4.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/Qualifier4.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/Qualifier4.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,21 @@
+package org.jboss.generic;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@Qualifier
+@Target({ TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Documented
+public @interface Qualifier4 {
+ String value();
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic/Qualifier4.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/ACMEQueue.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/ACMEQueue.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/ACMEQueue.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,13 @@
+package org.jboss.generic2;
+
+import java.lang.annotation.Retention;
+
+import org.jboss.seam.solder.bean.generic.GenericType;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@Retention(RUNTIME)
+(a)GenericType(MessageSystemConfiguration.class)
+@interface ACMEQueue {
+
+ String value();
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/ACMEQueue.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/DispatcherPolicy.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/DispatcherPolicy.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/DispatcherPolicy.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,7 @@
+package org.jboss.generic2;
+
+public interface DispatcherPolicy {
+
+ void removeDuplicates();
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/DispatcherPolicy.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/Durable.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/Durable.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/Durable.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,21 @@
+package org.jboss.generic2;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@Qualifier
+@Target({ TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Documented
+public @interface Durable {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/Durable.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/DurableMessageLogger.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/DurableMessageLogger.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/DurableMessageLogger.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,23 @@
+package org.jboss.generic2;
+
+import javax.inject.Inject;
+
+public class DurableMessageLogger {
+
+ @Inject
+ @Durable
+ MessageDispatcher dispatcher;
+
+ @Inject
+ @Durable
+ DispatcherPolicy policy;
+
+ /* Tweak the dispatch policy to enable duplicate removal */
+ @Inject
+ void tweakPolicy(@Durable DispatcherPolicy policy) {
+ policy.removeDuplicates();
+ }
+
+ void logMessage(Payload payload) {
+ }
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/DurableMessageLogger.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/DurableQueueConfiguration.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/DurableQueueConfiguration.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/DurableQueueConfiguration.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,17 @@
+package org.jboss.generic2;
+
+import javax.enterprise.context.ConversationScoped;
+
+import org.jboss.seam.solder.core.Veto;
+
+//@Veto
+@Durable
+@ConversationScoped
+@ACMEQueue("durableQueue")
+public class DurableQueueConfiguration extends MessageSystemConfiguration {
+
+ public DurableQueueConfiguration() {
+ super(null);
+ this.durable = true;
+ }
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/DurableQueueConfiguration.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/DurableQueueConfiguration.notgeneric
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/DurableQueueConfiguration.notgeneric (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/DurableQueueConfiguration.notgeneric 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,17 @@
+package org.jboss.generic2;
+
+import javax.enterprise.context.ConversationScoped;
+
+import org.jboss.seam.solder.core.Veto;
+
+//@Veto
+@Durable
+@ConversationScoped
+//@ACMEQueue("durableQueue")
+public class DurableQueueConfiguration extends MessageSystemConfiguration {
+
+ public DurableQueueConfiguration() {
+ super(null);
+ this.durable = true;
+ }
+}
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/DurableQueueConfiguration.original
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/DurableQueueConfiguration.original (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/DurableQueueConfiguration.original 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,17 @@
+package org.jboss.generic2;
+
+import javax.enterprise.context.ConversationScoped;
+
+import org.jboss.seam.solder.core.Veto;
+
+//@Veto
+@Durable
+@ConversationScoped
+@ACMEQueue("durableQueue")
+public class DurableQueueConfiguration extends MessageSystemConfiguration {
+
+ public DurableQueueConfiguration() {
+ super(null);
+ this.durable = true;
+ }
+}
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/DurableQueueConfiguration.vetoed
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/DurableQueueConfiguration.vetoed (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/DurableQueueConfiguration.vetoed 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,17 @@
+package org.jboss.generic2;
+
+import javax.enterprise.context.ConversationScoped;
+
+import org.jboss.seam.solder.core.Veto;
+
+@Veto
+@Durable
+@ConversationScoped
+@ACMEQueue("durableQueue")
+public class DurableQueueConfiguration extends MessageSystemConfiguration {
+
+ public DurableQueueConfiguration() {
+ super(null);
+ this.durable = true;
+ }
+}
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/DurableQueueConfiguration.wrongtype
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/DurableQueueConfiguration.wrongtype (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/DurableQueueConfiguration.wrongtype 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,17 @@
+package org.jboss.generic2;
+
+import javax.enterprise.context.ConversationScoped;
+
+import org.jboss.seam.solder.core.Veto;
+
+//@Veto
+@Durable
+@ConversationScoped
+@ACMEQueue("durableQueue")
+public class DurableQueueConfiguration extends Object {
+
+ public DurableQueueConfiguration() {
+// super(null);
+ this.durable = true;
+ }
+}
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/MessageDispatcher.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/MessageDispatcher.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/MessageDispatcher.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,9 @@
+package org.jboss.generic2;
+
+import org.jboss.seam.solder.messages.Message;
+
+public interface MessageDispatcher {
+
+ void send(Message message);
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/MessageDispatcher.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/MessageLogger.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/MessageLogger.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/MessageLogger.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,19 @@
+package org.jboss.generic2;
+
+import javax.inject.Inject;
+
+public class MessageLogger {
+
+ @Inject
+ MessageDispatcher dispatcher;
+
+ void logMessage(Payload payload) {
+ /* Add metaddata to the message */
+ dispatcher.send(null);
+ }
+
+ @Inject
+ @Durable
+ MessageDispatcher durableDispatcher;
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/MessageLogger.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/MessageManager.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/MessageManager.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/MessageManager.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,27 @@
+package org.jboss.generic2;
+
+import javax.enterprise.inject.Produces;
+import javax.inject.Inject;
+
+import org.jboss.seam.solder.bean.generic.ApplyScope;
+import org.jboss.seam.solder.bean.generic.Generic;
+import org.jboss.seam.solder.bean.generic.GenericConfiguration;
+
+(a)GenericConfiguration(ACMEQueue.class)
+class MessageManager {
+
+ @Inject
+ @Generic
+ MessageQueue queue;
+
+ @Produces
+ @ApplyScope
+ MessageDispatcher messageDispatcherProducer() {
+ return queue.createMessageDispatcher();
+ }
+
+ @Produces
+ DispatcherPolicy getPolicy() {
+ return queue.getDispatcherPolicy();
+ }
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/MessageManager.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/MessageQueue.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/MessageQueue.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/MessageQueue.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,8 @@
+package org.jboss.generic2;
+
+public interface MessageQueue {
+
+ public MessageDispatcher createMessageDispatcher();
+
+ public DispatcherPolicy getDispatcherPolicy();
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/MessageQueue.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/MessageSystemConfiguration.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/MessageSystemConfiguration.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/MessageSystemConfiguration.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,10 @@
+package org.jboss.generic2;
+
+public class MessageSystemConfiguration {
+
+ MessageSystemConfiguration(Object o) {
+
+ }
+
+ protected boolean durable;
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/MessageSystemConfiguration.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/MyMessageQueues.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/MyMessageQueues.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/MyMessageQueues.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,20 @@
+package org.jboss.generic2;
+
+import javax.enterprise.context.ConversationScoped;
+import javax.enterprise.inject.Produces;
+
+public class MyMessageQueues {
+ @Produces
+ @ACMEQueue("defaultQueue")
+ MessageSystemConfiguration defaultQueue = new MessageSystemConfiguration(null);
+
+ @Produces
+ @Durable
+ @ConversationScoped
+ @ACMEQueue("durableQueue")
+ MessageSystemConfiguration producerDefaultQueue() {
+ MessageSystemConfiguration config = new MessageSystemConfiguration(null);
+// config.setDurable(true);
+ return config;
+ }
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/MyMessageQueues.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/Payload.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/Payload.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/Payload.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,5 @@
+package org.jboss.generic2;
+
+public class Payload {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/Payload.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/QueueManager.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/QueueManager.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/QueueManager.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,38 @@
+package org.jboss.generic2;
+
+import javax.annotation.PostConstruct;
+import javax.enterprise.inject.Produces;
+import javax.inject.Inject;
+
+import org.jboss.seam.solder.bean.generic.ApplyScope;
+import org.jboss.seam.solder.bean.generic.Generic;
+import org.jboss.seam.solder.bean.generic.GenericConfiguration;
+import java.io.Serializable;
+
+(a)GenericConfiguration(ACMEQueue.class)
+@ApplyScope
+public class QueueManager implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @Inject
+ @Generic
+ MessageSystemConfiguration systemConfig;
+
+ @Inject
+ ACMEQueue config;
+
+// MessageQueueFactory factory;
+
+ @PostConstruct
+ void init() {
+// factory = systemConfig.createMessageQueueFactory();
+ }
+
+ @Produces
+ @ApplyScope
+ public MessageQueue messageQueueProducer() {
+// return factory.createMessageQueue(config.name());
+ return null;
+ }
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic2/QueueManager.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic3/Configuration.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic3/Configuration.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic3/Configuration.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,5 @@
+package org.jboss.generic3;
+
+public class Configuration {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic3/Configuration.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic3/ConfigurationPointProducer.duplicates
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic3/ConfigurationPointProducer.duplicates (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic3/ConfigurationPointProducer.duplicates 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,27 @@
+package org.jboss.generic3;
+
+import javax.enterprise.inject.Any;
+import javax.enterprise.inject.Produces;
+
+/*
+ * Generic configuration points point1 and point2 are not duplicate.
+ * This test checks algorithm comparing qualifiers.
+ * (First, incorrect version considered point1 a duplicate of point2,
+ * if qualifiers of point1 made a subset of qualifiers of point2.)
+ *
+ */
+public class ConfigurationPointProducer {
+
+ @Produces
+ @GenericAnnotation("a")
+ @Qualifier1
+ @Qualifier2
+ Configuration point1;
+
+ @Produces
+ @GenericAnnotation("b")
+ @Qualifier1
+ @Qualifier2
+ Configuration point2;
+
+}
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic3/ConfigurationPointProducer.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic3/ConfigurationPointProducer.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic3/ConfigurationPointProducer.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,26 @@
+package org.jboss.generic3;
+
+import javax.enterprise.inject.Any;
+import javax.enterprise.inject.Produces;
+
+/*
+ * Generic configuration points point1 and point2 are not duplicate.
+ * This test checks algorithm comparing qualifiers.
+ * (First, incorrect version considered point1 a duplicate of point2,
+ * if qualifiers of point1 made a subset of qualifiers of point2.)
+ *
+ */
+public class ConfigurationPointProducer {
+
+ @Produces
+ @GenericAnnotation("a")
+ @Qualifier1
+ Configuration point1;
+
+ @Produces
+ @GenericAnnotation("b")
+ @Qualifier1
+ @Qualifier2
+ Configuration point2;
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic3/ConfigurationPointProducer.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic3/ConfigurationPointProducer.original
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic3/ConfigurationPointProducer.original (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic3/ConfigurationPointProducer.original 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,26 @@
+package org.jboss.generic3;
+
+import javax.enterprise.inject.Any;
+import javax.enterprise.inject.Produces;
+
+/*
+ * Generic configuration points point1 and point2 are not duplicate.
+ * This test checks algorithm comparing qualifiers.
+ * (First, incorrect version considered point1 a duplicate of point2,
+ * if qualifiers of point1 made a subset of qualifiers of point2.)
+ *
+ */
+public class ConfigurationPointProducer {
+
+ @Produces
+ @GenericAnnotation("a")
+ @Qualifier1
+ Configuration point1;
+
+ @Produces
+ @GenericAnnotation("b")
+ @Qualifier1
+ @Qualifier2
+ Configuration point2;
+
+}
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic3/GenericAnnotation.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic3/GenericAnnotation.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic3/GenericAnnotation.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,12 @@
+package org.jboss.generic3;
+
+import java.lang.annotation.Retention;
+
+import org.jboss.seam.solder.bean.generic.GenericType;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@Retention(RUNTIME)
+(a)GenericType(Configuration.class)
+@interface GenericAnnotation {
+ String value();
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic3/GenericAnnotation.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic3/Qualifier1.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic3/Qualifier1.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic3/Qualifier1.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,21 @@
+package org.jboss.generic3;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@Qualifier
+@Target({ TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Documented
+public @interface Qualifier1 {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic3/Qualifier1.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic3/Qualifier2.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic3/Qualifier2.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic3/Qualifier2.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,21 @@
+package org.jboss.generic3;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@Qualifier
+@Target({ TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Documented
+public @interface Qualifier2 {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic3/Qualifier2.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic4/ACMEQueue.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic4/ACMEQueue.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic4/ACMEQueue.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,13 @@
+package org.jboss.generic4;
+
+import java.lang.annotation.Retention;
+
+import org.jboss.seam.solder.bean.generic.GenericType;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@Retention(RUNTIME)
+(a)GenericType(MessageSystemConfiguration.class)
+@interface ACMEQueue {
+
+ String value();
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic4/ACMEQueue.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic4/DispatcherPolicy.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic4/DispatcherPolicy.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic4/DispatcherPolicy.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,7 @@
+package org.jboss.generic4;
+
+public interface DispatcherPolicy {
+
+ void removeDuplicates();
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic4/DispatcherPolicy.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic4/Durable.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic4/Durable.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic4/Durable.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,21 @@
+package org.jboss.generic4;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@Qualifier
+@Target({ TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Documented
+public @interface Durable {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic4/Durable.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic4/DurableMessageLogger.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic4/DurableMessageLogger.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic4/DurableMessageLogger.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,23 @@
+package org.jboss.generic4;
+
+import javax.inject.Inject;
+
+public class DurableMessageLogger {
+
+ @Inject
+ @Durable
+ MessageDispatcher dispatcher;
+
+ @Inject
+ @Durable
+ DispatcherPolicy policy;
+
+ /* Tweak the dispatch policy to enable duplicate removal */
+ @Inject
+ void tweakPolicy(@Durable DispatcherPolicy policy) {
+ policy.removeDuplicates();
+ }
+
+ void logMessage(Payload payload) {
+ }
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic4/DurableMessageLogger.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic4/MessageDispatcher.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic4/MessageDispatcher.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic4/MessageDispatcher.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,9 @@
+package org.jboss.generic4;
+
+import org.jboss.seam.solder.messages.Message;
+
+public interface MessageDispatcher {
+
+ void send(Message message);
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic4/MessageDispatcher.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic4/MessageLogger.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic4/MessageLogger.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic4/MessageLogger.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,19 @@
+package org.jboss.generic4;
+
+import javax.inject.Inject;
+
+public class MessageLogger {
+
+ @Inject
+ MessageDispatcher dispatcher;
+
+ void logMessage(Payload payload) {
+ /* Add metaddata to the message */
+ dispatcher.send(null);
+ }
+
+ @Inject
+ @Durable
+ MessageDispatcher durableDispatcher;
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic4/MessageLogger.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic4/MessageManager.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic4/MessageManager.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic4/MessageManager.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,27 @@
+package org.jboss.generic4;
+
+import javax.enterprise.inject.Produces;
+import javax.inject.Inject;
+
+import org.jboss.seam.solder.bean.generic.ApplyScope;
+import org.jboss.seam.solder.bean.generic.Generic;
+import org.jboss.seam.solder.bean.generic.GenericConfiguration;
+
+(a)GenericConfiguration(ACMEQueue.class)
+class MessageManager {
+
+ @Inject
+ @Generic
+ MessageQueue queue;
+
+ @Produces
+ @ApplyScope
+ MessageDispatcher messageDispatcherProducer() {
+ return queue.createMessageDispatcher();
+ }
+
+ @Produces
+ DispatcherPolicy getPolicy() {
+ return queue.getDispatcherPolicy();
+ }
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic4/MessageManager.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic4/MessageQueue.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic4/MessageQueue.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic4/MessageQueue.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,8 @@
+package org.jboss.generic4;
+
+public interface MessageQueue {
+
+ public MessageDispatcher createMessageDispatcher();
+
+ public DispatcherPolicy getDispatcherPolicy();
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic4/MessageQueue.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic4/MessageSystemConfiguration.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic4/MessageSystemConfiguration.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic4/MessageSystemConfiguration.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,10 @@
+package org.jboss.generic4;
+
+public class MessageSystemConfiguration {
+
+ MessageSystemConfiguration(Object o) {
+
+ }
+
+ protected boolean durable;
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic4/MessageSystemConfiguration.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic4/MyMessageQueues.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic4/MyMessageQueues.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic4/MyMessageQueues.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,23 @@
+package org.jboss.generic4;
+
+import javax.enterprise.context.ConversationScoped;
+import javax.enterprise.inject.Produces;
+import javax.inject.Named;
+
+public class MyMessageQueues {
+ @Produces
+ @ACMEQueue("defaultQueue")
+ @Named("aaa")
+ MessageSystemConfiguration defaultQueue = new MessageSystemConfiguration(null);
+
+ @Produces
+ @Durable
+ @ConversationScoped
+ @ACMEQueue("durableQueue")
+ @Named("aaa")
+ MessageSystemConfiguration producerDefaultQueue() {
+ MessageSystemConfiguration config = new MessageSystemConfiguration(null);
+// config.setDurable(true);
+ return config;
+ }
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic4/MyMessageQueues.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic4/Payload.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic4/Payload.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic4/Payload.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,5 @@
+package org.jboss.generic4;
+
+public class Payload {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic4/Payload.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic4/QueueManager.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic4/QueueManager.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic4/QueueManager.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,38 @@
+package org.jboss.generic4;
+
+import javax.annotation.PostConstruct;
+import javax.enterprise.inject.Produces;
+import javax.inject.Inject;
+
+import org.jboss.seam.solder.bean.generic.ApplyScope;
+import org.jboss.seam.solder.bean.generic.Generic;
+import org.jboss.seam.solder.bean.generic.GenericConfiguration;
+import java.io.Serializable;
+
+(a)GenericConfiguration(ACMEQueue.class)
+@ApplyScope
+public class QueueManager implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @Inject
+ @Generic
+ MessageSystemConfiguration systemConfig;
+
+ @Inject
+ ACMEQueue config;
+
+// MessageQueueFactory factory;
+
+ @PostConstruct
+ void init() {
+// factory = systemConfig.createMessageQueueFactory();
+ }
+
+ @Produces
+ @ApplyScope
+ public MessageQueue messageQueueProducer() {
+// return factory.createMessageQueue(config.name());
+ return null;
+ }
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/generic4/QueueManager.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/logger/LogAccess.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/logger/LogAccess.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/logger/LogAccess.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,13 @@
+package org.jboss.logger;
+
+import javax.inject.Inject;
+
+import org.jboss.seam.solder.messages.MessageBundle;
+
+public class LogAccess {
+ @Inject MyLogger logger;
+
+ @Inject @MessageBundle MyBundle bundle;
+
+ String s = "#{logger1.message}";
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/logger/LogAccess.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/logger/MyBundle.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/logger/MyBundle.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/logger/MyBundle.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,8 @@
+package org.jboss.logger;
+
+import org.jboss.seam.solder.messages.MessageBundle;
+
+@MessageBundle
+public interface MyBundle {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/logger/MyBundle.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/logger/MyLogger.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/logger/MyLogger.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/logger/MyLogger.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,11 @@
+package org.jboss.logger;
+
+import javax.inject.Named;
+
+import org.jboss.seam.solder.logging.MessageLogger;
+
+@MessageLogger
+@Named("logger1")
+public interface MyLogger {
+ public String getMessage();
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/logger/MyLogger.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/named/Dog.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/named/Dog.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/named/Dog.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,32 @@
+package org.jboss.named;
+
+import javax.enterprise.inject.Produces;
+import javax.inject.Named;
+
+import org.jboss.fullyqualified.Elephant;
+import org.jboss.seam.solder.core.FullyQualified;
+
+public class Dog {
+
+ @Produces
+ @Named("hair")
+ String getHair() {
+ return "";
+ }
+
+ @Produces
+ @Named("nose")
+ @FullyQualified(Elephant.class)
+ String getNose() {
+ return "";
+ }
+
+ @Produces
+ @Named("jaws")
+ String jaws;
+
+ @Produces
+ @Named("black-eye")
+ @FullyQualified(Elephant.class)
+ String eye;
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/named/Dog.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/named/Racoon.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/named/Racoon.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/named/Racoon.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,8 @@
+package org.jboss.named;
+
+import javax.inject.Named;
+
+@Named("little")
+public class Racoon {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/named/Racoon.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/named/package-info.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/named/package-info.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/named/package-info.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,5 @@
+@Named
+package org.jboss.named;
+
+import javax.inject.Named;
+import org.jboss.seam.solder.core.FullyQualified;
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/named/package-info.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/requires/Bear.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/requires/Bear.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/requires/Bear.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,10 @@
+package org.jboss.requires;
+
+import org.jboss.seam.solder.core.Requires;
+import javax.inject.Named;
+
+@Requires("org.jboss.requires.Beehive")
+@Named("bear")
+public class Bear {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/requires/Bear.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/requires/Bee.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/requires/Bee.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/requires/Bee.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,11 @@
+package org.jboss.requires;
+
+import javax.inject.Named;
+
+import org.jboss.seam.solder.core.Requires;
+
+@Requires({"org.jboss.requires.Beehive", "org.jboss.requires.Flower"})
+@Named("bee")
+public class Bee {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/requires/Bee.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/requires/Dragonfly.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/requires/Dragonfly.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/requires/Dragonfly.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,11 @@
+package org.jboss.requires;
+
+import javax.inject.Named;
+
+import org.jboss.seam.solder.core.Requires;
+
+@Requires({"org.jboss.requires.Fly", "org.jboss.requires.Flower"})
+@Named("dragonfly")
+public class Dragonfly {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/requires/Dragonfly.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/requires/Flower.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/requires/Flower.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/requires/Flower.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,5 @@
+package org.jboss.requires;
+
+public class Flower {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/requires/Flower.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/requires/Fly.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/requires/Fly.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/requires/Fly.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,11 @@
+package org.jboss.requires;
+
+import javax.inject.Named;
+
+import org.jboss.seam.solder.core.Requires;
+
+@Requires("org.jboss.requires.Flower")
+@Named
+public class Fly {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/requires/Fly.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/service/QueryService.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/service/QueryService.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/service/QueryService.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,10 @@
+package org.jboss.service;
+
+import java.util.List;
+
+import org.jboss.seam.solder.serviceHandler.ServiceHandlerType;
+
+(a)ServiceHandlerType(List.class)
+public @interface QueryService {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/service/QueryService.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/service/UserListManager.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/service/UserListManager.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/service/UserListManager.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,7 @@
+package org.jboss.service;
+
+import javax.inject.Inject;
+
+public class UserListManager {
+ @Inject UserQuery userQuery;
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/service/UserListManager.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/service/UserQuery.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/service/UserQuery.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/service/UserQuery.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,6 @@
+package org.jboss.service;
+
+@QueryService
+public interface UserQuery {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/service/UserQuery.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/somevetoed/Lion.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/somevetoed/Lion.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/somevetoed/Lion.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,11 @@
+package org.jboss.somevetoed;
+
+import javax.inject.Named;
+
+import org.jboss.seam.solder.core.Veto;
+
+@Veto
+@Named("lion")
+public class Lion {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/somevetoed/Lion.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/somevetoed/Lynx.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/somevetoed/Lynx.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/somevetoed/Lynx.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,8 @@
+package org.jboss.somevetoed;
+
+import javax.inject.Named;
+
+@Named
+public class Lynx {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/somevetoed/Lynx.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/unwraps/Current.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/unwraps/Current.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/unwraps/Current.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,21 @@
+package org.jboss.unwraps;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@Qualifier
+@Target({ TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Documented
+public @interface Current {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/unwraps/Current.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/unwraps/Permission.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/unwraps/Permission.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/unwraps/Permission.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,5 @@
+package org.jboss.unwraps;
+
+public class Permission {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/unwraps/Permission.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/unwraps/Unwrapped.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/unwraps/Unwrapped.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/unwraps/Unwrapped.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,17 @@
+package org.jboss.unwraps;
+
+import javax.inject.Inject;
+
+import org.jboss.seam.solder.unwraps.Unwraps;
+
+public class Unwrapped {
+
+ @Unwraps @Current
+ Permission getPermission() {
+ return new Permission();
+ }
+
+ @Inject @Current
+ Permission permission;
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/unwraps/Unwrapped.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/vetoed/Tiger.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/vetoed/Tiger.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/vetoed/Tiger.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,8 @@
+package org.jboss.vetoed;
+
+import javax.inject.Named;
+
+@Named("tiger")
+public class Tiger {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/vetoed/Tiger.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/vetoed/package-info.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/vetoed/package-info.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/vetoed/package-info.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,5 @@
+@Veto
+package org.jboss.vetoed;
+
+import org.jboss.seam.solder.core.Veto;
+
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest30/src/org/jboss/vetoed/package-info.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/BeanNamingTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/BeanNamingTest.java 2011-10-06 23:51:32 UTC (rev 35445)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/BeanNamingTest.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -137,7 +137,8 @@
return null;
}
- public void testAnnotatedPackagesInJars() {
+ //FIX_ME
+ public void _testAnnotatedPackagesInJars() {
ICDIProject cdi = CDICorePlugin.getCDIProject(getTestProject(), true);
// Package @FullyQualified and @Named
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/CDISeamSolderCoreAllTests.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/CDISeamSolderCoreAllTests.java 2011-10-06 23:51:32 UTC (rev 35445)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/CDISeamSolderCoreAllTests.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -15,6 +15,7 @@
import org.eclipse.jdt.internal.core.JavaModelManager;
import org.eclipse.wst.validation.ValidationFramework;
+import org.jboss.tools.cdi.seam.solder.core.test.v30.CDISeamSolderCoreAllTests30;
import org.jboss.tools.common.base.test.validation.ValidationExceptionTest;
/**
* @author Viacheslav Kabanovich
@@ -30,20 +31,27 @@
ValidationExceptionTest.initLogger();
TestSuite suiteAll = new TestSuite("CDI Solder Core Tests");
- SeamSolderTestSetup suite = new SeamSolderTestSetup(suiteAll);
- suiteAll.addTestSuite(GenericBeanTest.class);
- suiteAll.addTestSuite(GenericBeanValidationTest.class);
- suiteAll.addTestSuite(BeanNamingTest.class);
- suiteAll.addTestSuite(VetoTest.class);
- suiteAll.addTestSuite(ExactTest.class);
- suiteAll.addTestSuite(MessageLoggerTest.class);
- suiteAll.addTestSuite(ServiceHandlerTest.class);
- suiteAll.addTestSuite(DefaultBeanTest.class);
- suiteAll.addTestSuite(UnwrapsTest.class);
+ suiteAll.addTest(CDISeamSolderCoreAllTests30.suite());
+ TestSuite suite31 = new TestSuite("CDI Solder Core 3.1 Tests");
+
+ SeamSolderTestSetup suite = new SeamSolderTestSetup(suite31);
+
+ suite31.addTestSuite(GenericBeanTest.class);
+ suite31.addTestSuite(GenericBeanValidationTest.class);
+ suite31.addTestSuite(BeanNamingTest.class);
+ suite31.addTestSuite(VetoTest.class);
+ suite31.addTestSuite(ExactTest.class);
+ suite31.addTestSuite(MessageLoggerTest.class);
+ suite31.addTestSuite(ServiceHandlerTest.class);
+ suite31.addTestSuite(DefaultBeanTest.class);
+ suite31.addTestSuite(UnwrapsTest.class);
+
+ suiteAll.addTest(suite31);
+
suiteAll.addTestSuite(ValidationExceptionTest.class); // This test should be added last!
-
+
return suite;
}
}
\ No newline at end of file
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/v30/BeanNamingTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/v30/BeanNamingTest.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/v30/BeanNamingTest.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,172 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.cdi.seam.solder.core.test.v30;
+
+import java.io.IOException;
+import java.util.Set;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.jdt.core.IMember;
+import org.eclipse.jdt.core.IType;
+import org.jboss.tools.cdi.core.CDICorePlugin;
+import org.jboss.tools.cdi.core.IBean;
+import org.jboss.tools.cdi.core.IBeanMember;
+import org.jboss.tools.cdi.core.ICDIProject;
+import org.jboss.tools.cdi.core.IClassBean;
+import org.jboss.tools.cdi.core.IProducerMethod;
+
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+public class BeanNamingTest extends SeamSolderTest {
+
+ public BeanNamingTest() {}
+
+ public void testNamedPackage() throws CoreException, IOException {
+ ICDIProject cdi = CDICorePlugin.getCDIProject(getTestProject(), true);
+
+ //1. package @Named; class not annotated
+ Set<IBean> bs = cdi.getBeans(new Path("/CDISolderTest30/src/org/jboss/named/Dog.java"));
+ assertFalse(bs.isEmpty());
+ IBean b = findBeanByMemberName(bs, "Dog");
+ assertNotNull(b);
+ assertEquals("dog", b.getName());
+
+ //2. package@Named; class @Named("little")
+ bs = cdi.getBeans(new Path("/CDISolderTest30/src/org/jboss/named/Racoon.java"));
+ assertFalse(bs.isEmpty());
+ b = bs.iterator().next();
+ assertEquals("little", b.getName());
+ }
+
+ public void testFullyQualifiedPackage() throws CoreException {
+ ICDIProject cdi = CDICorePlugin.getCDIProject(getTestProject(), true);
+
+ //1. package @FullyQualified and @Named; class not annotated
+ Set<IBean> bs = cdi.getBeans(new Path("/CDISolderTest30/src/org/jboss/fullyqualified/Cat.java"));
+ assertFalse(bs.isEmpty());
+ IBean b = bs.iterator().next();
+ assertEquals("org.jboss.fullyqualified.cat", b.getName());
+
+ //2. package @FullyQualified and @Named; class @Named("rodent")
+ bs = cdi.getBeans(new Path("/CDISolderTest30/src/org/jboss/fullyqualified/Mouse.java"));
+ assertFalse(bs.isEmpty());
+ b = bs.iterator().next();
+ assertEquals("org.jboss.fullyqualified.rodent", b.getName());
+
+ //3. package @FullyQualified and @Named; class @FullyQualified(Dog.class)
+ bs = cdi.getBeans(new Path("/CDISolderTest30/src/org/jboss/fullyqualified/Elephant.java"));
+ assertFalse(bs.isEmpty());
+ b = findBeanByMemberName(bs, "Elephant");
+ assertNotNull(b);
+ assertEquals("org.jboss.named.elephant", b.getName());
+ }
+
+ public void testFullyQualifiedProducers() {
+ ICDIProject cdi = CDICorePlugin.getCDIProject(getTestProject(), true);
+ //1. package @FullyQualified
+ Set<IBean> bs = cdi.getBeans(new Path("/CDISolderTest30/src/org/jboss/fullyqualified/Elephant.java"));
+
+ //1.1 producer method @Named
+ IBean b = findBeanByMemberName(bs, "getTail");
+ assertNotNull(b);
+ assertEquals("org.jboss.fullyqualified.tail", b.getName());
+
+ //1.2 producer method @Named and @FullyQualified(Dog.class)
+ b = findBeanByMemberName(bs, "getTrunk");
+ assertNotNull(b);
+ assertEquals("org.jboss.named.trunk", b.getName());
+
+ //1.3 producer field @Named
+ b = findBeanByMemberName(bs, "ear");
+ assertNotNull(b);
+ assertEquals("org.jboss.fullyqualified.ear", b.getName());
+
+ //1.4 producer field @Named and @FullyQualified(Dog.class)
+ b = findBeanByMemberName(bs, "eye");
+ assertNotNull(b);
+ assertEquals("org.jboss.named.eye", b.getName());
+
+ //2. package has not @FullyQualified
+ bs = cdi.getBeans(new Path("/CDISolderTest30/src/org/jboss/named/Dog.java"));
+
+ //2.1 producer method @Named
+ b = findBeanByMemberName(bs, "getHair");
+ assertNotNull(b);
+ assertEquals("hair", b.getName());
+
+ //2.2 producer method @Named and @FullyQualified(Elephant.class)
+ b = findBeanByMemberName(bs, "getNose");
+ assertNotNull(b);
+ assertEquals("org.jboss.fullyqualified.nose", b.getName());
+
+ //2.3 producer field @Named
+ b = findBeanByMemberName(bs, "jaws");
+ assertNotNull(b);
+ assertEquals("jaws", b.getName());
+
+ //2.4 producer field @Named and @FullyQualified(Elephant.class)
+ b = findBeanByMemberName(bs, "eye");
+ assertNotNull(b);
+ assertEquals("org.jboss.fullyqualified.black-eye", b.getName());
+ }
+
+ private IBean findBeanByMemberName(Set<IBean> bs, String memberName) {
+ for (IBean b: bs) {
+ if(b instanceof IClassBean) {
+ if(memberName.equals(((IClassBean)b).getBeanClass().getElementName())) {
+ return b;
+ }
+ } else if(b instanceof IBeanMember) {
+ if(memberName.equals(((IBeanMember)b).getSourceMember().getElementName())) {
+ return b;
+ }
+ }
+ }
+ return null;
+ }
+
+ public void testAnnotatedPackagesInJars() {
+ ICDIProject cdi = CDICorePlugin.getCDIProject(getTestProject(), true);
+
+ // Package @FullyQualified and @Named
+
+ // 1. Class @Named("bird-of-prey")
+ Set<IBean> bs = cdi.getBeans("org.jboss.birds.bird-of-prey", false);
+ assertEquals(1, bs.size());
+ IBean b = bs.iterator().next();
+ assertTrue(b instanceof IClassBean);
+ IClassBean cb = (IClassBean)b;
+ IType t = cb.getBeanClass();
+ assertEquals("org.jboss.birds.Eagle", t.getFullyQualifiedName());
+
+ // 2. Class not annotated
+ bs = cdi.getBeans("org.jboss.birds.nightingale", false);
+ assertEquals(1, bs.size());
+ b = bs.iterator().next();
+ assertTrue(b instanceof IClassBean);
+ cb = (IClassBean)b;
+ t = cb.getBeanClass();
+ assertEquals("org.jboss.birds.Nightingale", t.getFullyQualifiedName());
+
+ // 3. Producer method @Named
+ bs = cdi.getBeans("org.jboss.birds.song", false);
+ assertEquals(1, bs.size());
+ b = bs.iterator().next();
+ assertTrue(b instanceof IProducerMethod);
+ IProducerMethod mb = (IProducerMethod)b;
+ IMember m = mb.getSourceMember();
+ assertEquals("getSong", m.getElementName());
+ }
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/v30/BeanNamingTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/v30/CDISeamSolderCoreAllTests30.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/v30/CDISeamSolderCoreAllTests30.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/v30/CDISeamSolderCoreAllTests30.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.cdi.seam.solder.core.test.v30;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+/**
+ * @author Viacheslav Kabanovich
+ */
+public class CDISeamSolderCoreAllTests30 {
+
+ public static Test suite() {
+ TestSuite suiteAll = new TestSuite("CDI Solder Core 3.0 Tests");
+ SeamSolderTestSetup suite = new SeamSolderTestSetup(suiteAll);
+
+ suiteAll.addTestSuite(GenericBeanTest.class);
+ suiteAll.addTestSuite(GenericBeanValidationTest.class);
+ suiteAll.addTestSuite(BeanNamingTest.class);
+ suiteAll.addTestSuite(VetoTest.class);
+ suiteAll.addTestSuite(ExactTest.class);
+ suiteAll.addTestSuite(MessageLoggerTest.class);
+ suiteAll.addTestSuite(ServiceHandlerTest.class);
+ suiteAll.addTestSuite(DefaultBeanTest.class);
+ suiteAll.addTestSuite(UnwrapsTest.class);
+
+ return suite;
+ }
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/v30/CDISeamSolderCoreAllTests30.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/v30/DefaultBeanTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/v30/DefaultBeanTest.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/v30/DefaultBeanTest.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,150 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.cdi.seam.solder.core.test.v30;
+
+import java.util.Iterator;
+import java.util.Set;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jdt.core.IField;
+import org.eclipse.jdt.core.IMethod;
+import org.eclipse.jdt.core.IType;
+import org.jboss.tools.cdi.core.CDICorePlugin;
+import org.jboss.tools.cdi.core.IBean;
+import org.jboss.tools.cdi.core.ICDIProject;
+import org.jboss.tools.cdi.core.IClassBean;
+import org.jboss.tools.cdi.core.IInjectionPointField;
+import org.jboss.tools.cdi.core.IProducerField;
+import org.jboss.tools.cdi.core.IProducerMethod;
+
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+public class DefaultBeanTest extends SeamSolderTest {
+
+ public DefaultBeanTest() {}
+
+ public void testDefaultBeanTest() throws CoreException {
+ ICDIProject cdi = CDICorePlugin.getCDIProject(getTestProject(), true);
+ doTestDefaultBeanInDependentProject(cdi, "src/org/jboss/defaultbean/Town.java");
+ }
+
+ public void testDefaultBeanInDependentProject() throws CoreException {
+ ICDIProject dependent = getDependentCDIProject();
+ doTestDefaultBeanInDependentProject(dependent, "src/org/jboss/defaultbean/Town2.java");
+ }
+
+ /**
+ * Checks default bean injection resolution.
+ * If dependent == cdi, executes check of one project, otherwise looks for beans in
+ * dependent project.
+ *
+ * @param cdi - project where injection points and beans are defined
+ * @param dependent - dependent project, in which beans are looked for; can be equal to cdi
+ * @throws CoreException
+ */
+ public void doTestDefaultBeanInDependentProject(ICDIProject cdi, String javaPath) throws CoreException {
+ // 1. For injection point with qualifier @Small, the only eligible bean is
+ // default class bean with qualifier @Small
+ IInjectionPointField injection = getInjectionPointField(cdi, javaPath, "small");
+
+ Set<IBean> bs = cdi.getBeans(false, injection);
+ assertEquals(1, bs.size());
+ IBean b = bs.iterator().next();
+ assertTrue(b instanceof IClassBean);
+ IType t = b.getBeanClass();
+ assertNotNull(t);
+ assertEquals("org.jboss.defaultbean.MyDefaultHome", t.getFullyQualifiedName());
+ bs = cdi.getBeans(true, injection);
+ assertEquals(1, bs.size());
+ assertTrue(bs.contains(b));
+
+ // 2. For injection point with qualifier @Big, the only eligible bean is
+ // default producer bean method with qualifier @Big
+ injection = getInjectionPointField(cdi, javaPath, "big");
+
+ bs = cdi.getBeans(false, injection);
+ assertEquals(1, bs.size());
+ b = bs.iterator().next();
+ assertTrue(b instanceof IProducerMethod);
+ IMethod m = ((IProducerMethod)b).getMethod();
+ assertNotNull(m);
+ assertEquals("getDefault", m.getElementName());
+ bs = cdi.getBeans(true, injection);
+ assertEquals(1, bs.size());
+ assertTrue(bs.contains(b));
+
+ // 3. For injection point with qualifier @Huge, two beans are eligible
+ // a) Default producer method bean with qualifier @Huge,
+ // b) one more bean with qualifier @Huge
+ // default bean is filtered out at resolving beans.
+ injection = getInjectionPointField(cdi, javaPath, "huge");
+
+ bs = cdi.getBeans(false, injection);
+ assertEquals(2, bs.size());
+ Iterator<IBean> it = bs.iterator();
+ b = null;
+ while(!(b instanceof IProducerMethod) && it.hasNext()) {
+ b = it.next();
+ };
+ assertTrue(b instanceof IProducerMethod);
+ m = ((IProducerMethod)b).getMethod();
+ assertNotNull(m);
+ assertEquals("getExclusive", m.getElementName());
+ bs = cdi.getBeans(true, injection);
+ assertEquals(1, bs.size());
+ assertTrue(!bs.contains(b));
+
+ // 4. For injection point with qualifier @Cozy, two beans are eligible
+ // a) Default producer field bean has qualifier @Cozy, producer inherits @DefaultBean from parent class;
+ // b) One more bean with qualifier @Cozy.
+ // default bean is filtered out at resolving beans.
+ injection = getInjectionPointField(cdi, javaPath, "cozy");
+
+ bs = cdi.getBeans(false, injection);
+ assertEquals(2, bs.size());
+ it = bs.iterator();
+ b = null;
+ while(!(b instanceof IProducerField) && it.hasNext()) {
+ b = it.next();
+ };
+ assertTrue(b instanceof IProducerField);
+ IField f = ((IProducerField)b).getField();
+ assertNotNull(f);
+ assertEquals("cozy", f.getElementName());
+ bs = cdi.getBeans(true, injection);
+ assertEquals(1, bs.size());
+ assertTrue(!bs.contains(b));
+
+ // 5. For injection point without qualifier (= with @Default), two beans are eligible
+ // a) Default producer field bean without qualifier, producer inherits @DefaultBean from parent class;
+ // b) One more bean without qualifier.
+ // default bean is filtered out at resolving beans.
+ injection = getInjectionPointField(cdi, javaPath, "ruins");
+
+ bs = cdi.getBeans(false, injection);
+ assertEquals(2, bs.size());
+ it = bs.iterator();
+ b = null;
+ while(!(b instanceof IProducerField) && it.hasNext()) {
+ b = it.next();
+ }
+ assertTrue(b instanceof IProducerField);
+ f = ((IProducerField)b).getField();
+ assertNotNull(f);
+ assertEquals("old", f.getElementName());
+ bs = cdi.getBeans(true, injection);
+ assertEquals(1, bs.size());
+ assertTrue(!bs.contains(b));
+ }
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/v30/DefaultBeanTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/v30/ExactTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/v30/ExactTest.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/v30/ExactTest.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,83 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.cdi.seam.solder.core.test.v30;
+
+import java.io.IOException;
+import java.util.Set;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.jdt.core.IMember;
+import org.jboss.tools.cdi.core.CDICorePlugin;
+import org.jboss.tools.cdi.core.IBean;
+import org.jboss.tools.cdi.core.ICDIProject;
+import org.jboss.tools.cdi.core.IClassBean;
+import org.jboss.tools.cdi.core.IInjectionPoint;
+import org.jboss.tools.cdi.core.IProducerMethod;
+
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+public class ExactTest extends SeamSolderTest {
+
+ public ExactTest() {}
+
+ public void testExact() throws CoreException, IOException {
+ ICDIProject cdi = CDICorePlugin.getCDIProject(getTestProject(), true);
+
+ Set<IBean> bs = cdi.getBeans(new Path("/CDISolderTest30/src/org/jboss/exact/FishFactory.java"));
+ assertEquals(2, bs.size());
+ IClassBean cls = null;
+ IProducerMethod mtd = null;
+ for (IBean b: bs) {
+ if(b instanceof IClassBean) {
+ cls = (IClassBean)b;
+ } else if(b instanceof IProducerMethod) {
+ mtd = (IProducerMethod)b;
+ }
+ }
+ assertNotNull(cls);
+ assertNotNull(mtd);
+ Set<IInjectionPoint> points = cls.getInjectionPoints();
+ int count = 0;
+ for (IInjectionPoint p: points) {
+ Set<IBean> injected = cdi.getBeans(false, p);
+ IMember member = p.getSourceMember();
+ if(member.getElementName().equals("peacefulFish")) {
+ assertEquals(1, injected.size());
+ IBean ib = injected.iterator().next();
+ assertEquals("org.jboss.exact.Salmon", ib.getBeanClass().getFullyQualifiedName());
+ count++;
+ } else if(member.getElementName().equals("dangerousFish")) {
+ assertEquals(1, injected.size());
+ IBean ib = injected.iterator().next();
+ assertEquals("org.jboss.exact.Shark", ib.getBeanClass().getFullyQualifiedName());
+ count++;
+ } else if(member.getElementName().equals("getTastyFish")) {
+ assertEquals(1, injected.size());
+ IBean ib = injected.iterator().next();
+ assertEquals("org.jboss.exact.Salmon", ib.getBeanClass().getFullyQualifiedName());
+ count++;
+ } else {
+ }
+ }
+ assertEquals(3, count);
+ }
+
+ public void testExactInDependentProject() throws CoreException, IOException {
+ ICDIProject cdi = getDependentCDIProject();
+
+ Set<IBean> bs = cdi.getBeans(new Path("/CDISolderTest30/src/org/jboss/exact/FishFactory.java"));
+ assertEquals(2, bs.size());
+ }
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/v30/ExactTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/v30/GenericBeanTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/v30/GenericBeanTest.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/v30/GenericBeanTest.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,264 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.cdi.seam.solder.core.test.v30;
+
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jdt.core.IType;
+import org.jboss.tools.cdi.core.CDICorePlugin;
+import org.jboss.tools.cdi.core.IBean;
+import org.jboss.tools.cdi.core.ICDIProject;
+import org.jboss.tools.cdi.core.IClassBean;
+import org.jboss.tools.cdi.core.IInjectionPoint;
+import org.jboss.tools.cdi.core.IInjectionPointField;
+import org.jboss.tools.cdi.core.IProducer;
+import org.jboss.tools.cdi.core.IProducerMethod;
+import org.jboss.tools.cdi.seam.solder.core.generic.GenericBeanProducerMethod;
+import org.jboss.tools.cdi.seam.solder.core.generic.GenericClassBean;
+
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+public class GenericBeanTest extends SeamSolderTest {
+
+ public GenericBeanTest() {}
+
+ public void testGenericBeanEndPointInjections() throws CoreException {
+ ICDIProject cdi = CDICorePlugin.getCDIProject(getTestProject(), true);
+
+ /*
+ * Case 1. (default qualifier case)
+ * Injection point: in class MyBeanInjections
+ * @Inject MyBean first1
+ * Generic bean producer method: MyGenericBean.createMyFirstBean()
+ * Configuration producer method: MyConfigurationProducer.getOneConfig()
+ */
+ IInjectionPointField injection = getInjectionPointField(cdi, "src/org/jboss/generic/MyBeanInjections.java", "first1");
+
+ Set<IBean> bs = cdi.getBeans(false, injection);
+ assertEquals(1, bs.size());
+ IBean b = bs.iterator().next();
+ assertTrue(b instanceof IProducerMethod);
+ IProducerMethod m = (IProducerMethod)b;
+ assertEquals("createMyFirstBean", m.getMethod().getElementName());
+ assertTrue(b instanceof GenericBeanProducerMethod);
+ GenericBeanProducerMethod gm = (GenericBeanProducerMethod)b;
+ GenericClassBean cb = (GenericClassBean)gm.getClassBean();
+ IBean gb = cb.getGenericProducerBean();
+ assertTrue(gb instanceof IProducerMethod);
+ IProducerMethod gbm = (IProducerMethod)gb;
+ assertEquals("getOneConfig", gbm.getMethod().getElementName());
+
+ /*
+ * Case 2. (non-default qualifier case)
+ * Injection point: in class MyBeanInjections
+ * @Inject @Qualifier1 MyBean first2
+ * Generic bean producer method: MyGenericBean.createMyFirstBean()
+ * Configuration producer method: MyConfigurationProducer.getSecondConfig()
+ */
+ injection = getInjectionPointField(cdi, "src/org/jboss/generic/MyBeanInjections.java", "first2");
+
+ bs = cdi.getBeans(false, injection);
+ assertEquals(1, bs.size());
+ b = bs.iterator().next();
+ assertTrue(b instanceof IProducerMethod);
+ m = (IProducerMethod)b;
+ assertEquals("createMyFirstBean", m.getMethod().getElementName());
+ assertTrue(b instanceof GenericBeanProducerMethod);
+ gm = (GenericBeanProducerMethod)b;
+ cb = (GenericClassBean)gm.getClassBean();
+ gb = cb.getGenericProducerBean();
+ assertTrue(gb instanceof IProducerMethod);
+ gbm = (IProducerMethod)gb;
+ assertEquals("getSecondConfig", gbm.getMethod().getElementName());
+
+ /*
+ * Case 3. (case of configuration provided by extending config class)
+ * Injection point: in class MyBeanInjections
+ * @Inject @Qualifier2 MyBean first3
+ * Generic bean producer method: MyGenericBean.createMyFirstBean()
+ * Configuration bean: by MyExtendedConfiguration
+ */
+ injection = getInjectionPointField(cdi, "src/org/jboss/generic/MyBeanInjections.java", "first3");
+
+ bs = cdi.getBeans(false, injection);
+ assertEquals(1, bs.size());
+ b = bs.iterator().next();
+ assertTrue(b instanceof IProducerMethod);
+ m = (IProducerMethod)b;
+ assertEquals("createMyFirstBean", m.getMethod().getElementName());
+ assertTrue(b instanceof GenericBeanProducerMethod);
+ gm = (GenericBeanProducerMethod)b;
+ cb = (GenericClassBean)gm.getClassBean();
+ gb = cb.getGenericProducerBean();
+ assertTrue(gb instanceof IClassBean);
+ IClassBean gbc = (IClassBean)gb;
+ assertEquals("MyExtendedConfiguration", gbc.getBeanClass().getElementName());
+ }
+
+ public void testGenericBeanInjectionIntoGenericPoint() throws CoreException {
+ ICDIProject cdi = CDICorePlugin.getCDIProject(getTestProject(), true);
+
+ /*
+ * Injection point: in class MyGenericBean2
+ * @Inject @Generic MyBean c;
+ * There are 5 configurations, hence there are 5 beans MyGenericBean2,
+ * each has that injection point;
+ * in all cases bean is produced by MyGenericBean.createMyFirstBean()
+ */
+ Set<IInjectionPointField> injections = getGenericInjectionPointField(cdi, "src/org/jboss/generic/MyGenericBean2.java", "c");
+ assertEquals(5, injections.size());
+ for (IInjectionPointField injection: injections) {
+ Set<IBean> bs = cdi.getBeans(false, injection);
+ assertEquals(1, bs.size());
+ IBean b = bs.iterator().next();
+ assertTrue(b instanceof IProducerMethod);
+ IProducerMethod m = (IProducerMethod)b;
+ assertEquals("createMyFirstBean", m.getMethod().getElementName());
+ }
+ }
+
+ public void testGenericTypeInjection() throws CoreException {
+ ICDIProject cdi = CDICorePlugin.getCDIProject(getTestProject(), true);
+
+ /*
+ * Injection point: in class MyGenericBean2
+ * @Inject MyGenericType type;
+ * There are 5 configurations, hence there are 5 beans MyGenericBean2,
+ * each has that injection point;
+ * in all cases we insert a dummy bean of type org.jboss.generic.MyGenericType
+ */
+ Set<IInjectionPointField> injections = getGenericInjectionPointField(cdi, "src/org/jboss/generic/MyGenericBean2.java", "type");
+ assertEquals(5, injections.size());
+ for (IInjectionPointField injection: injections) {
+ Set<IBean> bs = cdi.getBeans(false, injection);
+ assertEquals(1, bs.size());
+ IBean b = bs.iterator().next();
+ assertTrue(b instanceof IClassBean);
+ IType t = ((IClassBean)b).getBeanClass();
+ assertEquals("org.jboss.generic.MyGenericType", t.getFullyQualifiedName());
+ }
+ }
+ //TODO - more tests
+
+ protected Set<IInjectionPointField> getGenericInjectionPointField(ICDIProject cdi, String beanClassFilePath, String fieldName) {
+ Set<IInjectionPointField> result = new HashSet<IInjectionPointField>();
+ IFile file = cdi.getNature().getProject().getFile(beanClassFilePath);
+ Set<IBean> beans = cdi.getBeans(file.getFullPath());
+ Iterator<IBean> it = beans.iterator();
+ while(it.hasNext()) {
+ IBean b = it.next();
+ if(b instanceof IProducer) it.remove();
+ }
+
+ for (IBean b: beans) {
+ Set<IInjectionPoint> injections = b.getInjectionPoints();
+ for (IInjectionPoint injectionPoint : injections) {
+ if(injectionPoint instanceof IInjectionPointField) {
+ IInjectionPointField field = (IInjectionPointField)injectionPoint;
+ if(fieldName.equals(field.getField().getElementName())) {
+ result.add(field);
+ }
+ }
+ }
+ }
+ return result;
+ }
+
+ public void testVetoedGenericBeanInjectionIntoGenericPoint() throws CoreException {
+ ICDIProject cdi = CDICorePlugin.getCDIProject(getTestProject(), true);
+
+ /*
+ * Injection point: in class MessageManager
+ * @Inject @Generic MessageQueue queue;
+ * There are 3 configurations, hence there are 3 beans MessageQueue,
+ * each has that injection point;
+ * in all cases bean is produced by MyGenericBean.createMyFirstBean()
+ */
+ IClassBean beanToBeVetoed = null;
+ Set<IInjectionPointField> injections = getGenericInjectionPointField(cdi, "src/org/jboss/generic2/MessageManager.java", "queue");
+ assertEquals(3, injections.size());
+ for (IInjectionPointField injection: injections) {
+ Set<IBean> bs = cdi.getBeans(false, injection);
+ assertTrue(bs.size() >= 1);
+ for (IBean b: bs) {
+ assertTrue(b instanceof GenericBeanProducerMethod);
+ GenericBeanProducerMethod m = (GenericBeanProducerMethod)b;
+ assertEquals("messageQueueProducer", m.getMethod().getElementName());
+ IBean g = ((GenericClassBean) m.getClassBean()).getGenericProducerBean();
+ if(g instanceof IClassBean) {
+ beanToBeVetoed = (IClassBean)g;
+ }
+ }
+ }
+ assertNotNull(beanToBeVetoed);
+
+ /*
+ * Replace DurableQueueConfiguration.java with vetoed version.
+ * After that there are only 2 configurations.
+ */
+ replaceFile(getTestProject(), "src/org/jboss/generic2/DurableQueueConfiguration.vetoed",
+ "src/org/jboss/generic2/DurableQueueConfiguration.java");
+
+ beanToBeVetoed = null;
+ injections = getGenericInjectionPointField(cdi, "src/org/jboss/generic2/MessageManager.java", "queue");
+ assertEquals(2, injections.size());
+ for (IInjectionPointField injection: injections) {
+ Set<IBean> bs = cdi.getBeans(false, injection);
+ assertEquals(1, bs.size());
+ IBean b = bs.iterator().next();
+ assertTrue(b instanceof GenericBeanProducerMethod);
+ GenericBeanProducerMethod m = (GenericBeanProducerMethod)b;
+ assertEquals("messageQueueProducer", m.getMethod().getElementName());
+ IBean g = ((GenericClassBean) m.getClassBean()).getGenericProducerBean();
+ if(g instanceof IClassBean) {
+ beanToBeVetoed = (IClassBean)g;
+ }
+ }
+ assertNull(beanToBeVetoed);
+
+ /*
+ * Set original DurableQueueConfiguration.java back.
+ * Make sure that there are again 3 configurations.
+ */
+ replaceFile(getTestProject(), "src/org/jboss/generic2/DurableQueueConfiguration.original",
+ "src/org/jboss/generic2/DurableQueueConfiguration.java");
+
+ beanToBeVetoed = null;
+ injections = getGenericInjectionPointField(cdi, "src/org/jboss/generic2/MessageManager.java", "queue");
+ assertEquals(3, injections.size());
+ for (IInjectionPointField injection: injections) {
+ Set<IBean> bs = cdi.getBeans(false, injection);
+ assertTrue(bs.size() >= 1);
+ for (IBean b: bs) {
+ assertTrue(b instanceof GenericBeanProducerMethod);
+ GenericBeanProducerMethod m = (GenericBeanProducerMethod)b;
+ assertEquals("messageQueueProducer", m.getMethod().getElementName());
+ IBean g = ((GenericClassBean) m.getClassBean()).getGenericProducerBean();
+ if(g instanceof IClassBean) {
+ beanToBeVetoed = (IClassBean)g;
+ }
+ }
+ }
+ assertNotNull(beanToBeVetoed);
+ }
+
+ static void replaceFile(IProject project, String sourcePath, String targetPath) throws CoreException {
+ GenericBeanValidationTest.writeFile(project, sourcePath, targetPath);
+ }
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/v30/GenericBeanTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/v30/GenericBeanValidationTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/v30/GenericBeanValidationTest.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/v30/GenericBeanValidationTest.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,207 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.cdi.seam.solder.core.test.v30;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.jboss.tools.cdi.internal.core.validation.CDIValidationMessages;
+import org.jboss.tools.cdi.seam.solder.core.validation.SeamSolderValidationMessages;
+import org.jboss.tools.common.base.test.validation.TestUtil;
+import org.jboss.tools.test.util.JobUtils;
+import org.jboss.tools.test.util.ResourcesUtils;
+import org.jboss.tools.tests.AbstractResourceMarkerTest;
+
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+public class GenericBeanValidationTest extends SeamSolderTest {
+
+ public GenericBeanValidationTest() {}
+
+ public void testBrokenGenericType() throws CoreException {
+ /*
+ * BrokenGenericType is annotated @GenericType(MyGenericBean.class)
+ * Generic configuration types may not be generic beans.
+ */
+ IFile file = getTestProject().getFile(new Path("src/org/jboss/generic/BrokenGenericType.java"));
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file, SeamSolderValidationMessages.GENERIC_CONFIGURATION_TYPE_IS_A_GENERIC_BEAN, 5);
+ }
+
+ public void testBrokenGenericBean() throws CoreException {
+ /*
+ * BrokenGenericBean is annotated @GenericConfiguration(Override.class)
+ * Annotation type mismatch: 'Override' is not a generic configuration annotation.
+ */
+ IFile file = getTestProject().getFile(new Path("src/org/jboss/generic/BrokenGenericBean.java"));
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file, SeamSolderValidationMessages.WRONG_GENERIC_CONFIGURATION_ANNOTATION_REFERENCE.substring(0, 25) + ".*", 8);
+ }
+
+ public void testRemovingGenericPointConfiguration() throws CoreException {
+ /*
+ * Injection point: in class MessageManager
+ * @Inject @Generic MessageQueue queue;
+ * There are 3 generic configuration points, two of them have same qualifier
+ * Assert that MessageLogger has error marker.
+ */
+ IFile file = getTestProject().getFile(new Path("src/org/jboss/generic2/MessageLogger.java"));
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file, CDIValidationMessages.AMBIGUOUS_INJECTION_POINTS + ".*", 15);
+
+
+ /*
+ * Remove DurableQueueConfiguration.java with vetoed version.
+ * After that there are only 2 configurations, with different qualifiers.
+ */
+ removeFile("src/org/jboss/generic2/DurableQueueConfiguration.java");
+
+ AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, CDIValidationMessages.AMBIGUOUS_INJECTION_POINTS + ".*");
+
+ /*
+ * Set original DurableQueueConfiguration.java back.
+ * After that there are only 2 configurations, with different qualifiers.
+ */
+ writeFile(getTestProject(), "src/org/jboss/generic2/DurableQueueConfiguration.original",
+ "src/org/jboss/generic2/DurableQueueConfiguration.java");
+
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file, CDIValidationMessages.AMBIGUOUS_INJECTION_POINTS + ".*", 15);
+ }
+
+ public void testDisablingGenericPointConfiguration() throws CoreException {
+ /*
+ * Injection point: in class MessageManager
+ * @Inject @Generic MessageQueue queue;
+ * There are 3 generic configuration points, two of them have same qualifier
+ * Assert that MessageLogger has error marker.
+ * in all cases bean is produced by MyGenericBean.createMyFirstBean()
+ */
+ IFile file = getTestProject().getFile(new Path("src/org/jboss/generic2/MessageLogger.java"));
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file, CDIValidationMessages.AMBIGUOUS_INJECTION_POINTS + ".*", 15);
+
+
+ /*
+ * Replace DurableQueueConfiguration.java with not generic version.
+ * After that there are only 2 configurations.
+ */
+ writeFile(getTestProject(), "src/org/jboss/generic2/DurableQueueConfiguration.notgeneric",
+ "src/org/jboss/generic2/DurableQueueConfiguration.java");
+
+ AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, CDIValidationMessages.AMBIGUOUS_INJECTION_POINTS + ".*");
+
+ /*
+ * Set original DurableQueueConfiguration.java back.
+ * Assert that MessageLogger again has error marker.
+ */
+ writeFile(getTestProject(), "src/org/jboss/generic2/DurableQueueConfiguration.original",
+ "src/org/jboss/generic2/DurableQueueConfiguration.java");
+
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file, CDIValidationMessages.AMBIGUOUS_INJECTION_POINTS + ".*", 15);
+ }
+
+ public void testWrongTypeOfGenericPointConfiguration() throws CoreException {
+ /*
+ * Generic configuration point DurableQueueConfiguration has correct type.
+ */
+ IFile file = getTestProject().getFile(new Path("src/org/jboss/generic2/DurableQueueConfiguration.java"));
+ AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, SeamSolderValidationMessages.WRONG_TYPE_OF_GENERIC_CONFIGURATION_POINT + ".*");
+
+
+ /*
+ * Remove DurableQueueConfiguration.java with vetoed version.
+ * Generic configuration point DurableQueueConfiguration has incorrect type.
+ */
+ writeFile(getTestProject(), "src/org/jboss/generic2/DurableQueueConfiguration.wrongtype",
+ "src/org/jboss/generic2/DurableQueueConfiguration.java");
+
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file, SeamSolderValidationMessages.WRONG_TYPE_OF_GENERIC_CONFIGURATION_POINT + ".*", 11);
+
+ /*
+ * Set original DurableQueueConfiguration.java back.
+ * Generic configuration point DurableQueueConfiguration has correct type.
+ */
+ writeFile(getTestProject(), "src/org/jboss/generic2/DurableQueueConfiguration.original",
+ "src/org/jboss/generic2/DurableQueueConfiguration.java");
+
+ AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, SeamSolderValidationMessages.WRONG_TYPE_OF_GENERIC_CONFIGURATION_POINT + ".*");
+ }
+
+ public void testDuplicateGenericPointConfiguration() throws CoreException {
+ /*
+ * ConfigurationPointProducer has no duplicate generic configuration points,
+ * because one of them has an additional qualifier.
+ */
+ IFile file = getTestProject().getFile(new Path("src/org/jboss/generic3/ConfigurationPointProducer.java"));
+ AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, SeamSolderValidationMessages.AMBIGUOUS_GENERIC_CONFIGURATION_POINT.substring(0, 35) + ".*");
+
+
+ /*
+ * Replace ConfigurationPointProducer with version where configuration points have same qualifiers.
+ * It has duplicate generic configuration points.
+ */
+ writeFile(getTestProject(), "src/org/jboss/generic3/ConfigurationPointProducer.duplicates",
+ "src/org/jboss/generic3/ConfigurationPointProducer.java");
+
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file, SeamSolderValidationMessages.AMBIGUOUS_GENERIC_CONFIGURATION_POINT.substring(0, 35) + ".*", 19, 25);
+
+ /*
+ * Set original ConfigurationPointProducer.java back.
+ * ConfigurationPointProducer has no duplicate generic configuration points.
+ */
+ writeFile(getTestProject(), "src/org/jboss/generic3/ConfigurationPointProducer.original",
+ "src/org/jboss/generic3/ConfigurationPointProducer.java");
+
+ AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, SeamSolderValidationMessages.AMBIGUOUS_GENERIC_CONFIGURATION_POINT.substring(0, 35) + ".*");
+ }
+
+ // https://issues.jboss.org/browse/JBIDE-9255
+ public void testDuplicateNamedBeans() throws CoreException {
+ IFile file = getTestProject().getFile(new Path("src/org/jboss/generic4/MyMessageQueues.java"));
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file, CDIValidationMessages.DUPLCICATE_EL_NAME.substring(0, 11) + ".*", 10, 17);
+ }
+
+ public static void writeFile(IProject project, String sourcePath, String targetPath) throws CoreException {
+ boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false);
+ try {
+ IFile target = project.getFile(new Path(targetPath));
+ IFile source = project.getFile(new Path(sourcePath));
+ assertTrue(source.exists());
+ if(!target.exists()) {
+ target.create(source.getContents(), true, new NullProgressMonitor());
+ } else {
+ target.setContents(source.getContents(), true, false, new NullProgressMonitor());
+ }
+ TestUtil.validate(target);
+ } finally {
+ ResourcesUtils.setBuildAutomatically(saveAutoBuild);
+ JobUtils.waitForIdle();
+ }
+ }
+
+ public void removeFile(String targetPath) throws CoreException {
+ removeFile(getTestProject(), targetPath);
+ }
+
+ public static void removeFile(IProject project, String targetPath) throws CoreException {
+ boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false);
+ try {
+ IFile target = project.getFile(new Path(targetPath));
+ assertTrue(target.exists());
+ target.delete(true, new NullProgressMonitor());
+ TestUtil.validate(target);
+ } finally {
+ ResourcesUtils.setBuildAutomatically(saveAutoBuild);
+ JobUtils.waitForIdle();
+ }
+ }
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/v30/GenericBeanValidationTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/v30/MessageLoggerTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/v30/MessageLoggerTest.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/v30/MessageLoggerTest.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,63 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.cdi.seam.solder.core.test.v30;
+
+import java.io.IOException;
+import java.util.Set;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jdt.core.IType;
+import org.jboss.tools.cdi.core.CDICorePlugin;
+import org.jboss.tools.cdi.core.IBean;
+import org.jboss.tools.cdi.core.ICDIProject;
+import org.jboss.tools.cdi.core.IInjectionPointField;
+
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+public class MessageLoggerTest extends SeamSolderTest {
+
+ public MessageLoggerTest() {}
+
+ public void testMessageLogger() throws CoreException, IOException {
+ ICDIProject cdi = CDICorePlugin.getCDIProject(getTestProject(), true);
+
+ IInjectionPointField logger = getInjectionPointField(cdi, "src/org/jboss/logger/LogAccess.java", "logger");
+
+ Set<IBean> bs = cdi.getBeans(false, logger);
+ assertEquals(1, bs.size());
+
+ IBean b = bs.iterator().next();
+
+ IType t = b.getBeanClass();
+ assertNotNull(t);
+ assertTrue(t.isInterface());
+ assertEquals("org.jboss.logger.MyLogger", t.getFullyQualifiedName());
+ }
+
+ public void testMessageBundle() throws CoreException, IOException {
+ ICDIProject cdi = CDICorePlugin.getCDIProject(getTestProject(), true);
+
+ IInjectionPointField bundle = getInjectionPointField(cdi, "src/org/jboss/logger/LogAccess.java", "bundle");
+
+ Set<IBean> bs = cdi.getBeans(false, bundle);
+ assertEquals(1, bs.size());
+
+ IBean b = bs.iterator().next();
+
+ IType t = b.getBeanClass();
+ assertNotNull(t);
+ assertTrue(t.isInterface());
+ assertEquals("org.jboss.logger.MyBundle", t.getFullyQualifiedName());
+ }
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/v30/MessageLoggerTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/v30/SeamSolderTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/v30/SeamSolderTest.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/v30/SeamSolderTest.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,77 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.cdi.seam.solder.core.test.v30;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.jboss.tools.cdi.core.CDICorePlugin;
+import org.jboss.tools.cdi.core.ICDIProject;
+import org.jboss.tools.cdi.core.IInjectionPointField;
+import org.jboss.tools.cdi.core.test.DependentProjectTest;
+
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+public class SeamSolderTest extends TestCase {
+ protected static String PLUGIN_ID = "org.jboss.tools.cdi.seam.solder.core.test";
+ protected static String PROJECT_NAME = "CDISolderTest30";
+ protected static String PROJECT_PATH = "/projects/CDISolderTest30";
+ protected static String DEPENDENT_PROJECT_NAME = "CDIDependentSolderTest30";
+ protected static String DEPENDENT_PROJECT_PATH = "/projects/CDIDependentSolderTest30";
+
+ private ICDIProject cdiProject;
+ private IProject project;
+
+ private IProject dependentProject;
+ private ICDIProject cdiDependentProject;
+
+ public IProject getTestProject() {
+ if(cdiProject==null) {
+ project = findTestProject(PROJECT_NAME);
+ cdiProject = CDICorePlugin.getCDIProject(project, true);
+ }
+ return project;
+ }
+
+ public IProject getDependentTestProject() {
+ if(cdiDependentProject==null) {
+ dependentProject = findTestProject(DEPENDENT_PROJECT_NAME);
+ cdiDependentProject = CDICorePlugin.getCDIProject(dependentProject, true);
+ }
+ return dependentProject;
+ }
+
+ public ICDIProject getCDIProject() {
+ if(cdiProject==null) {
+ getTestProject();
+ }
+ return cdiProject;
+ }
+
+ public ICDIProject getDependentCDIProject() {
+ if(cdiDependentProject==null) {
+ getDependentTestProject();
+ }
+ return cdiDependentProject;
+ }
+
+ public static IProject findTestProject(String name) {
+ return ResourcesPlugin.getWorkspace().getRoot().getProject(name);
+ }
+
+ protected IInjectionPointField getInjectionPointField(ICDIProject cdi, String beanClassFilePath, String fieldName) {
+ return DependentProjectTest.getInjectionPointField(cdi, beanClassFilePath, fieldName);
+ }
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/v30/SeamSolderTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/v30/SeamSolderTestSetup.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/v30/SeamSolderTestSetup.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/v30/SeamSolderTestSetup.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,56 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.cdi.seam.solder.core.test.v30;
+
+import junit.extensions.TestSetup;
+import junit.framework.Test;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.jboss.tools.common.base.test.validation.TestUtil;
+import org.jboss.tools.test.util.JobUtils;
+import org.jboss.tools.test.util.ResourcesUtils;
+
+/**
+ * @author Viacheslav Kabanovich
+ */
+public class SeamSolderTestSetup extends TestSetup {
+
+ protected IProject project;
+ protected IProject dependentProject;
+
+ public SeamSolderTestSetup(Test test) {
+ super(test);
+ }
+
+ @Override
+ protected void setUp() throws Exception {
+ project = ResourcesPlugin.getWorkspace().getRoot().getProject(SeamSolderTest.PROJECT_NAME);
+ if(project == null || !project.exists()) {
+ project = ResourcesUtils.importProject(SeamSolderTest.PLUGIN_ID, SeamSolderTest.PROJECT_PATH);
+ TestUtil._waitForValidation(project);
+ }
+ dependentProject = ResourcesPlugin.getWorkspace().getRoot().getProject(SeamSolderTest.DEPENDENT_PROJECT_NAME);
+ if(dependentProject == null || !dependentProject.exists()) {
+ dependentProject = ResourcesUtils.importProject(SeamSolderTest.PLUGIN_ID, SeamSolderTest.DEPENDENT_PROJECT_PATH);
+ TestUtil._waitForValidation(dependentProject);
+ }
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false);
+ project.delete(true, true, null);
+ dependentProject.delete(true, true, null);
+ JobUtils.waitForIdle();
+ ResourcesUtils.setBuildAutomatically(saveAutoBuild);
+ }
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/v30/SeamSolderTestSetup.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/v30/ServiceHandlerTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/v30/ServiceHandlerTest.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/v30/ServiceHandlerTest.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,47 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.cdi.seam.solder.core.test.v30;
+
+import java.io.IOException;
+import java.util.Set;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jdt.core.IType;
+import org.jboss.tools.cdi.core.CDICorePlugin;
+import org.jboss.tools.cdi.core.IBean;
+import org.jboss.tools.cdi.core.ICDIProject;
+import org.jboss.tools.cdi.core.IInjectionPointField;
+
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+public class ServiceHandlerTest extends SeamSolderTest {
+
+ public ServiceHandlerTest() {}
+
+ public void testMessageLogger() throws CoreException, IOException {
+ ICDIProject cdi = CDICorePlugin.getCDIProject(getTestProject(), true);
+
+ IInjectionPointField logger = getInjectionPointField(cdi, "src/org/jboss/service/UserListManager.java", "userQuery");
+
+ Set<IBean> bs = cdi.getBeans(false, logger);
+ assertEquals(1, bs.size());
+
+ IBean b = bs.iterator().next();
+
+ IType t = b.getBeanClass();
+ assertNotNull(t);
+ assertTrue(t.isInterface());
+ assertEquals("org.jboss.service.UserQuery", t.getFullyQualifiedName());
+ }
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/v30/ServiceHandlerTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/v30/UnwrapsTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/v30/UnwrapsTest.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/v30/UnwrapsTest.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,50 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.cdi.seam.solder.core.test.v30;
+
+import java.io.IOException;
+import java.util.Set;
+
+import org.eclipse.core.runtime.CoreException;
+import org.jboss.tools.cdi.core.CDICorePlugin;
+import org.jboss.tools.cdi.core.IBean;
+import org.jboss.tools.cdi.core.ICDIProject;
+import org.jboss.tools.cdi.core.IInjectionPointField;
+import org.jboss.tools.cdi.core.IProducerMethod;
+import org.jboss.tools.cdi.seam.solder.core.CDISeamSolderConstants;
+import org.jboss.tools.cdi.seam.solder.core.CDISeamSolderConstants30;
+
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+public class UnwrapsTest extends SeamSolderTest {
+
+ public UnwrapsTest() {}
+
+ public void testUnwraps() throws CoreException, IOException {
+ ICDIProject cdi = CDICorePlugin.getCDIProject(getTestProject(), true);
+
+ IInjectionPointField logger = getInjectionPointField(cdi, "src/org/jboss/unwraps/Unwrapped.java", "permission");
+
+ Set<IBean> bs = cdi.getBeans(false, logger);
+ assertEquals(1, bs.size());
+
+ IBean b = bs.iterator().next();
+
+ assertTrue(b instanceof IProducerMethod);
+
+ IProducerMethod m = (IProducerMethod)b;
+ assertTrue(m.isAnnotationPresent(CDISeamSolderConstants30.UNWRAPS_ANNOTATION_TYPE_NAME_30));
+ assertEquals("getPermission", m.getMethod().getElementName());
+ }
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/v30/UnwrapsTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/v30/VetoTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/v30/VetoTest.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/v30/VetoTest.java 2011-10-06 23:53:24 UTC (rev 35446)
@@ -0,0 +1,96 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.cdi.seam.solder.core.test.v30;
+
+import java.io.IOException;
+import java.util.Set;
+
+import org.eclipse.core.runtime.CoreException;
+import org.jboss.tools.cdi.core.CDIConstants;
+import org.jboss.tools.cdi.core.CDICorePlugin;
+import org.jboss.tools.cdi.core.IBean;
+import org.jboss.tools.cdi.core.ICDIProject;
+import org.jboss.tools.cdi.internal.core.impl.definition.TypeDefinition;
+import org.jboss.tools.common.java.IAnnotationDeclaration;
+
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+public class VetoTest extends SeamSolderTest {
+
+ public VetoTest() {}
+
+ public void testVeto() throws CoreException, IOException {
+ ICDIProject cdi = CDICorePlugin.getCDIProject(getTestProject(), true);
+
+ //1. package annotated @Veto; class is not annotated with it
+ TypeDefinition d = cdi.getNature().getDefinitions().getTypeDefinition("org.jboss.vetoed.Tiger");
+ assertNotNull(d); //Though there exists Java type Tiger
+ IAnnotationDeclaration a = d.getAnnotation(CDIConstants.NAMED_QUALIFIER_TYPE_NAME);
+ assertNotNull(a);
+ Object name = a.getMemberValue(null);
+ assertEquals("tiger", name); //...and it is annotated with @Named("tiger")
+ Set<IBean> bs = cdi.getBeans("tiger", false);
+ assertTrue(bs.isEmpty()); //...CDI model does not have a bean named "tiger"
+ bs = cdi.getBeans(d.getResource().getFullPath());
+ assertTrue(bs.isEmpty()); //...and does not loaded any beans form its resource
+
+ //2. class annotated @Veto
+ d = cdi.getNature().getDefinitions().getTypeDefinition("org.jboss.somevetoed.Lion");
+ assertNotNull(d); //Though there exists Java type Lion
+ a = d.getAnnotation(CDIConstants.NAMED_QUALIFIER_TYPE_NAME);
+ assertNotNull(a);
+ name = a.getMemberValue(null);
+ assertEquals("lion", name); //...and it is annotated with @Named("lion")
+ bs = cdi.getBeans("lion", false);
+ assertTrue(bs.isEmpty()); //...CDI model does not have a bean named "lion"
+ bs = cdi.getBeans(d.getResource().getFullPath());
+ assertTrue(bs.isEmpty()); //...and does not loaded any beans form its resource
+ }
+
+ public void testRequires() throws CoreException, IOException {
+ ICDIProject cdi = CDICorePlugin.getCDIProject(getTestProject(), true);
+
+ //1. class annotated @Requires that references single non-available class
+ TypeDefinition d = cdi.getNature().getDefinitions().getTypeDefinition("org.jboss.requires.Bear");
+ assertNotNull(d); //Though there exists Java type Bear
+ IAnnotationDeclaration a = d.getAnnotation(CDIConstants.NAMED_QUALIFIER_TYPE_NAME);
+ assertNotNull(a);
+ Object name = a.getMemberValue(null);
+ assertEquals("bear", name); //...and it is annotated with @Named("bear")
+ Set<IBean> bs = cdi.getBeans("bear", false);
+ assertTrue(bs.isEmpty()); //...CDI model does not have a bean named "bear"
+ bs = cdi.getBeans(d.getResource().getFullPath());
+ assertTrue(bs.isEmpty()); //...and does not loaded any beans form its resource
+
+ //2. class annotated @Requires that references array of classes some of which are not available
+ d = cdi.getNature().getDefinitions().getTypeDefinition("org.jboss.requires.Bee");
+ assertNotNull(d); //Though there exists Java type Bee
+ a = d.getAnnotation(CDIConstants.NAMED_QUALIFIER_TYPE_NAME);
+ assertNotNull(a);
+ name = a.getMemberValue(null);
+ assertEquals("bee", name); //...and it is annotated with @Named("bee")
+ bs = cdi.getBeans("bee", false);
+ assertTrue(bs.isEmpty()); //...CDI model does not have a bean named "bee"
+ bs = cdi.getBeans(d.getResource().getFullPath());
+ assertTrue(bs.isEmpty()); //...and does not loaded any beans form its resource
+
+ //3. class annotated @Requires that references single available class
+ bs = cdi.getBeans("fly", false);
+ assertEquals(1, bs.size()); //...CDI model has a bean named "fly"
+
+ //4. class annotated @Requires that references array of available classes
+ bs = cdi.getBeans("dragonfly", false);
+ assertEquals(1, bs.size()); //...CDI model has a bean named "dragonfly"
+ }
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/v30/VetoTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
14 years, 10 months
- 1
- 0
JBoss Tools SVN: r35445 - in trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core: src/org/jboss/tools/cdi/seam/solder/core and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-10-06 19:51:32 -0400 (Thu, 06 Oct 2011)
New Revision: 35445
Added:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolder30CoreExtension.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolder30DefaultBeanExtension.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolder30LoggerExtension.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolder30ServiceHandlerExtension.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolder30UnwrapsExtension.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderConstants30.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/Version.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/Version30.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/CDISeamSolder30GenericBeanExtension.java
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/plugin.xml
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderConstants.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderCoreExtension.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderDefaultBeanExtension.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderLoggerExtension.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderServiceHandlerExtension.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderUnwrapsExtension.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/CDISeamSolderGenericBeanExtension.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanDefinitionContext.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanProducerField.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanProducerMethod.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanValidator.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericClassBean.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericConfiguration.java
Log:
JBIDE-9852
https://issues.jboss.org/browse/JBIDE-9852
Seam solder migrated to 3.1.
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/plugin.xml
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/plugin.xml 2011-10-06 23:50:24 UTC (rev 35444)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/plugin.xml 2011-10-06 23:51:32 UTC (rev 35445)
@@ -5,31 +5,61 @@
point="org.jboss.tools.cdi.core.cdiextensions">
<cdiextension
class="org.jboss.tools.cdi.seam.solder.core.CDISeamSolderCoreExtension"
+ runtime="org.jboss.solder.core.CoreExtension">
+ </cdiextension>
+
+ <cdiextension
+ class="org.jboss.tools.cdi.seam.solder.core.CDISeamSolderLoggerExtension"
+ runtime="org.jboss.solder.logging.TypedMessageLoggerExtension">
+ </cdiextension>
+
+ <cdiextension
+ class="org.jboss.tools.cdi.seam.solder.core.CDISeamSolderServiceHandlerExtension"
+ runtime="org.jboss.solder.serviceHandler.ServiceHandlerExtension">
+ </cdiextension>
+
+ <cdiextension
+ class="org.jboss.tools.cdi.seam.solder.core.CDISeamSolderDefaultBeanExtension"
+ runtime="org.jboss.solder.bean.defaultbean.DefaultBeanExtension">
+ </cdiextension>
+
+ <cdiextension
+ class="org.jboss.tools.cdi.seam.solder.core.CDISeamSolderUnwrapsExtension"
+ runtime="org.jboss.solder.unwraps.UnwrapsExtension">
+ </cdiextension>
+
+ <cdiextension
+ class="org.jboss.tools.cdi.seam.solder.core.generic.CDISeamSolderGenericBeanExtension"
+ runtime="org.jboss.solder.bean.generic.GenericBeanExtension">
+ </cdiextension>
+
+ <cdiextension
+ class="org.jboss.tools.cdi.seam.solder.core.CDISeamSolder30CoreExtension"
runtime="org.jboss.seam.solder.core.CoreExtension">
</cdiextension>
<cdiextension
- class="org.jboss.tools.cdi.seam.solder.core.CDISeamSolderLoggerExtension"
+ class="org.jboss.tools.cdi.seam.solder.core.CDISeamSolder30LoggerExtension"
runtime="org.jboss.seam.solder.logging.TypedMessageLoggerExtension">
</cdiextension>
<cdiextension
- class="org.jboss.tools.cdi.seam.solder.core.CDISeamSolderServiceHandlerExtension"
+ class="org.jboss.tools.cdi.seam.solder.core.CDISeamSolder30ServiceHandlerExtension"
runtime="org.jboss.seam.solder.serviceHandler.ServiceHandlerExtension">
</cdiextension>
<cdiextension
- class="org.jboss.tools.cdi.seam.solder.core.CDISeamSolderDefaultBeanExtension"
+ class="org.jboss.tools.cdi.seam.solder.core.CDISeamSolder30DefaultBeanExtension"
runtime="org.jboss.seam.solder.bean.defaultbean.DefaultBeanExtension">
</cdiextension>
<cdiextension
- class="org.jboss.tools.cdi.seam.solder.core.CDISeamSolderUnwrapsExtension"
+ class="org.jboss.tools.cdi.seam.solder.core.CDISeamSolder30UnwrapsExtension"
runtime="org.jboss.seam.solder.unwraps.UnwrapsExtension">
</cdiextension>
<cdiextension
- class="org.jboss.tools.cdi.seam.solder.core.generic.CDISeamSolderGenericBeanExtension"
+ class="org.jboss.tools.cdi.seam.solder.core.generic.CDISeamSolder30GenericBeanExtension"
runtime="org.jboss.seam.solder.bean.generic.GenericBeanExtension">
</cdiextension>
Added: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolder30CoreExtension.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolder30CoreExtension.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolder30CoreExtension.java 2011-10-06 23:51:32 UTC (rev 35445)
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.cdi.seam.solder.core;
+
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+public class CDISeamSolder30CoreExtension extends CDISeamSolderCoreExtension {
+
+ protected Version getVersion() {
+ return Version30.instance;
+ }
+
+}
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolder30CoreExtension.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolder30DefaultBeanExtension.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolder30DefaultBeanExtension.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolder30DefaultBeanExtension.java 2011-10-06 23:51:32 UTC (rev 35445)
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.cdi.seam.solder.core;
+
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+public class CDISeamSolder30DefaultBeanExtension extends CDISeamSolderDefaultBeanExtension {
+
+ protected Version getVersion() {
+ return Version30.instance;
+ }
+
+}
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolder30DefaultBeanExtension.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolder30LoggerExtension.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolder30LoggerExtension.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolder30LoggerExtension.java 2011-10-06 23:51:32 UTC (rev 35445)
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.cdi.seam.solder.core;
+
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+public class CDISeamSolder30LoggerExtension extends CDISeamSolderLoggerExtension {
+
+ protected Version getVersion() {
+ return Version30.instance;
+ }
+
+}
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolder30LoggerExtension.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolder30ServiceHandlerExtension.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolder30ServiceHandlerExtension.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolder30ServiceHandlerExtension.java 2011-10-06 23:51:32 UTC (rev 35445)
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.cdi.seam.solder.core;
+
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+public class CDISeamSolder30ServiceHandlerExtension extends CDISeamSolderServiceHandlerExtension {
+
+ protected Version getVersion() {
+ return Version30.instance;
+ }
+
+}
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolder30ServiceHandlerExtension.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolder30UnwrapsExtension.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolder30UnwrapsExtension.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolder30UnwrapsExtension.java 2011-10-06 23:51:32 UTC (rev 35445)
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.cdi.seam.solder.core;
+
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+public class CDISeamSolder30UnwrapsExtension extends CDISeamSolderUnwrapsExtension {
+
+ protected Version getVersion() {
+ return Version30.instance;
+ }
+
+}
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolder30UnwrapsExtension.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderConstants.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderConstants.java 2011-10-06 23:50:24 UTC (rev 35444)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderConstants.java 2011-10-06 23:51:32 UTC (rev 35445)
@@ -18,26 +18,29 @@
*
*/
public interface CDISeamSolderConstants extends CDIConstants {
- public String EXACT_ANNOTATION_TYPE_NAME = "org.jboss.seam.solder.core.Exact";
- public String FULLY_QUALIFIED_ANNOTATION_TYPE_NAME = "org.jboss.seam.solder.core.FullyQualified";
- public String REQUIRES_ANNOTATION_TYPE_NAME = "org.jboss.seam.solder.core.Requires";
- public String VETO_ANNOTATION_TYPE_NAME = "org.jboss.seam.solder.core.Veto";
+ public String PACKAGE_NAME = "org.jboss.solder";
- public String MESSAGE_LOGGER_ANNOTATION_TYPE_NAME = "org.jboss.seam.solder.logging.MessageLogger";
- public String MESSAGE_BUNDLE_ANNOTATION_TYPE_NAME = "org.jboss.seam.solder.messages.MessageBundle";
+ public String EXACT_ANNOTATION_TYPE_NAME = PACKAGE_NAME + ".core.Exact";
- public String SERVICE_HANDLER_TYPE_ANNOTATION_TYPE_NAME = "org.jboss.seam.solder.serviceHandler.ServiceHandlerType";
+ public String FULLY_QUALIFIED_ANNOTATION_TYPE_NAME = PACKAGE_NAME + ".core.FullyQualified";
+ public String REQUIRES_ANNOTATION_TYPE_NAME = PACKAGE_NAME + ".core.Requires";
+ public String VETO_ANNOTATION_TYPE_NAME = PACKAGE_NAME + ".core.Veto";
+
+ public String MESSAGE_LOGGER_ANNOTATION_TYPE_NAME = PACKAGE_NAME + ".logging.MessageLogger";
+ public String MESSAGE_BUNDLE_ANNOTATION_TYPE_NAME = PACKAGE_NAME + ".messages.MessageBundle";
+
+ public String SERVICE_HANDLER_TYPE_ANNOTATION_TYPE_NAME = PACKAGE_NAME + ".serviceHandler.ServiceHandlerType";
public String SERVICE_ANNOTATION_KIND = "serviceAnnotation";
- public String DEFAULT_BEAN_ANNOTATION_TYPE_NAME = "org.jboss.seam.solder.bean.defaultbean.DefaultBean";
+ public String DEFAULT_BEAN_ANNOTATION_TYPE_NAME = PACKAGE_NAME + ".bean.defaultbean.DefaultBean";
- public String UNWRAPS_ANNOTATION_TYPE_NAME = "org.jboss.seam.solder.unwraps.Unwraps";
+ public String UNWRAPS_ANNOTATION_TYPE_NAME = PACKAGE_NAME + ".unwraps.Unwraps";
- public String GENERIC_TYPE_ANNOTATION_TYPE_NAME = "org.jboss.seam.solder.bean.generic.GenericType";
+ public String GENERIC_TYPE_ANNOTATION_TYPE_NAME = PACKAGE_NAME + ".bean.generic.GenericType";
public String GENERIC_ANNOTATION_KIND = "genericAnnotation";
- public String GENERIC_QUALIFIER_TYPE_NAME = "org.jboss.seam.solder.bean.generic.Generic";
- public String GENERIC_CONFIGURATION_ANNOTATION_TYPE_NAME = "org.jboss.seam.solder.bean.generic.GenericConfiguration";
- public String APPLY_SCOPE_ANNOTATION_TYPE_NAME = "org.jboss.seam.solder.bean.generic.ApplyScope";
- public String INJECT_GENERIC_ANNOTATION_TYPE_NAME = "org.jboss.seam.solder.bean.generic.InjectGeneric";
+ public String GENERIC_QUALIFIER_TYPE_NAME = PACKAGE_NAME + ".bean.generic.Generic";
+ public String GENERIC_CONFIGURATION_ANNOTATION_TYPE_NAME = PACKAGE_NAME + ".bean.generic.GenericConfiguration";
+ public String APPLY_SCOPE_ANNOTATION_TYPE_NAME = PACKAGE_NAME + ".bean.generic.ApplyScope";
+ public String INJECT_GENERIC_ANNOTATION_TYPE_NAME = PACKAGE_NAME + ".bean.generic.InjectGeneric";
}
Added: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderConstants30.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderConstants30.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderConstants30.java 2011-10-06 23:51:32 UTC (rev 35445)
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.cdi.seam.solder.core;
+
+import org.jboss.tools.cdi.core.CDIConstants;
+
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+public interface CDISeamSolderConstants30 extends CDISeamSolderConstants {
+ public String PACKAGE_NAME_30 = "org.jboss.seam.solder";
+
+ public String EXACT_ANNOTATION_TYPE_NAME_30 = PACKAGE_NAME_30 + ".core.Exact";
+
+ public String FULLY_QUALIFIED_ANNOTATION_TYPE_NAME_30 = PACKAGE_NAME_30 + ".core.FullyQualified";
+ public String REQUIRES_ANNOTATION_TYPE_NAME_30 = PACKAGE_NAME_30 + ".core.Requires";
+ public String VETO_ANNOTATION_TYPE_NAME_30 = PACKAGE_NAME_30 + ".core.Veto";
+
+ public String MESSAGE_LOGGER_ANNOTATION_TYPE_NAME_30 = PACKAGE_NAME_30 + ".logging.MessageLogger";
+ public String MESSAGE_BUNDLE_ANNOTATION_TYPE_NAME_30 = PACKAGE_NAME_30 + ".messages.MessageBundle";
+
+ public String SERVICE_HANDLER_TYPE_ANNOTATION_TYPE_NAME_30 = PACKAGE_NAME_30 + ".serviceHandler.ServiceHandlerType";
+
+ public String DEFAULT_BEAN_ANNOTATION_TYPE_NAME_30 = PACKAGE_NAME_30 + ".bean.defaultbean.DefaultBean";
+
+ public String UNWRAPS_ANNOTATION_TYPE_NAME_30 = PACKAGE_NAME_30 + ".unwraps.Unwraps";
+
+ public String GENERIC_TYPE_ANNOTATION_TYPE_NAME_30 = PACKAGE_NAME_30 + ".bean.generic.GenericType";
+ public String GENERIC_QUALIFIER_TYPE_NAME_30 = PACKAGE_NAME_30 + ".bean.generic.Generic";
+ public String GENERIC_CONFIGURATION_ANNOTATION_TYPE_NAME_30 = PACKAGE_NAME_30 + ".bean.generic.GenericConfiguration";
+ public String APPLY_SCOPE_ANNOTATION_TYPE_NAME_30 = PACKAGE_NAME_30 + ".bean.generic.ApplyScope";
+ public String INJECT_GENERIC_ANNOTATION_TYPE_NAME_30 = PACKAGE_NAME_30 + ".bean.generic.InjectGeneric";
+
+}
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderConstants30.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderCoreExtension.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderCoreExtension.java 2011-10-06 23:50:24 UTC (rev 35444)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderCoreExtension.java 2011-10-06 23:51:32 UTC (rev 35445)
@@ -52,6 +52,13 @@
*/
public class CDISeamSolderCoreExtension implements ICDIExtension, IProcessAnnotatedTypeFeature {
+ public CDISeamSolderCoreExtension() {
+ }
+
+ protected Version getVersion() {
+ return Version.instance;
+ }
+
public void processAnnotatedType(TypeDefinition typeDefinition, IRootDefinitionContext context) {
if(processVeto(typeDefinition, context)) {
@@ -71,11 +78,11 @@
// @Veto
private boolean processVeto(TypeDefinition typeDefinition, IRootDefinitionContext context) {
if (typeDefinition
- .isAnnotationPresent(CDISeamSolderConstants.VETO_ANNOTATION_TYPE_NAME)
+ .isAnnotationPresent(getVersion().getVetoAnnotationTypeName())
|| (typeDefinition.getPackageDefinition() != null && typeDefinition
.getPackageDefinition()
.isAnnotationPresent(
- CDISeamSolderConstants.VETO_ANNOTATION_TYPE_NAME))) {
+ getVersion().getVetoAnnotationTypeName()))) {
typeDefinition.veto();
return true;
}
@@ -108,7 +115,7 @@
IAnnotationDeclaration fullyQualifiedOnPackage = null;
if(p != null) {
namedOnPackage = p.getAnnotation(CDIConstants.NAMED_QUALIFIER_TYPE_NAME);
- fullyQualifiedOnPackage = p.getAnnotation(CDISeamSolderConstants.FULLY_QUALIFIED_ANNOTATION_TYPE_NAME);
+ fullyQualifiedOnPackage = p.getAnnotation(getVersion().getFullyQualifiedAnnotationTypeName());
}
processNames(typeDefinition, context, namedOnPackage, fullyQualifiedOnPackage, p);
@@ -132,7 +139,7 @@
private void processNames(AbstractMemberDefinition d, IRootDefinitionContext context,
IAnnotationDeclaration namedOnPackage, IAnnotationDeclaration fullyQualifiedOnPackage, PackageDefinition p) {
IAnnotationDeclaration named = d.getAnnotation(CDIConstants.NAMED_QUALIFIER_TYPE_NAME);
- IAnnotationDeclaration fullyQualified = d.getAnnotation(CDISeamSolderConstants.FULLY_QUALIFIED_ANNOTATION_TYPE_NAME);
+ IAnnotationDeclaration fullyQualified = d.getAnnotation(getVersion().getFullyQualifiedAnnotationTypeName());
String beanName = null;
@@ -160,7 +167,7 @@
private List<String> getRequiredClasses(IAnnotated d) {
IAnnotationDeclaration requires = d
- .getAnnotation(CDISeamSolderConstants.REQUIRES_ANNOTATION_TYPE_NAME);
+ .getAnnotation(getVersion().getRequiresAnnotationTypeName());
return requires != null ? getArrayValue(requires) : new ArrayList<String>();
}
@@ -202,7 +209,7 @@
}
private TypeDeclaration getExactType(IAnnotated annotated, TypeDefinition declaringType, IRootDefinitionContext context) {
- IAnnotationDeclaration a = annotated.getAnnotation(CDISeamSolderConstants.EXACT_ANNOTATION_TYPE_NAME);
+ IAnnotationDeclaration a = annotated.getAnnotation(getVersion().getExactAnnotationTypeName());
if(a != null) {
Object o = a.getMemberValue(null);
if(o != null) {
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderDefaultBeanExtension.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderDefaultBeanExtension.java 2011-10-06 23:50:24 UTC (rev 35444)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderDefaultBeanExtension.java 2011-10-06 23:51:32 UTC (rev 35445)
@@ -46,8 +46,12 @@
*/
public class CDISeamSolderDefaultBeanExtension implements ICDIExtension, IProcessAnnotatedTypeFeature, IAmbiguousBeanResolverFeature {
+ protected Version getVersion() {
+ return Version.instance;
+ }
+
public void processAnnotatedType(TypeDefinition typeDefinition, IRootDefinitionContext context) {
- boolean defaultBean = typeDefinition.isAnnotationPresent(CDISeamSolderConstants.DEFAULT_BEAN_ANNOTATION_TYPE_NAME);
+ boolean defaultBean = typeDefinition.isAnnotationPresent(getVersion().getDefaultBeanAnnotationTypeName());
IJavaAnnotation beanTyped = null;
if(defaultBean) {
beanTyped = createFakeTypedAnnotation(typeDefinition, context);
@@ -58,7 +62,7 @@
List<MethodDefinition> ms = typeDefinition.getMethods();
for (MethodDefinition m: ms) {
if(m.isAnnotationPresent(CDIConstants.PRODUCES_ANNOTATION_TYPE_NAME)) {
- if(defaultBean || m.isAnnotationPresent(CDISeamSolderConstants.DEFAULT_BEAN_ANNOTATION_TYPE_NAME)) {
+ if(defaultBean || m.isAnnotationPresent(getVersion().getDefaultBeanAnnotationTypeName())) {
IJavaAnnotation methodTyped = createFakeTypedAnnotation(m, context);
if(methodTyped != null) {
m.addAnnotation(methodTyped, context);
@@ -69,7 +73,7 @@
List<FieldDefinition> fs = typeDefinition.getFields();
for (FieldDefinition f: fs) {
if(f.isAnnotationPresent(CDIConstants.PRODUCES_ANNOTATION_TYPE_NAME)) {
- if(defaultBean || f.isAnnotationPresent(CDISeamSolderConstants.DEFAULT_BEAN_ANNOTATION_TYPE_NAME)) {
+ if(defaultBean || f.isAnnotationPresent(getVersion().getDefaultBeanAnnotationTypeName())) {
IJavaAnnotation fieldTyped = createFakeTypedAnnotation(f, context);
if(fieldTyped != null) {
f.addAnnotation(fieldTyped, context);
@@ -81,7 +85,7 @@
IJavaAnnotation createFakeTypedAnnotation(AbstractMemberDefinition def, IRootDefinitionContext context) {
IJavaAnnotation result = null;
- IAnnotationDeclaration a = def.getAnnotation(CDISeamSolderConstants.DEFAULT_BEAN_ANNOTATION_TYPE_NAME);
+ IAnnotationDeclaration a = def.getAnnotation(getVersion().getDefaultBeanAnnotationTypeName());
if(a != null) {
Object n = a.getMemberValue(null);
if(n != null && n.toString().length() > 0) {
@@ -99,12 +103,12 @@
public Set<IBean> getResolvedBeans(Set<IBean> result) {
Set<IBean> defaultBeans = new HashSet<IBean>();
for (IBean b: result) {
- if(b.getAnnotation(CDISeamSolderConstants.DEFAULT_BEAN_ANNOTATION_TYPE_NAME) != null) {
+ if(b.getAnnotation(getVersion().getDefaultBeanAnnotationTypeName()) != null) {
defaultBeans.add(b);
} else if(b instanceof IProducer) {
IProducer producer = (IProducer)b;
IClassBean parent = producer.getClassBean();
- if(parent != null && parent.getAnnotation(CDISeamSolderConstants.DEFAULT_BEAN_ANNOTATION_TYPE_NAME) != null) {
+ if(parent != null && parent.getAnnotation(getVersion().getDefaultBeanAnnotationTypeName()) != null) {
defaultBeans.add(b);
}
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderLoggerExtension.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderLoggerExtension.java 2011-10-06 23:50:24 UTC (rev 35444)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderLoggerExtension.java 2011-10-06 23:51:32 UTC (rev 35445)
@@ -19,7 +19,6 @@
import org.eclipse.jdt.core.IPackageFragmentRoot;
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.SourceRange;
-import org.jboss.tools.cdi.core.CDICoreNature;
import org.jboss.tools.cdi.core.extension.AbstractDefinitionContextExtension;
import org.jboss.tools.cdi.core.extension.ICDIExtension;
import org.jboss.tools.cdi.core.extension.IDefinitionContextExtension;
@@ -41,6 +40,10 @@
public class CDISeamSolderLoggerExtension implements ICDIExtension, IBuildParticipantFeature {
LoggerDefinitionContext context = new LoggerDefinitionContext();
+ protected Version getVersion() {
+ return Version.instance;
+ }
+
public IDefinitionContextExtension getContext() {
return context;
}
@@ -65,17 +68,17 @@
Set<IType> ts = is.get(path);
for (IType t: ts) {
InterfaceDefinition i = new InterfaceDefinition(t, context);
- if(i.isAnnotationPresent(CDISeamSolderConstants.MESSAGE_LOGGER_ANNOTATION_TYPE_NAME)) {
+ if(i.isAnnotationPresent(getVersion().getMessageLoggerAnnotationTypeName())) {
TypeDefinition d = new TypeDefinition();
d.setType(t, workingCopy.getRootContext(), 0);
d.setBeanConstructor(true);
workingCopy.addMessageLogger(path, d);
- } else if(i.isAnnotationPresent(CDISeamSolderConstants.MESSAGE_BUNDLE_ANNOTATION_TYPE_NAME)) {
+ } else if(i.isAnnotationPresent(getVersion().getMessageBundleAnnotationTypeName())) {
TypeDefinition d = new TypeDefinition();
d.setType(t, workingCopy.getRootContext(), 0);
d.setBeanConstructor(true);
workingCopy.addMessageBundle(path, d);
- AnnotationDeclaration ad = d.getAnnotation(CDISeamSolderConstants.MESSAGE_BUNDLE_ANNOTATION_TYPE_NAME);
+ AnnotationDeclaration ad = d.getAnnotation(getVersion().getMessageBundleAnnotationTypeName());
if(ad.getMemberValue("projectCode") != null && ad.getMemberValue("projectCode").toString().length() > 0) {
String text = d.getContent();
int st = ad.getStartPosition();
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderServiceHandlerExtension.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderServiceHandlerExtension.java 2011-10-06 23:50:24 UTC (rev 35444)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderServiceHandlerExtension.java 2011-10-06 23:51:32 UTC (rev 35445)
@@ -20,7 +20,6 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.jdt.core.IPackageFragmentRoot;
import org.eclipse.jdt.core.IType;
-import org.jboss.tools.cdi.core.CDICoreNature;
import org.jboss.tools.cdi.core.extension.AbstractDefinitionContextExtension;
import org.jboss.tools.cdi.core.extension.ICDIExtension;
import org.jboss.tools.cdi.core.extension.IDefinitionContextExtension;
@@ -49,6 +48,10 @@
public class CDISeamSolderServiceHandlerExtension implements ICDIExtension, IBuildParticipantFeature {
ServiceHandlerDefinitionContext context = new ServiceHandlerDefinitionContext();
+ protected Version getVersion() {
+ return Version.instance;
+ }
+
public IDefinitionContextExtension getContext() {
return context;
}
@@ -144,7 +147,7 @@
@Override
public void computeAnnotationKind(AnnotationDefinition annotation) {
- if(annotation.isAnnotationPresent(CDISeamSolderConstants.SERVICE_HANDLER_TYPE_ANNOTATION_TYPE_NAME)) {
+ if(annotation.isAnnotationPresent(getVersion().getHandlerTypeAnnotationTypeName())) {
annotation.setExtendedKind(CDISeamSolderConstants.SERVICE_ANNOTATION_KIND);
serviceAnnotations.add(annotation.getType().getFullyQualifiedName());
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderUnwrapsExtension.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderUnwrapsExtension.java 2011-10-06 23:50:24 UTC (rev 35444)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderUnwrapsExtension.java 2011-10-06 23:51:32 UTC (rev 35445)
@@ -33,9 +33,13 @@
*/
public class CDISeamSolderUnwrapsExtension implements ICDIExtension, IProcessAnnotatedMemberFeature {
+ protected Version getVersion() {
+ return Version.instance;
+ }
+
public void processAnnotatedMember(BeanMemberDefinition memberDefinition, IRootDefinitionContext context) {
if(memberDefinition instanceof MethodDefinition) {
- if(memberDefinition.isAnnotationPresent(CDISeamSolderConstants.UNWRAPS_ANNOTATION_TYPE_NAME)) {
+ if(memberDefinition.isAnnotationPresent(getVersion().getUnwrapsAnnotationTypeName())) {
IJavaAnnotation ja = createFakeProducesAnnotation(memberDefinition, context);
if(ja != null) {
memberDefinition.addAnnotation(ja, context);
@@ -55,7 +59,7 @@
*/
IJavaAnnotation createFakeProducesAnnotation(AbstractMemberDefinition def, IRootDefinitionContext context) {
IJavaAnnotation result = null;
- IAnnotationDeclaration a = def.getAnnotation(CDISeamSolderConstants.UNWRAPS_ANNOTATION_TYPE_NAME);
+ IAnnotationDeclaration a = def.getAnnotation(getVersion().getUnwrapsAnnotationTypeName());
if(a != null) {
IType producesAnnotation = context.getProject().getType(CDIConstants.PRODUCES_ANNOTATION_TYPE_NAME);
if (producesAnnotation != null) {
Added: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/Version.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/Version.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/Version.java 2011-10-06 23:51:32 UTC (rev 35445)
@@ -0,0 +1,61 @@
+package org.jboss.tools.cdi.seam.solder.core;
+
+public class Version implements CDISeamSolderConstants {
+ public static Version instance = new Version();
+
+ public String getExactAnnotationTypeName() {
+ return EXACT_ANNOTATION_TYPE_NAME;
+ }
+
+ public String getFullyQualifiedAnnotationTypeName() {
+ return FULLY_QUALIFIED_ANNOTATION_TYPE_NAME;
+ }
+
+ public String getRequiresAnnotationTypeName() {
+ return REQUIRES_ANNOTATION_TYPE_NAME;
+ }
+
+ public String getVetoAnnotationTypeName() {
+ return VETO_ANNOTATION_TYPE_NAME;
+ }
+
+ public String getMessageLoggerAnnotationTypeName() {
+ return MESSAGE_LOGGER_ANNOTATION_TYPE_NAME;
+ }
+
+ public String getMessageBundleAnnotationTypeName() {
+ return MESSAGE_BUNDLE_ANNOTATION_TYPE_NAME;
+ }
+
+ public String getHandlerTypeAnnotationTypeName() {
+ return SERVICE_HANDLER_TYPE_ANNOTATION_TYPE_NAME;
+ }
+
+ public String getDefaultBeanAnnotationTypeName() {
+ return DEFAULT_BEAN_ANNOTATION_TYPE_NAME;
+ }
+
+ public String getUnwrapsAnnotationTypeName() {
+ return UNWRAPS_ANNOTATION_TYPE_NAME;
+ }
+
+ public String getGenericTypeAnnotationTypeName() {
+ return GENERIC_TYPE_ANNOTATION_TYPE_NAME;
+ }
+
+ public String getGenericQualifierAnnotationTypeName() {
+ return GENERIC_QUALIFIER_TYPE_NAME;
+ }
+
+ public String getGenericConfigurationAnnotationTypeName() {
+ return GENERIC_CONFIGURATION_ANNOTATION_TYPE_NAME;
+ }
+
+ public String getApplyScopeAnnotationTypeName() {
+ return APPLY_SCOPE_ANNOTATION_TYPE_NAME;
+ }
+
+ public String getInjectGenericAnnotationTypeName() {
+ return INJECT_GENERIC_ANNOTATION_TYPE_NAME;
+ }
+}
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/Version.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/Version30.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/Version30.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/Version30.java 2011-10-06 23:51:32 UTC (rev 35445)
@@ -0,0 +1,61 @@
+package org.jboss.tools.cdi.seam.solder.core;
+
+public class Version30 extends Version implements CDISeamSolderConstants30 {
+ public static Version instance = new Version30();
+
+ public String getExactAnnotationTypeName() {
+ return EXACT_ANNOTATION_TYPE_NAME_30;
+ }
+
+ public String getFullyQualifiedAnnotationTypeName() {
+ return FULLY_QUALIFIED_ANNOTATION_TYPE_NAME_30;
+ }
+
+ public String getRequiresAnnotationTypeName() {
+ return REQUIRES_ANNOTATION_TYPE_NAME_30;
+ }
+
+ public String getVetoAnnotationTypeName() {
+ return VETO_ANNOTATION_TYPE_NAME_30;
+ }
+
+ public String getMessageLoggerAnnotationTypeName() {
+ return MESSAGE_LOGGER_ANNOTATION_TYPE_NAME_30;
+ }
+
+ public String getMessageBundleAnnotationTypeName() {
+ return MESSAGE_BUNDLE_ANNOTATION_TYPE_NAME_30;
+ }
+
+ public String getHandlerTypeAnnotationTypeName() {
+ return SERVICE_HANDLER_TYPE_ANNOTATION_TYPE_NAME_30;
+ }
+
+ public String getDefaultBeanAnnotationTypeName() {
+ return DEFAULT_BEAN_ANNOTATION_TYPE_NAME_30;
+ }
+
+ public String getUnwrapsAnnotationTypeName() {
+ return UNWRAPS_ANNOTATION_TYPE_NAME_30;
+ }
+
+ public String getGenericTypeAnnotationTypeName() {
+ return GENERIC_TYPE_ANNOTATION_TYPE_NAME_30;
+ }
+
+ public String getGenericQualifierAnnotationTypeName() {
+ return GENERIC_QUALIFIER_TYPE_NAME_30;
+ }
+
+ public String getGenericConfigurationAnnotationTypeName() {
+ return GENERIC_CONFIGURATION_ANNOTATION_TYPE_NAME_30;
+ }
+
+ public String getApplyScopeAnnotationTypeName() {
+ return APPLY_SCOPE_ANNOTATION_TYPE_NAME_30;
+ }
+
+ public String getInjectGenericAnnotationTypeName() {
+ return INJECT_GENERIC_ANNOTATION_TYPE_NAME_30;
+ }
+}
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/Version30.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/CDISeamSolder30GenericBeanExtension.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/CDISeamSolder30GenericBeanExtension.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/CDISeamSolder30GenericBeanExtension.java 2011-10-06 23:51:32 UTC (rev 35445)
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.cdi.seam.solder.core.generic;
+
+import org.jboss.tools.cdi.seam.solder.core.Version;
+import org.jboss.tools.cdi.seam.solder.core.Version30;
+
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+public class CDISeamSolder30GenericBeanExtension extends CDISeamSolderGenericBeanExtension {
+
+ protected Version getVersion() {
+ return Version30.instance;
+ }
+
+}
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/CDISeamSolder30GenericBeanExtension.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/CDISeamSolderGenericBeanExtension.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/CDISeamSolderGenericBeanExtension.java 2011-10-06 23:50:24 UTC (rev 35444)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/CDISeamSolderGenericBeanExtension.java 2011-10-06 23:51:32 UTC (rev 35445)
@@ -21,6 +21,7 @@
import org.eclipse.jdt.core.IPackageFragmentRoot;
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.JavaModelException;
+import org.jboss.tools.cdi.core.CDIConstants;
import org.jboss.tools.cdi.core.CDICoreNature;
import org.jboss.tools.cdi.core.IProducer;
import org.jboss.tools.cdi.core.IQualifierDeclaration;
@@ -41,9 +42,9 @@
import org.jboss.tools.cdi.internal.core.impl.definition.TypeDefinition;
import org.jboss.tools.cdi.internal.core.scanner.FileSet;
import org.jboss.tools.cdi.internal.core.validation.CDICoreValidator;
-import org.jboss.tools.cdi.seam.solder.core.CDISeamSolderConstants;
import org.jboss.tools.cdi.seam.solder.core.CDISeamSolderCorePlugin;
import org.jboss.tools.cdi.seam.solder.core.CDISeamSolderPreferences;
+import org.jboss.tools.cdi.seam.solder.core.Version;
import org.jboss.tools.common.java.IAnnotationDeclaration;
import org.jboss.tools.common.java.IJavaAnnotation;
import org.jboss.tools.common.java.ParametedType;
@@ -56,9 +57,16 @@
* @author Viacheslav Kabanovich
*
*/
-public class CDISeamSolderGenericBeanExtension implements ICDIExtension, IBuildParticipantFeature, IProcessAnnotatedTypeFeature, IValidatorFeature, CDISeamSolderConstants {
- GenericBeanDefinitionContext context = new GenericBeanDefinitionContext();
+public class CDISeamSolderGenericBeanExtension implements ICDIExtension, IBuildParticipantFeature, IProcessAnnotatedTypeFeature, IValidatorFeature, CDIConstants {
+ GenericBeanDefinitionContext context = new GenericBeanDefinitionContext(getVersion());
+ public CDISeamSolderGenericBeanExtension() {
+ }
+
+ protected Version getVersion() {
+ return Version.instance;
+ }
+
public IDefinitionContextExtension getContext() {
return context;
}
@@ -109,7 +117,7 @@
List<MethodDefinition> ps = ti.getMethods();
for (MethodDefinition m: ps) {
if(m.isAnnotationPresent(PRODUCES_ANNOTATION_TYPE_NAME)
- || m.isAnnotationPresent(UNWRAPS_ANNOTATION_TYPE_NAME)) {
+ || m.isAnnotationPresent(getVersion().getUnwrapsAnnotationTypeName())) {
for (IAnnotationDeclaration d: list) {
m.addAnnotation(((AnnotationDeclaration)d).getDeclaration(), context.getRootContext());
}
@@ -125,7 +133,7 @@
}
replaceGenericInjections(ti, list);
- GenericClassBean cb = new GenericClassBean();
+ GenericClassBean cb = new GenericClassBean(getVersion());
cb.setGenericProducerBeanDefinition(gp);
cb.setParent(p);
cb.setDefinition(ti);
@@ -143,11 +151,11 @@
private void replaceGenericInjections(TypeDefinition ti, List<IQualifierDeclaration> list) {
List<FieldDefinition> fs = ti.getFields();
for (FieldDefinition f: fs) {
- if(f.isAnnotationPresent(INJECT_ANNOTATION_TYPE_NAME) && f.isAnnotationPresent(GENERIC_QUALIFIER_TYPE_NAME)) {
+ if(f.isAnnotationPresent(INJECT_ANNOTATION_TYPE_NAME) && f.isAnnotationPresent(getVersion().getGenericQualifierAnnotationTypeName())) {
for (IAnnotationDeclaration d: list) {
f.addAnnotation(((AnnotationDeclaration)d).getDeclaration(), context.getRootContext());
}
- AnnotationDeclaration gd = f.getAnnotation(GENERIC_QUALIFIER_TYPE_NAME);
+ AnnotationDeclaration gd = f.getAnnotation(getVersion().getGenericQualifierAnnotationTypeName());
f.removeAnnotation(gd);
IJavaAnnotation ja = createInjectGenericAnnotation(gd, context.getRootContext().getProject());
if(ja != null) {
@@ -160,15 +168,15 @@
for (MethodDefinition m: ms) {
boolean isObserver = m.isObserver();
if(m.isAnnotationPresent(INJECT_ANNOTATION_TYPE_NAME) || isObserver) {
- boolean isMethodGeneric = m.isAnnotationPresent(GENERIC_QUALIFIER_TYPE_NAME);
+ boolean isMethodGeneric = m.isAnnotationPresent(getVersion().getGenericQualifierAnnotationTypeName());
List<ParameterDefinition> ps = m.getParameters();
for (ParameterDefinition p: ps) {
- if(isMethodGeneric || p.isAnnotationPresent(GENERIC_QUALIFIER_TYPE_NAME)
+ if(isMethodGeneric || p.isAnnotationPresent(getVersion().getGenericQualifierAnnotationTypeName())
|| (isObserver && p.isAnnotationPresent(OBSERVERS_ANNOTATION_TYPE_NAME))) {
for (IAnnotationDeclaration d: list) {
p.addAnnotation(((AnnotationDeclaration)d).getDeclaration(), context.getRootContext());
}
- AnnotationDeclaration gd = p.getAnnotation(GENERIC_QUALIFIER_TYPE_NAME);
+ AnnotationDeclaration gd = p.getAnnotation(getVersion().getGenericQualifierAnnotationTypeName());
if(gd != null) {
p.removeAnnotation(gd);
IJavaAnnotation ja = createInjectGenericAnnotation(gd, context.getRootContext().getProject());
@@ -183,7 +191,7 @@
}
private IJavaAnnotation createInjectGenericAnnotation(AnnotationDeclaration genericAnnotation, CDICoreNature project) {
- IType type = project.getType(INJECT_GENERIC_ANNOTATION_TYPE_NAME);
+ IType type = project.getType(getVersion().getInjectGenericAnnotationTypeName());
return (type != null) ? new AnnotationLiteral(genericAnnotation.getResource(),
genericAnnotation.getStartPosition(), genericAnnotation.getLength(), null, 0, type)
: null;
@@ -191,11 +199,11 @@
@Override
public void processAnnotatedType(TypeDefinition typeDefinition, IRootDefinitionContext context) {
- if(typeDefinition.isAnnotationPresent(VETO_ANNOTATION_TYPE_NAME)) {
+ if(typeDefinition.isAnnotationPresent(getVersion().getVetoAnnotationTypeName())) {
//ignore
- } else if(typeDefinition.isAnnotationPresent(GENERIC_CONFIGURATION_ANNOTATION_TYPE_NAME)) {
+ } else if(typeDefinition.isAnnotationPresent(getVersion().getGenericConfigurationAnnotationTypeName())) {
typeDefinition.veto();
- IAnnotationDeclaration d = typeDefinition.getAnnotation(GENERIC_CONFIGURATION_ANNOTATION_TYPE_NAME);
+ IAnnotationDeclaration d = typeDefinition.getAnnotation(getVersion().getGenericConfigurationAnnotationTypeName());
Object o = d.getMemberValue(null);
if(o != null) {
String s = o.toString();
@@ -266,7 +274,7 @@
for (IAnnotationDeclaration d: ds) {
if(d.getTypeName() != null) {
AnnotationDefinition a = context.getRootContext().getAnnotation(d.getTypeName());
- if(a != null && a.isAnnotationPresent(GENERIC_TYPE_ANNOTATION_TYPE_NAME)) {
+ if(a != null && a.isAnnotationPresent(getVersion().getGenericTypeAnnotationTypeName())) {
return d;
}
}
@@ -275,7 +283,7 @@
}
public void validateResource(IFile file, CDICoreValidator validator) {
- new GenericBeanValidator().validateResource(file, validator, context.getRootContext().getProject(), context);
+ new GenericBeanValidator(getVersion()).validateResource(file, validator, context.getRootContext().getProject(), context);
}
public SeverityPreferences getSeverityPreferences() {
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanDefinitionContext.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanDefinitionContext.java 2011-10-06 23:50:24 UTC (rev 35444)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanDefinitionContext.java 2011-10-06 23:51:32 UTC (rev 35445)
@@ -10,7 +10,6 @@
******************************************************************************/
package org.jboss.tools.cdi.seam.solder.core.generic;
-import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
@@ -21,6 +20,7 @@
import org.jboss.tools.cdi.internal.core.impl.definition.AnnotationDefinition;
import org.jboss.tools.cdi.internal.core.impl.definition.TypeDefinition;
import org.jboss.tools.cdi.seam.solder.core.CDISeamSolderConstants;
+import org.jboss.tools.cdi.seam.solder.core.Version;
/**
*
@@ -29,9 +29,18 @@
*/
public class GenericBeanDefinitionContext extends AbstractDefinitionContextExtension {
Map<String, GenericConfiguration> genericConfiguartions = new HashMap<String, GenericConfiguration>();
+ Version version;
+ public GenericBeanDefinitionContext(Version version) {
+ this.version = version;
+ }
+
+ public Version getVersion() {
+ return version;
+ }
+
protected AbstractDefinitionContextExtension copy(boolean clean) {
- GenericBeanDefinitionContext copy = new GenericBeanDefinitionContext();
+ GenericBeanDefinitionContext copy = new GenericBeanDefinitionContext(version);
copy.root = root;
if(!clean) {
copy.genericConfiguartions.putAll(genericConfiguartions);
@@ -79,7 +88,7 @@
@Override
public void computeAnnotationKind(AnnotationDefinition annotation) {
- if(annotation.isAnnotationPresent(CDISeamSolderConstants.GENERIC_TYPE_ANNOTATION_TYPE_NAME)) {
+ if(annotation.isAnnotationPresent(version.getGenericTypeAnnotationTypeName())) {
annotation.setExtendedKind(CDISeamSolderConstants.GENERIC_ANNOTATION_KIND);
String qn = annotation.getType().getFullyQualifiedName();
GenericConfiguration c = getGenericConfiguration(qn);
@@ -91,7 +100,7 @@
getRootContext().addDependency(p, newPath);
getRootContext().addDependency(newPath, p);
}
- ps.add(newPath);
+ ps.add(newPath);
}
}
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanProducerField.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanProducerField.java 2011-10-06 23:50:24 UTC (rev 35444)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanProducerField.java 2011-10-06 23:51:32 UTC (rev 35445)
@@ -13,7 +13,7 @@
import org.jboss.tools.cdi.core.IBean;
import org.jboss.tools.cdi.core.IScope;
import org.jboss.tools.cdi.internal.core.impl.ProducerField;
-import org.jboss.tools.cdi.seam.solder.core.CDISeamSolderConstants;
+import org.jboss.tools.cdi.seam.solder.core.Version;
/**
*
@@ -21,13 +21,16 @@
*
*/
public class GenericBeanProducerField extends ProducerField implements IGenericBean {
+ Version version;
- public GenericBeanProducerField() {}
+ public GenericBeanProducerField(Version version) {
+ this.version = version;
+ }
@Override
public IScope getScope() {
IScope result = null;
- if(definition.isAnnotationPresent(CDISeamSolderConstants.APPLY_SCOPE_ANNOTATION_TYPE_NAME)) {
+ if(definition.isAnnotationPresent(version.getApplyScopeAnnotationTypeName())) {
if(getParent() instanceof GenericClassBean) {
IBean generic = ((GenericClassBean)getParent()).getGenericProducerBean();
if(generic != null) {
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanProducerMethod.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanProducerMethod.java 2011-10-06 23:50:24 UTC (rev 35444)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanProducerMethod.java 2011-10-06 23:51:32 UTC (rev 35445)
@@ -13,7 +13,7 @@
import org.jboss.tools.cdi.core.IBean;
import org.jboss.tools.cdi.core.IScope;
import org.jboss.tools.cdi.internal.core.impl.ProducerMethod;
-import org.jboss.tools.cdi.seam.solder.core.CDISeamSolderConstants;
+import org.jboss.tools.cdi.seam.solder.core.Version;
/**
*
@@ -21,13 +21,16 @@
*
*/
public class GenericBeanProducerMethod extends ProducerMethod implements IGenericBean {
+ Version version;
- public GenericBeanProducerMethod() {}
+ public GenericBeanProducerMethod(Version version) {
+ this.version = version;
+ }
@Override
public IScope getScope() {
IScope result = null;
- if(definition.isAnnotationPresent(CDISeamSolderConstants.APPLY_SCOPE_ANNOTATION_TYPE_NAME)) {
+ if(definition.isAnnotationPresent(version.getApplyScopeAnnotationTypeName())) {
if(getParent() instanceof GenericClassBean) {
IBean generic = ((GenericClassBean)getParent()).getGenericProducerBean();
if(generic != null) {
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanValidator.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanValidator.java 2011-10-06 23:50:24 UTC (rev 35444)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanValidator.java 2011-10-06 23:51:32 UTC (rev 35445)
@@ -32,9 +32,9 @@
import org.jboss.tools.cdi.internal.core.impl.definition.AnnotationDefinition;
import org.jboss.tools.cdi.internal.core.impl.definition.TypeDefinition;
import org.jboss.tools.cdi.internal.core.validation.CDICoreValidator;
-import org.jboss.tools.cdi.seam.solder.core.CDISeamSolderConstants;
import org.jboss.tools.cdi.seam.solder.core.CDISeamSolderCorePlugin;
import org.jboss.tools.cdi.seam.solder.core.CDISeamSolderPreferences;
+import org.jboss.tools.cdi.seam.solder.core.Version;
import org.jboss.tools.cdi.seam.solder.core.validation.SeamSolderValidationMessages;
import org.jboss.tools.common.java.IAnnotationDeclaration;
import org.jboss.tools.common.java.IParametedType;
@@ -46,7 +46,12 @@
*
*/
public class GenericBeanValidator {
+ Version version;
+ public GenericBeanValidator(Version version) {
+ this.version = version;
+ }
+
public void validateResource(IFile file, CDICoreValidator validator, CDICoreNature project, GenericBeanDefinitionContext context) {
Map<String, GenericConfiguration> cs = context.getGenericConfigurations();
for (GenericConfiguration c: cs.values()) {
@@ -68,14 +73,14 @@
String n = c.getGenericTypeName();
for (TypeDefinition d: c.getGenericBeans()) {
if(d.getResource() != null && d.getResource().equals(file)) {
- IAnnotationDeclaration a = d.getAnnotation(CDISeamSolderConstants.GENERIC_CONFIGURATION_ANNOTATION_TYPE_NAME);
+ IAnnotationDeclaration a = d.getAnnotation(version.getGenericConfigurationAnnotationTypeName());
validator.addError(SeamSolderValidationMessages.WRONG_GENERIC_CONFIGURATION_ANNOTATION_REFERENCE,
CDISeamSolderPreferences.WRONG_GENERIC_CONFIGURATION_ANNOTATION_REFERENCE, new String[]{n}, a, file);
}
}
} else if(file.equals(genericType.getResource())) {
if(t != null && context.isGenericBean(t.getType().getFullyQualifiedName())) {
- IAnnotationDeclaration a = genericType.getAnnotation(CDISeamSolderConstants.GENERIC_TYPE_ANNOTATION_TYPE_NAME);
+ IAnnotationDeclaration a = genericType.getAnnotation(version.getGenericTypeAnnotationTypeName());
validator.addError(SeamSolderValidationMessages.GENERIC_CONFIGURATION_TYPE_IS_A_GENERIC_BEAN,
CDISeamSolderPreferences.GENERIC_CONFIGURATION_TYPE_IS_A_GENERIC_BEAN, new String[0], a, file);
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericClassBean.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericClassBean.java 2011-10-06 23:50:24 UTC (rev 35444)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericClassBean.java 2011-10-06 23:51:32 UTC (rev 35445)
@@ -20,7 +20,7 @@
import org.jboss.tools.cdi.internal.core.impl.definition.AbstractMemberDefinition;
import org.jboss.tools.cdi.internal.core.impl.definition.FieldDefinition;
import org.jboss.tools.cdi.internal.core.impl.definition.MethodDefinition;
-import org.jboss.tools.cdi.seam.solder.core.CDISeamSolderConstants;
+import org.jboss.tools.cdi.seam.solder.core.Version;
/**
*
@@ -29,17 +29,24 @@
*/
public class GenericClassBean extends ClassBean implements IGenericBean {
protected AbstractMemberDefinition genericProducerBean;
+ Version version;
- public GenericClassBean() {}
+ public GenericClassBean(Version version) {
+ this.version = version;
+ }
+ public Version getVersion() {
+ return version;
+ }
+
@Override
protected ProducerMethod newProducerMethod(MethodDefinition m) {
- return new GenericBeanProducerMethod();
+ return new GenericBeanProducerMethod(version);
}
@Override
protected ProducerField newProducerField(FieldDefinition f) {
- return new GenericBeanProducerField();
+ return new GenericBeanProducerField(version);
}
public void setGenericProducerBeanDefinition(AbstractMemberDefinition def) {
@@ -60,7 +67,7 @@
@Override
protected void computeScope() {
- if(definition.isAnnotationPresent(CDISeamSolderConstants.APPLY_SCOPE_ANNOTATION_TYPE_NAME)) {
+ if(definition.isAnnotationPresent(version.getApplyScopeAnnotationTypeName())) {
IBean generic = getGenericProducerBean();
if(generic != null) {
scope = generic.getScope();
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericConfiguration.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericConfiguration.java 2011-10-06 23:50:24 UTC (rev 35444)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericConfiguration.java 2011-10-06 23:51:32 UTC (rev 35445)
@@ -23,7 +23,6 @@
import org.jboss.tools.cdi.internal.core.impl.definition.AbstractMemberDefinition;
import org.jboss.tools.cdi.internal.core.impl.definition.AnnotationDefinition;
import org.jboss.tools.cdi.internal.core.impl.definition.TypeDefinition;
-import org.jboss.tools.cdi.seam.solder.core.CDISeamSolderConstants;
import org.jboss.tools.cdi.seam.solder.core.CDISeamSolderCorePlugin;
import org.jboss.tools.common.java.IAnnotationDeclaration;
import org.jboss.tools.common.java.IParametedType;
@@ -74,7 +73,7 @@
public void setGenericTypeDefinition(AnnotationDefinition genericType, GenericBeanDefinitionContext context) {
this.genericType = genericType;
- IAnnotationDeclaration g = genericType.getAnnotation(CDISeamSolderConstants.GENERIC_TYPE_ANNOTATION_TYPE_NAME);
+ IAnnotationDeclaration g = genericType.getAnnotation(context.getVersion().getGenericTypeAnnotationTypeName());
Object o = g.getMemberValue(null);
if(o != null) {
String configTypeName = EclipseJavaUtil.resolveType(genericType.getType(), o.toString());
14 years, 10 months
- 1
- 0
JBoss Tools SVN: r35444 - trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/contentassist.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-10-06 19:50:24 -0400 (Thu, 06 Oct 2011)
New Revision: 35444
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/contentassist/SeamConfigXmlCompletionProposalComputer.java
Log:
JBIDE-9852
https://issues.jboss.org/browse/JBIDE-9852
Seam config ui migrated to 3.1.
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/contentassist/SeamConfigXmlCompletionProposalComputer.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/contentassist/SeamConfigXmlCompletionProposalComputer.java 2011-10-06 23:49:12 UTC (rev 35443)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/contentassist/SeamConfigXmlCompletionProposalComputer.java 2011-10-06 23:50:24 UTC (rev 35444)
@@ -537,6 +537,11 @@
IType t = EclipseJavaUtil.findType(javaProject, cls);
if(accept(t, annotationsOnly, classesOnly)) result.put(name, t);
}
+ for (String name: Util.EE_TYPES_30.keySet()) {
+ String cls = Util.EE_TYPES_30.get(name);
+ IType t = EclipseJavaUtil.findType(javaProject, cls);
+ if(accept(t, annotationsOnly, classesOnly)) result.put(name, t);
+ }
} else if(javaProject != null) {
IPackageFragmentRoot[] rs = javaProject.getAllPackageFragmentRoots();
for (IPackageFragmentRoot r: rs) {
14 years, 10 months
- 1
- 0
JBoss Tools SVN: r35443 - trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/preferences.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-10-06 19:49:12 -0400 (Thu, 06 Oct 2011)
New Revision: 35443
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/preferences/CDISeamConfigurationBlockDescriptionProvider.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/preferences/CDISeamPreferencesMessages.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/preferences/CDISeamPreferencesMessages.properties
Log:
JBIDE-9834
https://issues.jboss.org/browse/JBIDE-9834
Preferences for validation of configuring abstract types and types without bean constructors is added.
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/preferences/CDISeamConfigurationBlockDescriptionProvider.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/preferences/CDISeamConfigurationBlockDescriptionProvider.java 2011-10-06 23:47:29 UTC (rev 35442)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/preferences/CDISeamConfigurationBlockDescriptionProvider.java 2011-10-06 23:49:12 UTC (rev 35443)
@@ -21,6 +21,8 @@
{CDISeamConfigPreferences.UNRESOLVED_METHOD, CDISeamPreferencesMessages.CDIValidatorConfigurationBlock_pb_unresolvedMethod_label},
{CDISeamConfigPreferences.ANNOTATION_EXPECTED, CDISeamPreferencesMessages.CDIValidatorConfigurationBlock_pb_annotationExpected_label},
{CDISeamConfigPreferences.INLINE_BEAN_TYPE_MISMATCH, CDISeamPreferencesMessages.CDIValidatorConfigurationBlock_pb_inlineBeanTypeMismatch_label},
+ {CDISeamConfigPreferences.ABSTRACT_TYPE_IS_CONFIGURED_AS_BEAN, CDISeamPreferencesMessages.CDIValidatorConfigurationBlock_pb_abstractTypeIsConfiguredAsBean_label},
+ {CDISeamConfigPreferences.BEAN_CONSTRUCTOR_IS_MISSING, CDISeamPreferencesMessages.CDIValidatorConfigurationBlock_pb_beanConstructorIsMissing_label},
},
CDISeamConfigCorePlugin.PLUGIN_ID
);
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/preferences/CDISeamPreferencesMessages.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/preferences/CDISeamPreferencesMessages.java 2011-10-06 23:47:29 UTC (rev 35442)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/preferences/CDISeamPreferencesMessages.java 2011-10-06 23:49:12 UTC (rev 35443)
@@ -13,6 +13,8 @@
public static String CDIValidatorConfigurationBlock_pb_unresolvedConstructor_label;
public static String CDIValidatorConfigurationBlock_pb_annotationExpected_label;
public static String CDIValidatorConfigurationBlock_pb_inlineBeanTypeMismatch_label;
+ public static String CDIValidatorConfigurationBlock_pb_abstractTypeIsConfiguredAsBean_label;
+ public static String CDIValidatorConfigurationBlock_pb_beanConstructorIsMissing_label;
//Section Solder
public static String CDIValidatorConfigurationBlock_section_solder;
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/preferences/CDISeamPreferencesMessages.properties
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/preferences/CDISeamPreferencesMessages.properties 2011-10-06 23:47:29 UTC (rev 35442)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/preferences/CDISeamPreferencesMessages.properties 2011-10-06 23:49:12 UTC (rev 35443)
@@ -2,12 +2,14 @@
##Section Seam Config
CDIValidatorConfigurationBlock_section_config=Seam Config
-CDIValidatorConfigurationBlock_pb_unresolvedType_label=Unresolved Type:
-CDIValidatorConfigurationBlock_pb_unresolvedMember_label=Unresolved Member:
-CDIValidatorConfigurationBlock_pb_unresolvedMethod_label=Unresolved Method:
-CDIValidatorConfigurationBlock_pb_unresolvedConstructor_label=Unresolved Constructor:
-CDIValidatorConfigurationBlock_pb_annotationExpected_label=Annotation Expected:
-CDIValidatorConfigurationBlock_pb_inlineBeanTypeMismatch_label=Inline Bean Type Mismatch:
+CDIValidatorConfigurationBlock_pb_unresolvedType_label=Unresolved type:
+CDIValidatorConfigurationBlock_pb_unresolvedMember_label=Unresolved member:
+CDIValidatorConfigurationBlock_pb_unresolvedMethod_label=Unresolved method:
+CDIValidatorConfigurationBlock_pb_unresolvedConstructor_label=Unresolved constructor:
+CDIValidatorConfigurationBlock_pb_annotationExpected_label=Annotation expected:
+CDIValidatorConfigurationBlock_pb_inlineBeanTypeMismatch_label=Inline bean type mismatch:
+CDIValidatorConfigurationBlock_pb_abstractTypeIsConfiguredAsBean_label=Abstract type is configured as a bean:
+CDIValidatorConfigurationBlock_pb_beanConstructorIsMissing_label=Bean constructor is missing:
##Section Seam Solder
CDIValidatorConfigurationBlock_section_solder=Seam Solder
14 years, 10 months
- 1
- 0
JBoss Tools SVN: r35442 - in trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core: src/org/jboss/tools/cdi/seam/config/core and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-10-06 19:47:29 -0400 (Thu, 06 Oct 2011)
New Revision: 35442
Added:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/CDISeamConfig30Extension.java
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/plugin.xml
Log:
JBIDE-9852
https://issues.jboss.org/browse/JBIDE-9852
Seam config migrated to 3.1.
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/plugin.xml
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/plugin.xml 2011-10-06 23:47:06 UTC (rev 35441)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/plugin.xml 2011-10-06 23:47:29 UTC (rev 35442)
@@ -8,7 +8,7 @@
runtime="org.jboss.solder.config.xml.bootstrap.XmlConfigExtension">
</cdiextension>
<cdiextension
- class="org.jboss.tools.cdi.seam.config.core.CDISeamConfigExtension"
+ class="org.jboss.tools.cdi.seam.config.core.CDISeamConfig30Extension"
runtime="org.jboss.seam.config.xml.bootstrap.XmlConfigExtension">
</cdiextension>
</extension>
Added: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/CDISeamConfig30Extension.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/CDISeamConfig30Extension.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/CDISeamConfig30Extension.java 2011-10-06 23:47:29 UTC (rev 35442)
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.cdi.seam.config.core;
+
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+public class CDISeamConfig30Extension extends CDISeamConfigExtension {
+
+}
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/CDISeamConfig30Extension.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
14 years, 10 months
- 1
- 0