JBoss Tools SVN: r32870 - in trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi: internal/core/impl and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-07-12 18:18:25 -0400 (Tue, 12 Jul 2011)
New Revision: 32870
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IClassBean.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java
Log:
JBIDE-9313
https://issues.jboss.org/browse/JBIDE-9313
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IClassBean.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IClassBean.java 2011-07-12 22:18:00 UTC (rev 32869)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IClassBean.java 2011-07-12 22:18:25 UTC (rev 32870)
@@ -64,10 +64,11 @@
*/
Set<? extends IClassBean> getSpecializingBeans();
- IParametedType getSuperType();
-
+ /**
+ * Returns class bean of super class of this bean, or null if it is not a bean.
+ *
+ * @return class bean of super class of this bean, or null if it is not a bean
+ */
IClassBean getSuperClassBean();
- void setSuperClassBean(IClassBean bean);
-
}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2011-07-12 22:18:00 UTC (rev 32869)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2011-07-12 22:18:25 UTC (rev 32870)
@@ -1150,10 +1150,12 @@
}
for (IClassBean bean: newClassBeans.values()) {
- IParametedType s = bean.getSuperType();
+ IParametedType s = ((ClassBean)bean).getSuperType();
if(s != null && s.getType() != null) {
IClassBean superClassBean = newClassBeans.get(s.getType());
- bean.setSuperClassBean(superClassBean);
+ if(bean instanceof ClassBean) {
+ ((ClassBean)bean).setSuperClassBean(superClassBean);
+ }
}
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java 2011-07-12 22:18:00 UTC (rev 32869)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java 2011-07-12 22:18:25 UTC (rev 32870)
@@ -560,7 +560,6 @@
* (non-Javadoc)
* @see org.jboss.tools.cdi.core.IClassBean#getSuperType()
*/
- @Override
public ParametedType getSuperType() {
return getDefinition().getSuperType();
}
14 years, 9 months
JBoss Tools SVN: r32869 - trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-07-12 18:18:00 -0400 (Tue, 12 Jul 2011)
New Revision: 32869
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIBean.java
Log:
JBIDE-9313
https://issues.jboss.org/browse/JBIDE-9313
Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIBean.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIBean.java 2011-07-12 20:42:03 UTC (rev 32868)
+++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIBean.java 2011-07-12 22:18:00 UTC (rev 32869)
@@ -250,24 +250,12 @@
}
@Override
- public IParametedType getSuperType() {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
public IClassBean getSuperClassBean() {
// TODO Auto-generated method stub
return null;
}
@Override
- public void setSuperClassBean(IClassBean bean) {
- // TODO Auto-generated method stub
-
- }
-
- @Override
public IMember getSourceMember() {
return getBeanClass();
}
14 years, 9 months
JBoss Tools SVN: r32868 - trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-07-12 16:42:03 -0400 (Tue, 12 Jul 2011)
New Revision: 32868
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIInjectionPoint.java
Log:
JBIDE-9313
https://issues.jboss.org/browse/JBIDE-9313
Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIInjectionPoint.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIInjectionPoint.java 2011-07-12 20:41:23 UTC (rev 32867)
+++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/testmodel/CDIInjectionPoint.java 2011-07-12 20:42:03 UTC (rev 32868)
@@ -29,6 +29,11 @@
}
@Override
+ public ICDIProject getDeclaringProject() {
+ return project;
+ }
+
+ @Override
public IPath getSourcePath() {
// TODO Auto-generated method stub
return null;
14 years, 9 months
JBoss Tools SVN: r32867 - in trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi: internal/core/impl and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-07-12 16:41:23 -0400 (Tue, 12 Jul 2011)
New Revision: 32867
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPoint.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIElement.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractMemberDefinition.java
Log:
JBIDE-9313
https://issues.jboss.org/browse/JBIDE-9313
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPoint.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPoint.java 2011-07-12 18:16:23 UTC (rev 32866)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPoint.java 2011-07-12 20:41:23 UTC (rev 32867)
@@ -23,6 +23,8 @@
*/
public interface IInjectionPoint extends ICDIElement, IBeanMember {
+ public ICDIProject getDeclaringProject();
+
/**
* Returns the required type of this injection point.
*
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIElement.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIElement.java 2011-07-12 18:16:23 UTC (rev 32866)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIElement.java 2011-07-12 20:41:23 UTC (rev 32867)
@@ -17,6 +17,7 @@
import org.eclipse.jdt.core.JavaModelException;
import org.jboss.tools.cdi.core.CDICorePlugin;
import org.jboss.tools.cdi.core.ICDIElement;
+import org.jboss.tools.cdi.core.ICDIProject;
import org.jboss.tools.cdi.core.extension.CDIExtensionManager;
import org.jboss.tools.common.java.ParametedType;
import org.jboss.tools.common.java.ParametedTypeFactory;
@@ -34,6 +35,11 @@
return parent != null ? parent.getCDIProject() : null;
}
+ public ICDIProject getDeclaringProject() {
+ return parent != null ? parent.getDeclaringProject() : null;
+ }
+
+
public CDIExtensionManager getExtensionManager() {
CDIProject project = getCDIProject();
return project == null ? null : project.getNature().getExtensionManager();
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2011-07-12 18:16:23 UTC (rev 32866)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2011-07-12 20:41:23 UTC (rev 32867)
@@ -304,6 +304,9 @@
* @see org.jboss.tools.cdi.core.IBeanManager#getBeans(boolean, org.jboss.tools.cdi.core.IInjectionPoint)
*/
public Set<IBean> getBeans(boolean attemptToResolveAmbiguousDependency, IInjectionPoint injectionPoint) {
+ if(injectionPoint.getDeclaringProject() != this) {
+ return injectionPoint.getDeclaringProject().getBeans(attemptToResolveAmbiguousDependency, injectionPoint);
+ }
Set<IBean> result = new HashSet<IBean>();
IParametedType type = injectionPoint.getType();
if(type == null) {
@@ -947,6 +950,11 @@
}
@Override
+ public ICDIProject getDeclaringProject() {
+ return this;
+ }
+
+ @Override
public IResource getResource() {
return n.getProject();
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java 2011-07-12 18:16:23 UTC (rev 32866)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java 2011-07-12 20:41:23 UTC (rev 32867)
@@ -25,6 +25,7 @@
import org.jboss.tools.cdi.core.CDICorePlugin;
import org.jboss.tools.cdi.core.CDIUtil;
import org.jboss.tools.cdi.core.IBeanMethod;
+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.IInterceptorBinding;
@@ -114,6 +115,16 @@
return (TypeDefinition)definition;
}
+ public ICDIProject getDeclaringProject() {
+ ICDIProject result = definition.getDeclaringProject().getDelegate();
+ if(result == null) {
+ result = getCDIProject();
+ System.out.println("Failed to get declaring project.");
+ }
+ return result;
+ }
+
+
public Set<IBeanMethod> getBeanConstructors() {
Set<IBeanMethod> result = new HashSet<IBeanMethod>();
IBeanMethod defaultConstructor = null;
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractMemberDefinition.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractMemberDefinition.java 2011-07-12 18:16:23 UTC (rev 32866)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractMemberDefinition.java 2011-07-12 20:41:23 UTC (rev 32867)
@@ -67,6 +67,10 @@
}
}
+ public CDICoreNature getDeclaringProject() {
+ return project;
+ }
+
public void setOriginalDefinition(ITextSourceReference def) {
originalDefinition = def;
}
14 years, 9 months
JBoss Tools SVN: r32866 - in trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck: validation and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-07-12 14:16:23 -0400 (Tue, 12 Jul 2011)
New Revision: 32866
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/DecoratorDefinitionTest.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/InterceptorDefinitionTest.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DefenitionErrorsValidationTest.java
Log:
JBIDE-9313
https://issues.jboss.org/browse/JBIDE-9313
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/DecoratorDefinitionTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/DecoratorDefinitionTest.java 2011-07-12 18:05:15 UTC (rev 32865)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/DecoratorDefinitionTest.java 2011-07-12 18:16:23 UTC (rev 32866)
@@ -17,8 +17,10 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.jdt.core.JavaModelException;
+import org.jboss.tools.cdi.core.IBean;
import org.jboss.tools.cdi.core.IDecorator;
import org.jboss.tools.cdi.core.IInjectionPoint;
+import org.jboss.tools.cdi.core.IInjectionPointField;
import org.jboss.tools.cdi.internal.core.impl.CDIProject;
import org.jboss.tools.cdi.internal.core.impl.ClassBean;
import org.jboss.tools.common.java.IParametedType;
@@ -86,6 +88,21 @@
}
}
+ public void testDecoratorIsNotInjected() throws CoreException {
+ IInjectionPointField f = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/decorator/House.java", "decorator");
+ /*
+ * Invocation getBeans(false, f) returns all beans that match type and qualifiers.
+ */
+ Set<IBean> bs = cdiProject.getBeans(false, f);
+ assertEquals(1, bs.size());
+ assertTrue(bs.iterator().next() instanceof IDecorator);
+ /*
+ * Invocation getBeans(true, f) filters away all beans that are not available for injection.
+ */
+ bs = cdiProject.getBeans(true, f);
+ assertTrue(bs.isEmpty());
+ }
+
public void testCustomDecorator() throws CoreException {
getDecorator("JavaSource/org/jboss/jsr299/tck/tests/decorators/custom/VehicleDecorator.java");
}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/InterceptorDefinitionTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/InterceptorDefinitionTest.java 2011-07-12 18:05:15 UTC (rev 32865)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/InterceptorDefinitionTest.java 2011-07-12 18:16:23 UTC (rev 32866)
@@ -21,6 +21,8 @@
import org.eclipse.jdt.core.JavaModelException;
import org.jboss.tools.cdi.core.IBean;
import org.jboss.tools.cdi.core.IClassBean;
+import org.jboss.tools.cdi.core.IDecorator;
+import org.jboss.tools.cdi.core.IInjectionPointField;
import org.jboss.tools.cdi.core.IInterceptor;
import org.jboss.tools.cdi.core.IInterceptorBinding;
import org.jboss.tools.cdi.core.IInterceptorBindingDeclaration;
@@ -102,6 +104,20 @@
}
+ public void testInterceptorIsNotInjected() throws CoreException {
+ IInjectionPointField f = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/interceptors/InjectInterceptorBroken.java", "cat");
+ /*
+ * Invocation getBeans(false, f) returns all beans that match type and qualifiers.
+ */
+ Set<IBean> bs = cdiProject.getBeans(false, f);
+ assertEquals(1, bs.size());
+ assertTrue(bs.iterator().next() instanceof IInterceptor);
+ /*
+ * Invocation getBeans(true, f) filters away all beans that are not available for injection.
+ */
+ bs = cdiProject.getBeans(true, f);
+ assertTrue(bs.isEmpty());
+ }
void assertContainsBindings(Set<IInterceptorBinding> bs, String... classNames) {
Set<String> bsn = new HashSet<String>();
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DefenitionErrorsValidationTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DefenitionErrorsValidationTest.java 2011-07-12 18:05:15 UTC (rev 32865)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DefenitionErrorsValidationTest.java 2011-07-12 18:16:23 UTC (rev 32866)
@@ -979,29 +979,20 @@
* 5.1.4. Inter-module injection
* - a decorator can not be injected
*
- * @throws Exception
- */
public void testDecoratorNotResolved() throws Exception {
- /* Now we exclude decorators from resolved beans.
- * Another test is required - that getBeans(false) - returns decorator, and getBeans(true) does not.
- */
-// IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/decorator/House.java");
-// AbstractResourceMarkerTest.assertMarkerIsCreated(file, CDIValidationMessages.INJECTED_DECORATOR, 23);
+ Now we exclude decorators from resolved beans.
+ This test is replaced with DecoratorDefinitionTest.testDecoratorIsNotInjected()
}
+ */
/**
* 5.1.4. Inter-module injection
* - an interceptor can not be injected
- *
- * @throws Exception
- */
public void testInterceptorNotResolved() throws Exception {
-/* Now we exclude interceptors from resolved beans.
- * Another test is required - that getBeans(false) - returns interceptor, and getBeans(true) does not.
- */
-// IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/interceptors/InjectInterceptorBroken.java");
-// AbstractResourceMarkerTest.assertMarkerIsCreated(file, CDIValidationMessages.INJECTED_INTERCEPTOR, 7);
+ Now we exclude interceptors from resolved beans.
+ This test is replaced with InterceptorDefinitionTest.testInterceptorIsNotInjected()
}
+ */
/**
* 5.2.2. Legal injection point types
14 years, 9 months
JBoss Tools SVN: r32865 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/dnd.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-07-12 14:05:15 -0400 (Tue, 12 Jul 2011)
New Revision: 32865
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/dnd/PaletteTaglibInserter.java
Log:
applied the patch https://issues.jboss.org/browse/JBIDE-9237
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/dnd/PaletteTaglibInserter.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/dnd/PaletteTaglibInserter.java 2011-07-12 17:24:37 UTC (rev 32864)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/dnd/PaletteTaglibInserter.java 2011-07-12 18:05:15 UTC (rev 32865)
@@ -21,6 +21,8 @@
import org.eclipse.jface.text.ITextViewer;
import org.eclipse.jface.text.source.ISourceViewer;
import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.PlatformUI;
import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
@@ -225,6 +227,8 @@
if(tl == null) tl = JSPPaletteInsertHelper.getPrefixes(d.get());
Element root = xmlDocument.getDocumentElement();
if(root != null) {
+ IEditorPart editorPart = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
+
// for xhtml and jsp:root
if (xmlDocument.getDoctype() != null /* && tagLibListConainsFacelet(tl)*/ ) {
String publicId = xmlDocument.getDoctype().getPublicId();
@@ -232,7 +236,7 @@
checkTL(root, p, d);
return true;
}
- } else if(xmlDocument.isXMLType() || root.getNodeName().equals(JSP_SOURCE_ROOT_ELEMENT)) {
+ } else if(xmlDocument.isXMLType() || root.getNodeName().equals(JSP_SOURCE_ROOT_ELEMENT) || (editorPart != null && editorPart.getTitle().toLowerCase().endsWith(".jspx"))) { //$NON-NLS-1$
checkTL(root, p, d);
return true;
}
14 years, 9 months
JBoss Tools SVN: r32864 - in trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi: internal/core/validation and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-07-12 13:24:37 -0400 (Tue, 12 Jul 2011)
New Revision: 32864
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/preferences/CDIPreferenceInitializer.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/preferences/CDIPreferences.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIValidationMessages.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/messages.properties
Log:
JBIDE-9313
https://issues.jboss.org/browse/JBIDE-9313
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/preferences/CDIPreferenceInitializer.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/preferences/CDIPreferenceInitializer.java 2011-07-12 17:24:11 UTC (rev 32863)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/preferences/CDIPreferenceInitializer.java 2011-07-12 17:24:37 UTC (rev 32864)
@@ -42,7 +42,6 @@
defaultPreferences.put(CDIPreferences.AMBIGUOUS_EL_NAMES, CDIPreferences.WARNING);
defaultPreferences.put(CDIPreferences.UNPROXYABLE_BEAN_TYPE, CDIPreferences.WARNING);
defaultPreferences.put(CDIPreferences.INJECT_RESOLVES_TO_NULLABLE_BEAN, CDIPreferences.WARNING);
- defaultPreferences.put(CDIPreferences.INJECTED_DECORATOR_OR_INTERCEPTOR, CDIPreferences.WARNING);
defaultPreferences.put(CDIPreferences.ILLEGAL_LIFECYCLE_CALLBACK_INTERCEPTOR_BINDING, CDIPreferences.WARNING);
defaultPreferences.put(CDIPreferences.MISSING_NONBINDING_IN_INTERCEPTOR_BINDING_TYPE_MEMBER, CDIPreferences.WARNING);
defaultPreferences.put(CDIPreferences.ILLEGAL_CONDITIONAL_OBSERVER, CDIPreferences.WARNING);
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/preferences/CDIPreferences.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/preferences/CDIPreferences.java 2011-07-12 17:24:11 UTC (rev 32863)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/preferences/CDIPreferences.java 2011-07-12 17:24:37 UTC (rev 32864)
@@ -194,8 +194,6 @@
public static final String INTERCEPTOR_OR_DECORATOR_IS_ALTERNATIVE = INSTANCE.createSeverityOption("interceptorOrDecoratorIsAlternative"); //$NON-NLS-1$
// - interceptor declared using @Interceptor does not declare any interceptor binding (9.2 non-portable)
public static final String MISSING_INTERCEPTOR_BINDING = INSTANCE.createSeverityOption("missingInterceptorBinding"); //$NON-NLS-1$
-// - a decorator or intercpetor can not be injected
- public static final String INJECTED_DECORATOR_OR_INTERCEPTOR = INSTANCE.createSeverityOption("injectedDecorator"); //$NON-NLS-1$
// 8.3. Decorator resolution
// - If a decorator matches a managed bean, and the managed bean class is declared final, the container automatically detects
// the problem and treats it as a deployment problem.
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2011-07-12 17:24:11 UTC (rev 32863)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2011-07-12 17:24:37 UTC (rev 32864)
@@ -1524,12 +1524,9 @@
* 5.1.4. Inter-module injection
* - a decorator can not be injected
* - an interceptor can not be injected
+ * It is not an error - container just never attempts to inject them.
*/
- if(bean instanceof IDecorator) {
- addError(CDIValidationMessages.INJECTED_DECORATOR, CDIPreferences.INJECTED_DECORATOR_OR_INTERCEPTOR, reference, injection.getResource());
- } else if(bean instanceof IInterceptor) {
- addError(CDIValidationMessages.INJECTED_INTERCEPTOR, CDIPreferences.INJECTED_DECORATOR_OR_INTERCEPTOR, reference, injection.getResource());
- }
+
/*
* 5.4.1. Unproxyable bean types
* - If an injection point whose declared type cannot be proxied by the container resolves to a bean with a normal scope,
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIValidationMessages.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIValidationMessages.java 2011-07-12 17:24:11 UTC (rev 32863)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIValidationMessages.java 2011-07-12 17:24:37 UTC (rev 32864)
@@ -126,8 +126,6 @@
public static String INTERCEPTOR_IS_ALTERNATIVE;
public static String DECORATOR_IS_ALTERNATIVE;
public static String MISSING_INTERCEPTOR_BINDING;
- public static String INJECTED_DECORATOR;
- public static String INJECTED_INTERCEPTOR;
public static String ILLEGAL_SPECIALIZING_MANAGED_BEAN;
public static String ILLEGAL_SPECIALIZING_SESSION_BEAN;
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/messages.properties
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/messages.properties 2011-07-12 17:24:11 UTC (rev 32863)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/messages.properties 2011-07-12 17:24:37 UTC (rev 32864)
@@ -105,8 +105,6 @@
INTERCEPTOR_IS_ALTERNATIVE=Interceptor is an alternative [JSR-299 �2.6.1]
DECORATOR_IS_ALTERNATIVE=Decorator is an alternative [JSR-299 �2.6.1]
MISSING_INTERCEPTOR_BINDING=Interceptor declared using @Interceptor must specify at least one interceptor binding [JSR-299 �9.2]
-INJECTED_DECORATOR=Injection point resolves to a decorator [JSR-299 �5.1.4]
-INJECTED_INTERCEPTOR=Injection point resolves to an interceptor [JSR-299 �5.1.4]
ILLEGAL_SPECIALIZING_MANAGED_BEAN=Managed bean class annotated @Specializes must directly extend the bean class of another managed bean [JSR-299 �3.1.4]
ILLEGAL_SPECIALIZING_SESSION_BEAN=Session bean class annotated @Specializes must directly extend the bean class of another session bean [JSR-299 �3.2.4]
14 years, 9 months
JBoss Tools SVN: r32863 - trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-07-12 13:24:11 -0400 (Tue, 12 Jul 2011)
New Revision: 32863
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIConfigurationBlockDescriptionProvider.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIPreferencesMessages.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIPreferencesMessages.properties
Log:
JBIDE-9313
https://issues.jboss.org/browse/JBIDE-9313
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIConfigurationBlockDescriptionProvider.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIConfigurationBlockDescriptionProvider.java 2011-07-12 17:16:23 UTC (rev 32862)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIConfigurationBlockDescriptionProvider.java 2011-07-12 17:24:11 UTC (rev 32863)
@@ -128,7 +128,6 @@
{CDIPreferences.OBSERVER_IN_INTERCEPTOR_OR_DECORATOR, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_observerInInterceptorOrDecorator_label},
{CDIPreferences.INTERCEPTOR_OR_DECORATOR_IS_ALTERNATIVE, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_interceptorOrDecoratorIsAlternative_label},
{CDIPreferences.MISSING_INTERCEPTOR_BINDING, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_missingInterceptorBinding_label},
- {CDIPreferences.INJECTED_DECORATOR_OR_INTERCEPTOR, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_injectedDecoratorOrInterceptor_label},
{CDIPreferences.DECORATOR_RESOLVES_TO_FINAL_BEAN, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_decoratorResolvesToFinalBean_label},
},
CDICorePlugin.PLUGIN_ID
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIPreferencesMessages.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIPreferencesMessages.java 2011-07-12 17:16:23 UTC (rev 32862)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIPreferencesMessages.java 2011-07-12 17:24:11 UTC (rev 32863)
@@ -105,7 +105,6 @@
public static String CDIValidatorConfigurationBlock_pb_observerInInterceptorOrDecorator_label;
public static String CDIValidatorConfigurationBlock_pb_interceptorOrDecoratorIsAlternative_label;
public static String CDIValidatorConfigurationBlock_pb_missingInterceptorBinding_label;
- public static String CDIValidatorConfigurationBlock_pb_injectedDecoratorOrInterceptor_label;
public static String CDIValidatorConfigurationBlock_pb_decoratorResolvesToFinalBean_label;
// Specializing
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIPreferencesMessages.properties
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIPreferencesMessages.properties 2011-07-12 17:16:23 UTC (rev 32862)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIPreferencesMessages.properties 2011-07-12 17:24:11 UTC (rev 32863)
@@ -93,7 +93,6 @@
CDIValidatorConfigurationBlock_pb_observerInInterceptorOrDecorator_label=Interceptor or decorator annotated @Observes:
CDIValidatorConfigurationBlock_pb_interceptorOrDecoratorIsAlternative_label=Interceptor or decorator is an alternative:
CDIValidatorConfigurationBlock_pb_missingInterceptorBinding_label=Missing interceptor binding:
-CDIValidatorConfigurationBlock_pb_injectedDecoratorOrInterceptor_label=Decorator or interceptor can not be injected:
CDIValidatorConfigurationBlock_pb_decoratorResolvesToFinalBean_label=Decorator bound to managed bean w/ final method/class:
##Specializing
14 years, 9 months
JBoss Tools SVN: r32862 - in trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core: util and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-07-12 13:16:23 -0400 (Tue, 12 Jul 2011)
New Revision: 32862
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DelegatingServerBehavior.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServerBehavior.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerListener.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java
Log:
JBIDE-9277 - Reverting previous patch
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DelegatingServerBehavior.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DelegatingServerBehavior.java 2011-07-12 16:58:10 UTC (rev 32861)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DelegatingServerBehavior.java 2011-07-12 17:16:23 UTC (rev 32862)
@@ -153,9 +153,6 @@
}
protected IStatus canChangeState(String launchMode) {
- if( LaunchCommandPreferences.isIgnoreLaunchCommand(getServer())) {
- return Status.CANCEL_STATUS;
- }
return getDelegate().canChangeState(launchMode);
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServerBehavior.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServerBehavior.java 2011-07-12 16:58:10 UTC (rev 32861)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServerBehavior.java 2011-07-12 17:16:23 UTC (rev 32862)
@@ -155,9 +155,6 @@
return canChangeState(launchMode);
}
protected IStatus canChangeState(String launchMode) {
- if( LaunchCommandPreferences.isIgnoreLaunchCommand(getServer())) {
- return Status.CANCEL_STATUS;
- }
return getDelegate().canChangeState(launchMode);
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerListener.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerListener.java 2011-07-12 16:58:10 UTC (rev 32861)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerListener.java 2011-07-12 17:16:23 UTC (rev 32862)
@@ -32,28 +32,8 @@
return true;
}
- public void init(IServer server) {
- initUnmanagedServerState(server);
- }
-
- protected void initUnmanagedServerState(IServer server) {
- DelegatingServerBehavior beh = ServerConverter.getJBossServerBehavior(server);
- if( beh != null ) {
- String ignoreLaunch = server.getAttribute(IJBossToolingConstants.IGNORE_LAUNCH_COMMANDS, Boolean.toString(false));
- if( new Boolean(ignoreLaunch).booleanValue()) {
- // Assume started already
- beh.setServerStarted();
- }
- }
- }
- public void serverChanged(IServer server) {
- // double check if the user toggled the 'assume started' flag to true
- initUnmanagedServerState(server);
- }
-
public void serverAdded(IServer server) {
ServerUtil.createStandardFolders(server);
- initUnmanagedServerState(server);
}
public void serverRemoved(IServer server) {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java 2011-07-12 16:58:10 UTC (rev 32861)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java 2011-07-12 17:16:23 UTC (rev 32862)
@@ -24,6 +24,7 @@
public static final String AS_51 = "org.jboss.ide.eclipse.as.runtime.51"; //$NON-NLS-1$
public static final String AS_60 = "org.jboss.ide.eclipse.as.runtime.60"; //$NON-NLS-1$
public static final String AS_70 = "org.jboss.ide.eclipse.as.runtime.70"; //$NON-NLS-1$
+ public static final String EAP_RUNTIME_PREFIX = "org.jboss.ide.eclipse.as.runtime.eap."; //$NON-NLS-1$
public static final String EAP_43 = "org.jboss.ide.eclipse.as.runtime.eap.43"; //$NON-NLS-1$
public static final String EAP_50 = "org.jboss.ide.eclipse.as.runtime.eap.50"; //$NON-NLS-1$
@@ -34,6 +35,7 @@
public static final String SERVER_AS_51 = "org.jboss.ide.eclipse.as.51"; //$NON-NLS-1$
public static final String SERVER_AS_60 = "org.jboss.ide.eclipse.as.60"; //$NON-NLS-1$
public static final String SERVER_AS_70 = "org.jboss.ide.eclipse.as.70"; //$NON-NLS-1$
+ public static final String EAP_SERVER_PREFIX = "org.jboss.ide.eclipse.as.eap."; //$NON-NLS-1$
public static final String SERVER_EAP_43 = "org.jboss.ide.eclipse.as.eap.43"; //$NON-NLS-1$
public static final String SERVER_EAP_50 = "org.jboss.ide.eclipse.as.eap.50"; //$NON-NLS-1$
14 years, 9 months
JBoss Tools SVN: r32861 - in trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck: validation and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-07-12 12:58:10 -0400 (Tue, 12 Jul 2011)
New Revision: 32861
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/InterceptorDefinitionTest.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/StereotypeInheritenceTest.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DefenitionErrorsValidationTest.java
Log:
JBIDE-9313
https://issues.jboss.org/browse/JBIDE-9313
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/InterceptorDefinitionTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/InterceptorDefinitionTest.java 2011-07-12 16:54:14 UTC (rev 32860)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/InterceptorDefinitionTest.java 2011-07-12 16:58:10 UTC (rev 32861)
@@ -58,7 +58,7 @@
//Y inherits X indirectly through Q.
//X declares inheritable BindingA and BindingC and non-inheritable BindingB
//Q overrides declaring BindingC with another value.
- Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.interceptors.definition.inheritance.Y");
+ Set<IBean> beans = getBeans(false, "org.jboss.jsr299.tck.tests.interceptors.definition.inheritance.Y");
assertEquals("Wrong number of the beans", 1, beans.size());
IClassBean bean = (IClassBean)beans.iterator().next();
@@ -72,7 +72,7 @@
assertContainsBindingDeclarationWithValue(ds, "org.jboss.jsr299.tck.tests.interceptors.definition.inheritance.BindingC", "c2");
//Y1 inherits X directly.
- beans = getBeans("org.jboss.jsr299.tck.tests.interceptors.definition.inheritance.Y1");
+ beans = getBeans(false, "org.jboss.jsr299.tck.tests.interceptors.definition.inheritance.Y1");
assertEquals("Wrong number of the beans", 1, beans.size());
bean = (IClassBean)beans.iterator().next();
@@ -93,7 +93,7 @@
IInterceptorBinding b = cdiProject.getInterceptorBinding("org.jboss.jsr299.tck.tests.jbt.validation.interceptors.StereotypeAndBinding");
assertNotNull(b);
- Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.jbt.validation.interceptors.InterceptorWithStereotypeThatIsBinding");
+ Set<IBean> beans = getBeans(false, "org.jboss.jsr299.tck.tests.jbt.validation.interceptors.InterceptorWithStereotypeThatIsBinding");
assertEquals("Wrong number of the beans", 1, beans.size());
IBean bean = beans.iterator().next();
assertTrue("The bean should be an interceptor", bean instanceof IClassBean);
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/StereotypeInheritenceTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/StereotypeInheritenceTest.java 2011-07-12 16:54:14 UTC (rev 32860)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/StereotypeInheritenceTest.java 2011-07-12 16:58:10 UTC (rev 32861)
@@ -27,7 +27,7 @@
* @throws JavaModelException
*/
public void testInheritence() throws JavaModelException {
- Set<IBean> beans = getBeans("org.jboss.jsr299.tck.tests.definition.stereotype.inheritance.Horse");
+ Set<IBean> beans = getBeans(false, "org.jboss.jsr299.tck.tests.definition.stereotype.inheritance.Horse");
assertEquals("Wrong number of beans.", 1, beans.size());
IBean bean = beans.iterator().next();
assertEquals("Wrong scope type",
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java 2011-07-12 16:54:14 UTC (rev 32860)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java 2011-07-12 16:58:10 UTC (rev 32861)
@@ -120,6 +120,10 @@
}
protected Set<IBean> getBeans(String typeName, String... qualifierNames) throws JavaModelException {
+ return getBeans(true, typeName, qualifierNames);
+ }
+
+ protected Set<IBean> getBeans(boolean resolve, String typeName, String... qualifierNames) throws JavaModelException {
IParametedType type = getType(typeName);
assertNotNull("Can't find " + typeName + " type.", type);
Set<IType> qualifiers = new HashSet<IType>();
@@ -128,7 +132,7 @@
assertNotNull("Can't find " + name + " type.", qualifier);
qualifiers.add(qualifier);
}
- Set<IBean> beans = cdiProject.getBeans(true, type, qualifiers.toArray(new IType[0]));
+ Set<IBean> beans = cdiProject.getBeans(resolve, type, qualifiers.toArray(new IType[0]));
assertNotNull("There is no beans with " + typeName + " type", beans);
return beans;
}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DefenitionErrorsValidationTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DefenitionErrorsValidationTest.java 2011-07-12 16:54:14 UTC (rev 32860)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DefenitionErrorsValidationTest.java 2011-07-12 16:58:10 UTC (rev 32861)
@@ -982,8 +982,11 @@
* @throws Exception
*/
public void testDecoratorNotResolved() throws Exception {
- IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/decorator/House.java");
- AbstractResourceMarkerTest.assertMarkerIsCreated(file, CDIValidationMessages.INJECTED_DECORATOR, 23);
+ /* Now we exclude decorators from resolved beans.
+ * Another test is required - that getBeans(false) - returns decorator, and getBeans(true) does not.
+ */
+// IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/decorator/House.java");
+// AbstractResourceMarkerTest.assertMarkerIsCreated(file, CDIValidationMessages.INJECTED_DECORATOR, 23);
}
/**
@@ -993,8 +996,11 @@
* @throws Exception
*/
public void testInterceptorNotResolved() throws Exception {
- IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/interceptors/InjectInterceptorBroken.java");
- AbstractResourceMarkerTest.assertMarkerIsCreated(file, CDIValidationMessages.INJECTED_INTERCEPTOR, 7);
+/* Now we exclude interceptors from resolved beans.
+ * Another test is required - that getBeans(false) - returns interceptor, and getBeans(true) does not.
+ */
+// IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/interceptors/InjectInterceptorBroken.java");
+// AbstractResourceMarkerTest.assertMarkerIsCreated(file, CDIValidationMessages.INJECTED_INTERCEPTOR, 7);
}
/**
14 years, 9 months