JBoss Tools SVN: r32730 - trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-07-07 19:09:44 -0400 (Thu, 07 Jul 2011)
New Revision: 32730
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/IncrementalValidationTest.java
Log:
https://issues.jboss.org/browse/JBIDE-9306
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/IncrementalValidationTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/IncrementalValidationTest.java 2011-07-07 23:02:21 UTC (rev 32729)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/IncrementalValidationTest.java 2011-07-07 23:09:44 UTC (rev 32730)
@@ -100,37 +100,36 @@
* @throws Exception
*/
public void testAlternativesInBeansXml() throws Exception {
-// boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false);
-// JobUtils.waitForIdle();
-//
-// try {
-// IFile bean = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/beansxml/incremental/Test3.java");
-// AbstractResourceMarkerTest.assertMarkerIsNotCreated(bean, CDIValidationMessages.UNSATISFIED_INJECTION_POINTS, 8);
-//
-// IFile beansXml = tckProject.getFile("JavaSource/META-INF/beans.xml");
-// IFile emptyBeansXml = tckProject.getFile("JavaSource/META-INF/beans.xml.empty");
-//
-// ValidatorManager.setStatus("TESTING");
-// beansXml.setContents(emptyBeansXml.getContents(), IFile.FORCE, new NullProgressMonitor());
-// tckProject.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor());
-// TestUtil.waitForValidation(tckProject);
-//
-// AbstractResourceMarkerTest.assertMarkerIsCreated(bean, CDIValidationMessages.UNSATISFIED_INJECTION_POINTS, 8);
-//
-// IFile beansXmlWithAlternative = tckProject.getFile("JavaSource/META-INF/beans.xml.with.alternative");
-//
-// ValidatorManager.setStatus("TESTING");
-// beansXml.setContents(beansXmlWithAlternative.getContents(), IFile.FORCE, new NullProgressMonitor());
-// tckProject.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor());
-// TestUtil.waitForValidation(tckProject);
-//
-// AbstractResourceMarkerTest.assertMarkerIsNotCreated(bean, CDIValidationMessages.UNSATISFIED_INJECTION_POINTS, 8);
-// } finally {
-// IFile beansXml = tckProject.getFile("JavaSource/META-INF/beans.xml");
-// IFile beansXmlWithAlternative = tckProject.getFile("JavaSource/META-INF/beans.xml.with.alternative");
-// beansXml.setContents(beansXmlWithAlternative.getContents(), IFile.FORCE, new NullProgressMonitor());
-// ResourcesUtils.setBuildAutomatically(saveAutoBuild);
-// JobUtils.waitForIdle();
-// }
+ boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false);
+ JobUtils.waitForIdle();
+
+ try {
+ IFile bean = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/beansxml/incremental/Test3.java");
+ AbstractResourceMarkerTest.assertMarkerIsNotCreated(bean, CDIValidationMessages.UNSATISFIED_INJECTION_POINTS, 8);
+
+ IFile beansXml = tckProject.getFile("JavaSource/META-INF/beans.xml");
+ IFile emptyBeansXml = tckProject.getFile("JavaSource/META-INF/beans.xml.empty");
+
+ ValidatorManager.setStatus("TESTING ALTERNATIVES 1");
+ beansXml.setContents(emptyBeansXml.getContents(), IFile.FORCE, new NullProgressMonitor());
+ tckProject.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor());
+ TestUtil.waitForValidation(tckProject);
+ AbstractResourceMarkerTest.assertMarkerIsCreated(bean, CDIValidationMessages.UNSATISFIED_INJECTION_POINTS, 8);
+
+ IFile beansXmlWithAlternative = tckProject.getFile("JavaSource/META-INF/beans.xml.with.alternative");
+
+ ValidatorManager.setStatus("TESTING ALTERNATIVES 2");
+ beansXml.setContents(beansXmlWithAlternative.getContents(), IFile.FORCE, new NullProgressMonitor());
+ tckProject.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor());
+ TestUtil.waitForValidation(tckProject);
+
+ AbstractResourceMarkerTest.assertMarkerIsNotCreated(bean, CDIValidationMessages.UNSATISFIED_INJECTION_POINTS, 8);
+ } finally {
+ IFile beansXml = tckProject.getFile("JavaSource/META-INF/beans.xml");
+ IFile beansXmlWithAlternative = tckProject.getFile("JavaSource/META-INF/beans.xml.with.alternative");
+ beansXml.setContents(beansXmlWithAlternative.getContents(), IFile.FORCE, new NullProgressMonitor());
+ ResourcesUtils.setBuildAutomatically(saveAutoBuild);
+ JobUtils.waitForIdle();
+ }
}
}
\ No newline at end of file
14 years, 9 months
JBoss Tools SVN: r32729 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-07-07 19:02:21 -0400 (Thu, 07 Jul 2011)
New Revision: 32729
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/BeansXMLDefinition.java
Log:
JBIDE-9306
https://issues.jboss.org/browse/JBIDE-9306
updating model object before updating cdi model.
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/BeansXMLDefinition.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/BeansXMLDefinition.java 2011-07-07 22:54:20 UTC (rev 32728)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/BeansXMLDefinition.java 2011-07-07 23:02:21 UTC (rev 32729)
@@ -15,6 +15,8 @@
import org.eclipse.core.runtime.IPath;
import org.jboss.tools.common.model.XModelObject;
+import org.jboss.tools.common.model.filesystems.impl.FileAnyImpl;
+import org.jboss.tools.common.model.filesystems.impl.FolderImpl;
import org.jboss.tools.common.text.INodeReference;
/**
@@ -39,7 +41,12 @@
public void setBeansXML(XModelObject beansXML) {
if(beansXML.getModelEntity().getName().startsWith("FileCDIBeans")) {
-
+ if(beansXML instanceof FileAnyImpl) {
+ FileAnyImpl f = (FileAnyImpl)beansXML;
+ if(f.getParent() instanceof FolderImpl) {
+ ((FolderImpl)f.getParent()).update();
+ }
+ }
XModelObject interceptorsObject = beansXML.getChildByPath(NODE_INTERCEPTORS);
if(interceptorsObject != null) {
XModelObject[] cs = interceptorsObject.getChildren();
14 years, 9 months
JBoss Tools SVN: r32728 - trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-07-07 18:54:20 -0400 (Thu, 07 Jul 2011)
New Revision: 32728
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebNatureOperation.java
Log:
JBIDE-9111
https://issues.jboss.org/browse/JBIDE-9111
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebNatureOperation.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebNatureOperation.java 2011-07-07 22:53:57 UTC (rev 32727)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebNatureOperation.java 2011-07-07 22:54:20 UTC (rev 32728)
@@ -22,11 +22,14 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IProjectDescription;
import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.WorkspaceJob;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Status;
import org.eclipse.jdt.core.IClasspathEntry;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.JavaCore;
@@ -312,11 +315,9 @@
}
fs.setModified(true);
model.save();
- if(registry.isEnabled()) ModelPlugin.getDefault().getWorkbench().getDisplay().asyncExec(new Runnable() {
- public void run() {
- RegistrationHelper.runRegisterInServerJob(getProject(), registry.getTargetServers(), null);
- }
- });
+ if(registry.isEnabled()) {
+ RegistrationHelper.runRegisterInServerJob(getProject(), registry.getTargetServers(), null);
+ }
}
protected boolean checkOverwrite() {
@@ -484,13 +485,28 @@
private void createWTPNature2(AbstractOperation wcco, IProgressMonitor monitor) {
try {
if(wcco != null) wcco.execute(monitor, null);
- IFacetedProject fp = ProjectFacetsManager.create(getProject());
- fp.setRuntime(findFacetRuntime(null/*runtime*/), monitor);
+ new RuntimeJob().schedule();
} catch (Exception e) {
WebUiPlugin.getPluginLog().logError(e);
}
}
+
+ class RuntimeJob extends WorkspaceJob {
+
+ public RuntimeJob() {
+ super("Set runtime"); //$NON-NLS-1$
+ }
+
+ @Override
+ public IStatus runInWorkspace(IProgressMonitor monitor)
+ throws CoreException {
+ IFacetedProject fp = ProjectFacetsManager.create(getProject());
+ fp.setRuntime(findFacetRuntime(null/*runtime*/), monitor);
+ return Status.OK_STATUS;
+ }
+
+ }
protected boolean isLinkingToProjectOutsideWorkspace() {
return false;
14 years, 9 months
JBoss Tools SVN: r32727 - trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/server.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-07-07 18:53:57 -0400 (Thu, 07 Jul 2011)
New Revision: 32727
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/server/RegistrationHelper.java
Log:
JBIDE-9111
https://issues.jboss.org/browse/JBIDE-9111
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/server/RegistrationHelper.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/server/RegistrationHelper.java 2011-07-07 19:28:19 UTC (rev 32726)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/server/RegistrationHelper.java 2011-07-07 22:53:57 UTC (rev 32727)
@@ -13,6 +13,7 @@
import java.text.MessageFormat;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IWorkspaceRunnable;
+import org.eclipse.core.resources.WorkspaceJob;
import org.eclipse.core.runtime.*;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.osgi.util.NLS;
@@ -213,7 +214,7 @@
// registerInJob
- private static class RegisterServerJob extends Job {
+ private static class RegisterServerJob extends WorkspaceJob {
long counter = 100;
IProject p;
IServer[] servers;
@@ -225,7 +226,7 @@
this.contextRoot = contextRoot;
}
- protected IStatus run(IProgressMonitor monitor) {
+ public IStatus runInWorkspace(IProgressMonitor monitor) {
try {
if(RegistrationHelper.findModule(p) == null) {
counter *= 2;
14 years, 9 months
JBoss Tools SVN: r32726 - trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/actions.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-07-07 15:28:19 -0400 (Thu, 07 Jul 2011)
New Revision: 32726
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/actions/SelectRulerAction.java
Log:
https://issues.jboss.org/browse/JBIDE-9209
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/actions/SelectRulerAction.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/actions/SelectRulerAction.java 2011-07-07 19:27:26 UTC (rev 32725)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/actions/SelectRulerAction.java 2011-07-07 19:28:19 UTC (rev 32726)
@@ -24,7 +24,6 @@
@Override
protected IAction createAction(ITextEditor editor, IVerticalRulerInfo rulerInfo) {
- if(action == null)
action = new SelectAnnotationRulerAction(ResourceBundle.getBundle("org.eclipse.jdt.internal.ui.javaeditor.ConstructedJavaEditorMessages"), "JavaSelectAnnotationRulerAction.", editor, rulerInfo); //$NON-NLS-1$
return action;
}
14 years, 9 months
JBoss Tools SVN: r32725 - in trunk: cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-07-07 15:27:26 -0400 (Thu, 07 Jul 2011)
New Revision: 32725
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/CDISeamResourceLoadingHyperlink.java
trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/CDIHyperlinkTestUtil.java
trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/AbstractHyperlink.java
Log:
https://issues.jboss.org/browse/JBIDE-8202
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/CDISeamResourceLoadingHyperlink.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/CDISeamResourceLoadingHyperlink.java 2011-07-07 18:59:42 UTC (rev 32724)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/CDISeamResourceLoadingHyperlink.java 2011-07-07 19:27:26 UTC (rev 32725)
@@ -39,10 +39,15 @@
protected IRegion doGetHyperlinkRegion(int offset) {
return region;
}
+
+ @Override
+ public IFile getReadyToOpenFile(){
+ return getFileFromProject(path);
+ }
@Override
protected void doHyperlink(IRegion region) {
- IFile file = getFileFromProject(path);
+ IFile file = getReadyToOpenFile();
IEditorPart part = openFileInEditor(file);
if(part == null)
openFileFailed();
Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/CDIHyperlinkTestUtil.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/CDIHyperlinkTestUtil.java 2011-07-07 18:59:42 UTC (rev 32724)
+++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/CDIHyperlinkTestUtil.java 2011-07-07 19:27:26 UTC (rev 32725)
@@ -37,6 +37,7 @@
import org.jboss.tools.common.editor.ObjectMultiPageEditor;
import org.jboss.tools.common.model.ui.editor.EditorPartWrapper;
import org.jboss.tools.common.model.ui.texteditors.XMLTextEditorStandAlone;
+import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink;
import org.jboss.tools.common.text.ext.hyperlink.HyperlinkDetector;
import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkRegion;
import org.jboss.tools.common.text.ext.util.AxisUtil;
@@ -136,12 +137,12 @@
assertEquals("Unexpected hyperlink type", testLink.hyperlink, link.getClass());
assertTrue("Validation fails for hyperlink - "+link.getHyperlinkText(), testLink.validateHyperlink(link));
if(testLink.fileName != null){
- link.open();
- IEditorPart editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
- IFileEditorInput input = (IFileEditorInput)editor.getEditorInput();
- IFile f = input.getFile();
+ assertTrue("HyperLink must be inherited from AbstractHyperlink", link instanceof AbstractHyperlink);
+
+ IFile f = ((AbstractHyperlink)link).getReadyToOpenFile();
+ assertNotNull("HyperLink must return not null file", f);
assertEquals(testLink.fileName, f.getName());
- editor.dispose();
+
}
}
Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/AbstractHyperlink.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/AbstractHyperlink.java 2011-07-07 18:59:42 UTC (rev 32724)
+++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/AbstractHyperlink.java 2011-07-07 19:27:26 UTC (rev 32725)
@@ -327,5 +327,13 @@
};
return jarEditorInput;
}
+
+ /**
+ * for test purpose
+ * @return
+ */
+ public IFile getReadyToOpenFile(){
+ return null;
+ }
}
14 years, 9 months
JBoss Tools SVN: r32724 - in trunk/cdi: tests/org.jboss.tools.cdi.core.test/projects/tck/JavaSource and 5 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-07-07 14:59:42 -0400 (Thu, 07 Jul 2011)
New Revision: 32724
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/tck/JavaSource/META-INF/
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/tck/JavaSource/META-INF/beans.xml
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/tck/JavaSource/META-INF/beans.xml.empty
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/tck/JavaSource/META-INF/beans.xml.with.alternative
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/beansxml/incremental/
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/beansxml/incremental/Test1.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/beansxml/incremental/Test3.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/beansxml/incremental/TestAlt.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/IncrementalValidationTest.java
Removed:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/tck/JavaSource/placeholder.txt
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/BeansXmlValidationDelegate.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DeploymentProblemsValidationTests.java
Log:
https://issues.jboss.org/browse/JBIDE-9306
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/BeansXmlValidationDelegate.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/BeansXmlValidationDelegate.java 2011-07-07 18:42:06 UTC (rev 32723)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/BeansXmlValidationDelegate.java 2011-07-07 18:59:42 UTC (rev 32724)
@@ -14,6 +14,7 @@
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -187,6 +188,14 @@
if(type!=null) {
if(!type.isBinary()) {
validator.getValidationContext().addLinkedCoreResource(CDICoreValidator.SHORT_ID, beansXml.getFullPath().toOSString(), type.getPath(), false);
+ Set<IPath> relatedResources = new HashSet<IPath>();
+ IResource resource = type.getResource();
+ if(resource instanceof IFile) {
+ validator.collectAllRelatedInjectionsForBean((IFile)resource, relatedResources);
+ for (IPath path : relatedResources) {
+ validator.getValidationContext().addLinkedCoreResource(CDICoreValidator.SHORT_ID, path.toOSString(), beansXml.getFullPath(), false);
+ }
+ }
}
if(!typeValidator.validateKindOfType(type)) {
validator.addError(typeValidator.getIllegalTypeErrorMessage(), CDIPreferences.ILLEGAL_TYPE_NAME_IN_BEANS_XML,
@@ -225,7 +234,7 @@
private Map<IProject, IJavaProject> javaProjects;
- private IJavaProject getJavaProject(IResource resource) {
+ public IJavaProject getJavaProject(IResource resource) {
if(javaProjects == null) {
javaProjects = new HashMap<IProject, IJavaProject>();
}
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-07 18:42:06 UTC (rev 32723)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2011-07-07 18:59:42 UTC (rev 32724)
@@ -91,6 +91,7 @@
import org.jboss.tools.common.java.ParametedType;
import org.jboss.tools.common.model.util.EclipseJavaUtil;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
+import org.jboss.tools.common.text.INodeReference;
import org.jboss.tools.common.text.ITextSourceReference;
import org.jboss.tools.jst.web.kb.internal.validation.ContextValidationHelper;
import org.jboss.tools.jst.web.kb.internal.validation.ValidatorManager;
@@ -1380,6 +1381,35 @@
}
private void collectAllRelatedInjections(IFile validatingResource, Set<IPath> relatedResources) {
+ collectAllRelatedInjectionsForBean(validatingResource, relatedResources);
+ if("beans.xml".equals(validatingResource.getName().toLowerCase())) {
+ List<INodeReference> nodes = cdiProject.getAlternativeClasses();
+ collectAllRelatedInjectionsForNode(nodes, relatedResources);
+ nodes = cdiProject.getDecoratorClasses();
+ collectAllRelatedInjectionsForNode(nodes, relatedResources);
+ nodes = cdiProject.getInterceptorClasses();
+ collectAllRelatedInjectionsForNode(nodes, relatedResources);
+ }
+ }
+
+ private void collectAllRelatedInjectionsForNode(List<INodeReference> nodes, Set<IPath> relatedResources) {
+ try {
+ for (INodeReference node : nodes) {
+ String className = node.getValue();
+ IType type = EclipseJavaUtil.findType(beansXmlValidator.getJavaProject(node.getResource()), className);
+ if(type!=null && !type.isBinary()) {
+ IResource resource = type.getResource();
+ if(type!=null && resource instanceof IFile) {
+ collectAllRelatedInjectionsForBean((IFile)resource, relatedResources);
+ }
+ }
+ }
+ } catch (JavaModelException e) {
+ CDICorePlugin.getDefault().logError(e);
+ }
+ }
+
+ public void collectAllRelatedInjectionsForBean(IFile validatingResource, Set<IPath> relatedResources) {
Set<IBean> beans = cdiProject.getBeans(validatingResource.getFullPath());
for (IBean bean : beans) {
Set<IParametedType> types = bean.getAllTypes();
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/tck/JavaSource/META-INF/beans.xml
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/tck/JavaSource/META-INF/beans.xml (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/tck/JavaSource/META-INF/beans.xml 2011-07-07 18:59:42 UTC (rev 32724)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://java.sun.com/xml/ns/javaee"
+ 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">
+ <alternatives>
+ <class>org.jboss.jsr299.tck.tests.jbt.validation.beansxml.incremental.Test1</class>
+ </alternatives>
+</beans>
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/tck/JavaSource/META-INF/beans.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/tck/JavaSource/META-INF/beans.xml.empty
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/tck/JavaSource/META-INF/beans.xml.empty (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/tck/JavaSource/META-INF/beans.xml.empty 2011-07-07 18:59:42 UTC (rev 32724)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://java.sun.com/xml/ns/javaee"
+ 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">
+</beans>
\ No newline at end of file
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/tck/JavaSource/META-INF/beans.xml.with.alternative
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/tck/JavaSource/META-INF/beans.xml.with.alternative (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/tck/JavaSource/META-INF/beans.xml.with.alternative 2011-07-07 18:59:42 UTC (rev 32724)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://java.sun.com/xml/ns/javaee"
+ 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">
+ <alternatives>
+ <class>org.jboss.jsr299.tck.tests.jbt.validation.beansxml.incremental.Test1</class>
+ </alternatives>
+</beans>
\ No newline at end of file
Deleted: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/tck/JavaSource/placeholder.txt
===================================================================
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/beansxml/incremental/Test1.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/beansxml/incremental/Test1.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/beansxml/incremental/Test1.java 2011-07-07 18:59:42 UTC (rev 32724)
@@ -0,0 +1,8 @@
+package org.jboss.jsr299.tck.tests.jbt.validation.beansxml.incremental;
+
+import javax.enterprise.inject.Alternative;
+
+@Alternative
+public class Test1 extends TestAlt {
+
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/beansxml/incremental/Test1.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/beansxml/incremental/Test3.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/beansxml/incremental/Test3.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/beansxml/incremental/Test3.java 2011-07-07 18:59:42 UTC (rev 32724)
@@ -0,0 +1,9 @@
+package org.jboss.jsr299.tck.tests.jbt.validation.beansxml.incremental;
+
+import javax.inject.Inject;
+
+public class Test3 {
+
+ // See META-INF/beans.xml
+ @Inject TestAlt test;
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/beansxml/incremental/Test3.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/beansxml/incremental/TestAlt.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/beansxml/incremental/TestAlt.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/beansxml/incremental/TestAlt.java 2011-07-07 18:59:42 UTC (rev 32724)
@@ -0,0 +1,8 @@
+package org.jboss.jsr299.tck.tests.jbt.validation.beansxml.incremental;
+
+import javax.enterprise.inject.Alternative;
+
+@Alternative
+public class TestAlt {
+
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/beansxml/incremental/TestAlt.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java 2011-07-07 18:42:06 UTC (rev 32723)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java 2011-07-07 18:59:42 UTC (rev 32724)
@@ -52,6 +52,7 @@
import org.jboss.tools.cdi.core.test.tck.validation.DeploymentProblemsValidationTests;
import org.jboss.tools.cdi.core.test.tck.validation.DisableCDISupportTest;
import org.jboss.tools.cdi.core.test.tck.validation.ELValidationTest;
+import org.jboss.tools.cdi.core.test.tck.validation.IncrementalValidationTest;
import org.jboss.tools.test.util.ProjectImportTestSetup;
/**
@@ -99,6 +100,7 @@
suite.addTestSuite(AnnotationsValidationTest.class);
suite.addTestSuite(CoreValidationTest.class);
suite.addTestSuite(ELValidationTest.class);
+ suite.addTestSuite(IncrementalValidationTest.class);
suiteAll.addTestSuite(TwoWebContentFoldersTest.class);
suiteAll.addTestSuite(RemoveJarFromClasspathTest.class);
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DeploymentProblemsValidationTests.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DeploymentProblemsValidationTests.java 2011-07-07 18:42:06 UTC (rev 32723)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DeploymentProblemsValidationTests.java 2011-07-07 18:59:42 UTC (rev 32724)
@@ -14,13 +14,7 @@
import java.text.MessageFormat;
import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.runtime.NullProgressMonitor;
import org.jboss.tools.cdi.internal.core.validation.CDIValidationMessages;
-import org.jboss.tools.jst.jsp.test.TestUtil;
-import org.jboss.tools.jst.web.kb.internal.validation.ValidatorManager;
-import org.jboss.tools.test.util.JobUtils;
-import org.jboss.tools.test.util.ResourcesUtils;
import org.jboss.tools.tests.AbstractResourceMarkerTest;
/**
@@ -251,76 +245,6 @@
}
/**
- * See https://issues.jboss.org/browse/JBIDE-8325
- * @throws Exception
- */
- public void testInjectionPointRevalidation() throws Exception {
- boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false);
- JobUtils.waitForIdle();
-
- IFile testInjection = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/inject/revalidation/TestBeanBroken.java");
- AbstractResourceMarkerTest.assertMarkerIsNotCreated(testInjection, CDIValidationMessages.AMBIGUOUS_INJECTION_POINTS, 7);
- AbstractResourceMarkerTest.assertMarkerIsNotCreated(testInjection, CDIValidationMessages.UNSATISFIED_INJECTION_POINTS, 7);
-
- IFile testBean = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/inject/revalidation/TestBeanImpl2.java");
- IFile testBeanImpl = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/inject/revalidation/TestBeanImpl2.validation");
- testBean.setContents(testBeanImpl.getContents(), IFile.FORCE, new NullProgressMonitor());
- JobUtils.waitForIdle(1000);
- tckProject.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor());
- JobUtils.waitForIdle(1000);
-
- AbstractResourceMarkerTest.assertMarkerIsCreated(testInjection, CDIValidationMessages.AMBIGUOUS_INJECTION_POINTS, 7);
-
- testBeanImpl = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/inject/revalidation/TestBeanImpl2.java");
- testBean = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/inject/revalidation/TestBeanImpl2Original.validation");
- testBeanImpl.setContents(testBean.getContents(), IFile.FORCE, new NullProgressMonitor());
- JobUtils.waitForIdle(1000);
- tckProject.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor());
- JobUtils.waitForIdle(1000);
-
- AbstractResourceMarkerTest.assertMarkerIsNotCreated(testInjection, CDIValidationMessages.AMBIGUOUS_INJECTION_POINTS, 7);
- AbstractResourceMarkerTest.assertMarkerIsNotCreated(testInjection, CDIValidationMessages.UNSATISFIED_INJECTION_POINTS, 7);
-
- ResourcesUtils.setBuildAutomatically(saveAutoBuild);
- JobUtils.waitForIdle();
- }
-
- /**
- * See https://issues.jboss.org/browse/JBIDE-9071
- * @throws Exception
- */
- public void testInjectionPointResolvedToProducerRevalidation() throws Exception {
- boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false);
- JobUtils.waitForIdle();
-
- IFile testInjection = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/inject/revalidation/TestBeanForProducerBroken.java");
- AbstractResourceMarkerTest.assertMarkerIsNotCreated(testInjection, CDIValidationMessages.AMBIGUOUS_INJECTION_POINTS, 7);
- AbstractResourceMarkerTest.assertMarkerIsNotCreated(testInjection, CDIValidationMessages.UNSATISFIED_INJECTION_POINTS, 7);
-
- IFile testBean = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/inject/revalidation/MarketPlace.java");
- IFile testBeanImpl = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/inject/revalidation/MarketPlace.validation");
- ValidatorManager.setStatus("TESTING");
- testBean.setContents(testBeanImpl.getContents(), IFile.FORCE, new NullProgressMonitor());
- tckProject.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor());
- TestUtil.waitForValidation(tckProject);
-
- AbstractResourceMarkerTest.assertMarkerIsCreated(testInjection, CDIValidationMessages.AMBIGUOUS_INJECTION_POINTS, 7);
-
- testBeanImpl = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/inject/revalidation/MarketPlace.java");
- testBean = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/inject/revalidation/MarketPlaceOriginal.validation");
- ValidatorManager.setStatus("TESTING");
- testBeanImpl.setContents(testBean.getContents(), IFile.FORCE, new NullProgressMonitor());
- tckProject.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor());
- TestUtil.waitForValidation(tckProject);
-
- AbstractResourceMarkerTest.assertMarkerIsNotCreated(testInjection, CDIValidationMessages.AMBIGUOUS_INJECTION_POINTS, 7);
- AbstractResourceMarkerTest.assertMarkerIsNotCreated(testInjection, CDIValidationMessages.UNSATISFIED_INJECTION_POINTS, 7);
-
- ResourcesUtils.setBuildAutomatically(saveAutoBuild);
- JobUtils.waitForIdle();
- }
-
- /**
* 6.6.4 Validation of passivation capable beans and dependencies
* - If a managed bean which declares a passivating scope is not passivation capable, then the container automatically detects the problem and treats it as a deployment problem.
*
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/IncrementalValidationTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/IncrementalValidationTest.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/IncrementalValidationTest.java 2011-07-07 18:59:42 UTC (rev 32724)
@@ -0,0 +1,136 @@
+/*******************************************************************************
+ * 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.core.test.tck.validation;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IncrementalProjectBuilder;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.jboss.tools.cdi.internal.core.validation.CDIValidationMessages;
+import org.jboss.tools.jst.jsp.test.TestUtil;
+import org.jboss.tools.jst.web.kb.internal.validation.ValidatorManager;
+import org.jboss.tools.test.util.JobUtils;
+import org.jboss.tools.test.util.ResourcesUtils;
+import org.jboss.tools.tests.AbstractResourceMarkerTest;
+
+/**
+ * @author Alexey Kazakov
+ */
+public class IncrementalValidationTest extends ValidationTest {
+
+ /**
+ * See https://issues.jboss.org/browse/JBIDE-8325
+ * @throws Exception
+ */
+ public void testInjectionPointRevalidation() throws Exception {
+ boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false);
+ JobUtils.waitForIdle();
+
+ IFile testInjection = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/inject/revalidation/TestBeanBroken.java");
+ AbstractResourceMarkerTest.assertMarkerIsNotCreated(testInjection, CDIValidationMessages.AMBIGUOUS_INJECTION_POINTS, 7);
+ AbstractResourceMarkerTest.assertMarkerIsNotCreated(testInjection, CDIValidationMessages.UNSATISFIED_INJECTION_POINTS, 7);
+
+ IFile testBean = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/inject/revalidation/TestBeanImpl2.java");
+ IFile testBeanImpl = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/inject/revalidation/TestBeanImpl2.validation");
+ testBean.setContents(testBeanImpl.getContents(), IFile.FORCE, new NullProgressMonitor());
+ JobUtils.waitForIdle(1000);
+ tckProject.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor());
+ JobUtils.waitForIdle(1000);
+
+ AbstractResourceMarkerTest.assertMarkerIsCreated(testInjection, CDIValidationMessages.AMBIGUOUS_INJECTION_POINTS, 7);
+
+ testBeanImpl = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/inject/revalidation/TestBeanImpl2.java");
+ testBean = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/inject/revalidation/TestBeanImpl2Original.validation");
+ testBeanImpl.setContents(testBean.getContents(), IFile.FORCE, new NullProgressMonitor());
+ JobUtils.waitForIdle(1000);
+ tckProject.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor());
+ JobUtils.waitForIdle(1000);
+
+ AbstractResourceMarkerTest.assertMarkerIsNotCreated(testInjection, CDIValidationMessages.AMBIGUOUS_INJECTION_POINTS, 7);
+ AbstractResourceMarkerTest.assertMarkerIsNotCreated(testInjection, CDIValidationMessages.UNSATISFIED_INJECTION_POINTS, 7);
+
+ ResourcesUtils.setBuildAutomatically(saveAutoBuild);
+ JobUtils.waitForIdle();
+ }
+
+ /**
+ * See https://issues.jboss.org/browse/JBIDE-9071
+ * @throws Exception
+ */
+ public void testInjectionPointResolvedToProducerRevalidation() throws Exception {
+ boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false);
+ JobUtils.waitForIdle();
+
+ IFile testInjection = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/inject/revalidation/TestBeanForProducerBroken.java");
+ AbstractResourceMarkerTest.assertMarkerIsNotCreated(testInjection, CDIValidationMessages.AMBIGUOUS_INJECTION_POINTS, 7);
+ AbstractResourceMarkerTest.assertMarkerIsNotCreated(testInjection, CDIValidationMessages.UNSATISFIED_INJECTION_POINTS, 7);
+
+ IFile testBean = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/inject/revalidation/MarketPlace.java");
+ IFile testBeanImpl = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/inject/revalidation/MarketPlace.validation");
+ ValidatorManager.setStatus("TESTING");
+ testBean.setContents(testBeanImpl.getContents(), IFile.FORCE, new NullProgressMonitor());
+ tckProject.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor());
+ TestUtil.waitForValidation(tckProject);
+
+ AbstractResourceMarkerTest.assertMarkerIsCreated(testInjection, CDIValidationMessages.AMBIGUOUS_INJECTION_POINTS, 7);
+
+ testBeanImpl = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/inject/revalidation/MarketPlace.java");
+ testBean = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/inject/revalidation/MarketPlaceOriginal.validation");
+ ValidatorManager.setStatus("TESTING");
+ testBeanImpl.setContents(testBean.getContents(), IFile.FORCE, new NullProgressMonitor());
+ tckProject.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor());
+ TestUtil.waitForValidation(tckProject);
+
+ AbstractResourceMarkerTest.assertMarkerIsNotCreated(testInjection, CDIValidationMessages.AMBIGUOUS_INJECTION_POINTS, 7);
+ AbstractResourceMarkerTest.assertMarkerIsNotCreated(testInjection, CDIValidationMessages.UNSATISFIED_INJECTION_POINTS, 7);
+
+ ResourcesUtils.setBuildAutomatically(saveAutoBuild);
+ JobUtils.waitForIdle();
+ }
+
+ /**
+ * See https://issues.jboss.org/browse/JBIDE-9306
+ * @throws Exception
+ */
+ public void testAlternativesInBeansXml() throws Exception {
+// boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false);
+// JobUtils.waitForIdle();
+//
+// try {
+// IFile bean = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/beansxml/incremental/Test3.java");
+// AbstractResourceMarkerTest.assertMarkerIsNotCreated(bean, CDIValidationMessages.UNSATISFIED_INJECTION_POINTS, 8);
+//
+// IFile beansXml = tckProject.getFile("JavaSource/META-INF/beans.xml");
+// IFile emptyBeansXml = tckProject.getFile("JavaSource/META-INF/beans.xml.empty");
+//
+// ValidatorManager.setStatus("TESTING");
+// beansXml.setContents(emptyBeansXml.getContents(), IFile.FORCE, new NullProgressMonitor());
+// tckProject.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor());
+// TestUtil.waitForValidation(tckProject);
+//
+// AbstractResourceMarkerTest.assertMarkerIsCreated(bean, CDIValidationMessages.UNSATISFIED_INJECTION_POINTS, 8);
+//
+// IFile beansXmlWithAlternative = tckProject.getFile("JavaSource/META-INF/beans.xml.with.alternative");
+//
+// ValidatorManager.setStatus("TESTING");
+// beansXml.setContents(beansXmlWithAlternative.getContents(), IFile.FORCE, new NullProgressMonitor());
+// tckProject.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor());
+// TestUtil.waitForValidation(tckProject);
+//
+// AbstractResourceMarkerTest.assertMarkerIsNotCreated(bean, CDIValidationMessages.UNSATISFIED_INJECTION_POINTS, 8);
+// } finally {
+// IFile beansXml = tckProject.getFile("JavaSource/META-INF/beans.xml");
+// IFile beansXmlWithAlternative = tckProject.getFile("JavaSource/META-INF/beans.xml.with.alternative");
+// beansXml.setContents(beansXmlWithAlternative.getContents(), IFile.FORCE, new NullProgressMonitor());
+// ResourcesUtils.setBuildAutomatically(saveAutoBuild);
+// JobUtils.waitForIdle();
+// }
+ }
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/IncrementalValidationTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
14 years, 9 months
JBoss Tools SVN: r32723 - in trunk/cdi/tests: org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-07-07 14:42:06 -0400 (Thu, 07 Jul 2011)
New Revision: 32723
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/CDISeamResourceLoadingHyperlinkDetectorTest.java
trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/CDIHyperlinkTestUtil.java
Log:
https://issues.jboss.org/browse/JBIDE-8202
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/CDISeamResourceLoadingHyperlinkDetectorTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/CDISeamResourceLoadingHyperlinkDetectorTest.java 2011-07-07 18:03:43 UTC (rev 32722)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/CDISeamResourceLoadingHyperlinkDetectorTest.java 2011-07-07 18:42:06 UTC (rev 32723)
@@ -26,7 +26,8 @@
int injectPosition = text.indexOf("@Inject");
//System.out.println("injectPosition - "+injectPosition);
if(injectPosition > 0){
- regionList.add(new TestRegion(injectPosition, 58, new TestHyperlink[]{new TestHyperlink(CDISeamResourceLoadingHyperlink.class, NLS.bind(CDISeamExtMessages.CDI_SEAM_RESOURCE_LOADING_HYPERLINK, "WEB-INF/beans.xml"))}));
+ regionList.add(new TestRegion(injectPosition, 58,
+ new TestHyperlink[]{new TestHyperlink(CDISeamResourceLoadingHyperlink.class, NLS.bind(CDISeamExtMessages.CDI_SEAM_RESOURCE_LOADING_HYPERLINK, "WEB-INF/beans.xml", "WebContent/WEB-INF/beans.xml"))}));
}
CDIHyperlinkTestUtil.checkRegions(tckProject, FILENAME, regionList, new CDISeamResourceLoadingHyperlinkDetector());
Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/CDIHyperlinkTestUtil.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/CDIHyperlinkTestUtil.java 2011-07-07 18:03:43 UTC (rev 32722)
+++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/CDIHyperlinkTestUtil.java 2011-07-07 18:42:06 UTC (rev 32723)
@@ -18,6 +18,7 @@
import org.eclipse.jface.text.hyperlink.IHyperlink;
import org.eclipse.jface.text.source.ISourceViewer;
import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IFileEditorInput;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
@@ -42,6 +43,7 @@
import org.jboss.tools.jst.web.ui.editors.WebCompoundEditor;
public class CDIHyperlinkTestUtil extends TestCase{
+
public static void checkRegions(IProject project, String fileName, List<TestRegion> regionList, AbstractHyperlinkDetector elPartitioner) throws Exception {
IFile file = project.getFile(fileName);
@@ -133,6 +135,14 @@
assertNotNull("Unexpected hyperlink - "+link.getHyperlinkText(), testLink);
assertEquals("Unexpected hyperlink type", testLink.hyperlink, link.getClass());
assertTrue("Validation fails for hyperlink - "+link.getHyperlinkText(), testLink.validateHyperlink(link));
+ if(testLink.fileName != null){
+ link.open();
+ IEditorPart editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
+ IFileEditorInput input = (IFileEditorInput)editor.getEditorInput();
+ IFile f = input.getFile();
+ assertEquals(testLink.fileName, f.getName());
+ editor.dispose();
+ }
}
for(TestHyperlink testLink : testRegion.hyperlinks){
@@ -342,7 +352,13 @@
ICDIElement element = null;
String[] elementPaths = null;
String name;
+ String fileName=null;
+ public TestHyperlink(Class<? extends IHyperlink> hyperlink, String name, String fileName){
+ this(hyperlink, name);
+ this.fileName = fileName;
+ }
+
public TestHyperlink(Class<? extends IHyperlink> hyperlink, String name){
this.hyperlink = hyperlink;
this.name = name;
14 years, 9 months
JBoss Tools SVN: r32722 - trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-07-07 14:03:43 -0400 (Thu, 07 Jul 2011)
New Revision: 32722
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/CDISeamResourceLoadingHyperlink.java
Log:
https://issues.jboss.org/browse/JBIDE-8202
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/CDISeamResourceLoadingHyperlink.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/CDISeamResourceLoadingHyperlink.java 2011-07-07 17:11:57 UTC (rev 32721)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/CDISeamResourceLoadingHyperlink.java 2011-07-07 18:03:43 UTC (rev 32722)
@@ -42,7 +42,7 @@
@Override
protected void doHyperlink(IRegion region) {
- IFile file = getFile().getProject().getFile(path);
+ IFile file = getFileFromProject(path);
IEditorPart part = openFileInEditor(file);
if(part == null)
openFileFailed();
14 years, 9 months
JBoss Tools SVN: r32721 - in trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor: util and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2011-07-07 13:11:57 -0400 (Thu, 07 Jul 2011)
New Revision: 32721
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/VpeResourcesDialogFactory.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/FileUtil.java
Log:
https://issues.jboss.org/browse/JBIDE-8719 : Show default root folder in Page Desigh Options Dialog on top of the Actual Run-Time Folders tab content
- changed resolving of default WebRoot folder path
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/VpeResourcesDialogFactory.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/VpeResourcesDialogFactory.java 2011-07-07 16:53:35 UTC (rev 32720)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/VpeResourcesDialogFactory.java 2011-07-07 17:11:57 UTC (rev 32721)
@@ -11,6 +11,7 @@
package org.jboss.tools.vpe.editor.preferences;
import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
import org.eclipse.core.runtime.IPath;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IFileEditorInput;
@@ -18,15 +19,21 @@
import org.eclipse.ui.editors.text.ILocationProvider;
import org.jboss.tools.common.resref.core.ResourceReference;
import org.jboss.tools.vpe.VpePlugin;
+import org.jboss.tools.vpe.editor.util.FileUtil;
import org.jboss.tools.vpe.editor.util.VpeStyleUtil;
import org.jboss.tools.vpe.messages.VpeUIMessages;
import org.jboss.tools.vpe.resref.core.VpeResourcesDialog;
public class VpeResourcesDialogFactory {
public static void openVpeResourcesDialog(IEditorInput input) {
+ IPath absoluteDefaultPath = null;
Object fileLocation = null;
if (input instanceof IFileEditorInput) {
IFile file = ((IFileEditorInput) input).getFile();
+ IFolder absoluteDefaultFolder = FileUtil.getDefaultWebRootFolder(file);
+ if (absoluteDefaultFolder != null) {
+ absoluteDefaultPath = absoluteDefaultFolder.getLocation();
+ }
fileLocation = file;
} else if (input instanceof ILocationProvider) {
ILocationProvider provider = (ILocationProvider) input;
@@ -35,9 +42,9 @@
fileLocation = path;
}
}
+
+ IPath relativeDafaultPath = VpeStyleUtil.getInputParentPath(input);
if (null != fileLocation) {
- IPath absoluteDefaultPath = VpeStyleUtil.getRootPath(input);
- IPath relativeDafaultPath = VpeStyleUtil.getInputParentPath(input);
VpeResourcesDialog dialogNew =
new VpeResourcesDialog(
PlatformUI.getWorkbench().getDisplay().getActiveShell(),
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/FileUtil.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/FileUtil.java 2011-07-07 16:53:35 UTC (rev 32720)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/FileUtil.java 2011-07-07 17:11:57 UTC (rev 32721)
@@ -23,6 +23,7 @@
import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.ResourcesPlugin;
@@ -256,14 +257,9 @@
} else {
//WebArtifactEdit edit = WebArtifactEdit
// .getWebArtifactEditForRead(includeFile.getProject());
- IVirtualComponent com = ComponentCore
- .createComponent(includeFile.getProject());
- if (com != null) {
- IVirtualFolder webRootFolder = com.getRootFolder().getFolder(
- new Path("/")); //$NON-NLS-1$
- IContainer folder = webRootFolder.getUnderlyingFolder();
- IPath path = folder.getFullPath().append(fileName);
- file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
+ IFolder defaultWebRootFolder = getDefaultWebRootFolder(includeFile);
+ if (defaultWebRootFolder != null) {
+ file = defaultWebRootFolder.getFile(fileName);
} else {
/* Yahor Radtsevich (yradtsevich):
* Fix of JBIDE-4416: assume that the parent directory
@@ -286,7 +282,28 @@
}
return file;
}
+
+ public static IFolder getDefaultWebRootFolder(IFile file) {
+ IProject project = file.getProject();
+ if (project == null) {
+ return null;
+ }
+ IVirtualComponent component = ComponentCore.createComponent(project);
+ if (component == null) {
+ return null;
+ }
+
+ IVirtualFolder webRootFolder = component.getRootFolder()
+ .getFolder(new Path("/")); //$NON-NLS-1$
+ IPath defaultWebRootPath = webRootFolder.getUnderlyingFolder().getFullPath();
+ if (defaultWebRootPath == null) {
+ return null;
+ }
+
+ return ResourcesPlugin.getWorkspace().getRoot().getFolder(defaultWebRootPath);
+ }
+
/**
* Appends {@code relatedFilePath} to the parent directory of
* {@code baseFile}.
14 years, 9 months