Author: akazakov Date: 2010-05-24 07:22:59 -0400 (Mon, 24 May 2010) New Revision: 22274 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/errorList.txt trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ValidationTest.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/ELValidator.java Log: https://jira.jboss.org/jira/browse/JBIDE-2708 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/errorList.txt =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/errorList.txt 2010-05-24 10:43:14 UTC (rev 22273) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/errorList.txt 2010-05-24 11:22:59 UTC (rev 22274) @@ -91,15 +91,15 @@ - non-static field of a session bean class is annotated @Produces - interceptor or decorator has a field annotated @Produces - - - 3.5.1. Declaring a resource - producer field declaration specifies an EL name (together with one of @Resource, @PersistenceContext, @PersistenceUnit, @EJB, @WebServiceRef) - matching object in the Java EE component environment is not of the same type as the producer field declaration + + + 3.6. Additional built-in beans - Java EE component class has an injection point of type UserTransaction and qualifier @Default, and may not validly make use of the JTA UserTransaction Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ValidationTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ValidationTest.java 2010-05-24 10:43:14 UTC (rev 22273) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ValidationTest.java 2010-05-24 11:22:59 UTC (rev 22274) @@ -742,6 +742,13 @@ AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, CDIValidationMessages.RESOURCE_PRODUCER_FIELD_SETS_EL_NAME, 15, 19, 24, 27, 31); } + /* + * 3.5.1. Declaring a resource + * - matching object in the Java EE component environment is not of the same type as the producer field declaration + * + * Cannot implement this validation rule. + */ + /** * 3.9.1. Declaring an initializer method * - an initializer method has a parameter annotated @Disposes Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/ELValidator.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/ELValidator.java 2010-05-24 10:43:14 UTC (rev 22273) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/ELValidator.java 2010-05-24 11:22:59 UTC (rev 22274) @@ -263,6 +263,7 @@ } private void validateEL(ELReference el) { + displaySubtask(JSFValidationMessages.VALIDATING_EL_FILE, new String[]{el.getResource().getProject().getName(), el.getResource().getName()}); el.deleteMarkers(); for (ELExpression expresion : el.getEl()) { validateELExpression(el, expresion);