July 2011 - jbosstools-commits - Jboss List Archives

JBoss Tools SVN: r33334 - trunk/documentation/guides/Beginners_Guide/en-US.

by jbosstools-commits＠lists.jboss.org

Author: irooskov(a)redhat.com Date: 2011-07-28 21:52:58 -0400 (Thu, 28 Jul 2011) New Revision: 33334 Modified: trunk/documentation/guides/Beginners_Guide/en-US/Revision_History.xml Log: updated for new publican Modified: trunk/documentation/guides/Beginners_Guide/en-US/Revision_History.xml =================================================================== --- trunk/documentation/guides/Beginners_Guide/en-US/Revision_History.xml 2011-07-29 01:50:04 UTC (rev 33333) +++ trunk/documentation/guides/Beginners_Guide/en-US/Revision_History.xml 2011-07-29 01:52:58 UTC (rev 33334) @@ -5,7 +5,7 @@ <simpara> <revhistory> <revision> - <revnumber>2</revnumber> + <revnumber>1-2</revnumber> <date>Wed Jan 12 2011</date> <author> <firstname>Matthew</firstname> @@ -19,7 +19,7 @@ </revdescription> </revision> <revision> - <revnumber>1</revnumber> + <revnumber>1-1</revnumber> <date>Mon Feb 22 2010</date> <author> <firstname>Isaac</firstname> @@ -33,7 +33,7 @@ </revdescription> </revision> <revision> - <revnumber>0</revnumber> + <revnumber>1-0</revnumber> <date>Thu Nov 26 2009</date> <author> <firstname>Isaac</firstname>

12 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r33333 - trunk/drools/docs/guvnor_ref/en-US.

by jbosstools-commits＠lists.jboss.org

Author: irooskov(a)redhat.com Date: 2011-07-28 21:50:04 -0400 (Thu, 28 Jul 2011) New Revision: 33333 Modified: trunk/drools/docs/guvnor_ref/en-US/Revision_History.xml Log: updated revision history Modified: trunk/drools/docs/guvnor_ref/en-US/Revision_History.xml =================================================================== --- trunk/drools/docs/guvnor_ref/en-US/Revision_History.xml 2011-07-29 01:47:48 UTC (rev 33332) +++ trunk/drools/docs/guvnor_ref/en-US/Revision_History.xml 2011-07-29 01:50:04 UTC (rev 33333) @@ -6,7 +6,7 @@ <simpara> <revhistory> <revision> - <revnumber>2</revnumber> + <revnumber>1-2</revnumber> <date>Thu Jan 20 2011</date> <author> <firstname>JBoss Tools</firstname> @@ -20,7 +20,7 @@ </revdescription> </revision> <revision> - <revnumber>1</revnumber> + <revnumber>1-1</revnumber> <date>Wed Jun 09 2010</date> <author> <firstname>JBoss Tools</firstname> @@ -34,7 +34,7 @@ </revdescription> </revision> <revision> - <revnumber>0</revnumber> + <revnumber>1-0</revnumber> <date>Fri Nov 20 2009</date> <author> <firstname>Isaac</firstname>

12 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r33332 - trunk/deltacloud/docs/Cloud_Tools_Reference_Guide/en-US.

by jbosstools-commits＠lists.jboss.org

Author: irooskov(a)redhat.com Date: 2011-07-28 21:47:48 -0400 (Thu, 28 Jul 2011) New Revision: 33332 Modified: trunk/deltacloud/docs/Cloud_Tools_Reference_Guide/en-US/Revision_History.xml Log: updated revision history for new publican Modified: trunk/deltacloud/docs/Cloud_Tools_Reference_Guide/en-US/Revision_History.xml =================================================================== --- trunk/deltacloud/docs/Cloud_Tools_Reference_Guide/en-US/Revision_History.xml 2011-07-29 01:15:06 UTC (rev 33331) +++ trunk/deltacloud/docs/Cloud_Tools_Reference_Guide/en-US/Revision_History.xml 2011-07-29 01:47:48 UTC (rev 33332) @@ -8,7 +8,7 @@ <simpara> <revhistory> <revision> - <revnumber>1</revnumber> + <revnumber>1-1</revnumber> <date>Mon Jan 10 2011</date> <author> <firstname>Matthew</firstname> @@ -22,7 +22,7 @@ </revdescription> </revision> <revision> - <revnumber>0</revnumber> + <revnumber>1-0</revnumber> <date>Fri Sep 24 2010</date> <author> <firstname>Isaac</firstname>

12 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r33331 - in trunk: cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test and 4 other directories.

by jbosstools-commits＠lists.jboss.org

Author: akazakov Date: 2011-07-28 21:15:06 -0400 (Thu, 28 Jul 2011) New Revision: 33331 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/NPEValidation.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/ValidationExceptionTest.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/ValidationExceptionTestSuite.java trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/validation/KBValidationException.java Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/WebKbPlugin.java trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ValidatorManager.java Log: https://issues.jboss.org/browse/JBIDE-9423 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/NPEValidation.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/NPEValidation.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/NPEValidation.java 2011-07-29 01:15:06 UTC (rev 33331) @@ -0,0 +1,17 @@ +package org.jboss.jsr299.tck.tests.jbt.validation; + +import javax.enterprise.inject.Produces; +import javax.inject.Inject; + +public class NPEValidation extends UnResolvedClass implements UnResolvedInterface { + + @Inject UnResolvedType t; + + @Inject + public UnResolvedType set(UnResolvedType p) { + } + + @Produces + public UnResolvedType produce() { + } +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/NPEValidation.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-29 00:18:02 UTC (rev 33330) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java 2011-07-29 01:15:06 UTC (rev 33331) @@ -67,6 +67,7 @@ // it could be done here because it is not needed to be enabled back JavaModelManager.getIndexManager().disable(); +// ValidationExceptionTestSuite suiteAll = new ValidationExceptionTestSuite("CDI Core Tests"); TestSuite suiteAll = new TestSuite("CDI Core Tests"); suiteAll.addTestSuite(TypeTest.class); TestSuite suite = new TestSuite("TCK Tests"); @@ -132,6 +133,7 @@ suiteAll.addTestSuite(DisableCDISupportTest.class); +// suiteAll.addTestSuite(ValidationExceptionTest.class); // This test should be added last! return suiteAll; } } \ No newline at end of file Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/ValidationExceptionTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/ValidationExceptionTest.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/ValidationExceptionTest.java 2011-07-29 01:15:06 UTC (rev 33331) @@ -0,0 +1,32 @@ +/******************************************************************************* + * 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 java.util.Set; + +import junit.framework.TestCase; + +import org.eclipse.core.runtime.IStatus; + +/** + * @author Alexey Kazakov + */ +public class ValidationExceptionTest extends TestCase { + + public void testExceptions() { + Set<IStatus> exceptions = ValidationExceptionTestSuite.getExceptions(); + StringBuffer error = new StringBuffer("The following exceptions were thrown during project validation:"); + for (IStatus status : exceptions) { + error.append("\r\n").append(status.getException().toString()); + } + assertTrue(error.toString(), exceptions.isEmpty()); + } +} \ 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/ValidationExceptionTest.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/ValidationExceptionTestSuite.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/ValidationExceptionTestSuite.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/ValidationExceptionTestSuite.java 2011-07-29 01:15:06 UTC (rev 33331) @@ -0,0 +1,66 @@ +/******************************************************************************* + * 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 java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +import junit.framework.TestSuite; + +import org.eclipse.core.runtime.ILogListener; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Platform; +import org.jboss.tools.jst.web.kb.WebKbPlugin; +import org.jboss.tools.jst.web.kb.validation.KBValidationException; + +/** + * @author Alexey Kazakov + */ +public class ValidationExceptionTestSuite extends TestSuite implements ILogListener { + + private static Map<String, Set<IStatus>> EXCEPTIONS = new HashMap<String, Set<IStatus>>(); + + public ValidationExceptionTestSuite(String name) { + super(name); + Platform.addLogListener(this); + } + + /* + * (non-Javadoc) + * @see org.eclipse.core.runtime.ILogListener#logging(org.eclipse.core.runtime.IStatus, java.lang.String) + */ + public void logging(IStatus status, String plugin) { + Set<IStatus> statuses = EXCEPTIONS.get(plugin); + if(statuses==null) { + statuses = new HashSet<IStatus>(); + EXCEPTIONS.put(plugin, statuses); + } + statuses.add(status); + } + + public static boolean hasExceptions() { + return !getExceptions().isEmpty(); + } + + public static Set<IStatus> getExceptions() { + Set<IStatus> result = new HashSet<IStatus>(); + Set<IStatus> statuses = EXCEPTIONS.get(WebKbPlugin.PLUGIN_ID); + for (IStatus status : statuses) { + Throwable exception = status.getException(); + if(exception instanceof KBValidationException) { + result.add(status); + } + } + return result; + } +} \ 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/ValidationExceptionTestSuite.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/WebKbPlugin.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/WebKbPlugin.java 2011-07-29 00:18:02 UTC (rev 33330) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/WebKbPlugin.java 2011-07-29 01:15:06 UTC (rev 33331) @@ -6,7 +6,6 @@ import java.util.Set; import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.ISaveContext; import org.eclipse.core.resources.ISaveParticipant; import org.eclipse.core.resources.ResourcesPlugin; Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ValidatorManager.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ValidatorManager.java 2011-07-29 00:18:02 UTC (rev 33330) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ValidatorManager.java 2011-07-29 01:15:06 UTC (rev 33331) @@ -25,6 +25,7 @@ import org.eclipse.core.runtime.IExtension; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Platform; +import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.ISchedulingRule; import org.eclipse.osgi.util.NLS; import org.eclipse.wst.validation.internal.core.ValidationException; @@ -38,6 +39,7 @@ import org.jboss.tools.jst.web.kb.validation.IValidatingProjectSet; import org.jboss.tools.jst.web.kb.validation.IValidationContextManager; import org.jboss.tools.jst.web.kb.validation.IValidator; +import org.jboss.tools.jst.web.kb.validation.KBValidationException; /** * This Manager invokes all dependent validators that should be invoked in one job. @@ -52,6 +54,8 @@ public static final String RUNNING = "Running"; //$NON-NLS-1$ private static String STATUS = SLEEPING; + private final IStatus EXCEPTION_STATUS = new Status(IStatus.ERROR, WebKbPlugin.PLUGIN_ID, 0, "EXCEPTION", null); //$NON-NLS-1$ //$NON-NLS-2$ + public ValidatorManager() { super(); } @@ -107,6 +111,10 @@ } } return status; + } catch(Exception e) { + // We need to catch exceptions and wrap them in KBValidationException to let JUnit tests catch validation exceptions reported to eclipse log. + WebKbPlugin.getDefault().logError(new KBValidationException(e.getMessage(), e)); + return EXCEPTION_STATUS; } finally { STATUS = SLEEPING; } Added: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/validation/KBValidationException.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/validation/KBValidationException.java (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/validation/KBValidationException.java 2011-07-29 01:15:06 UTC (rev 33331) @@ -0,0 +1,25 @@ +/******************************************************************************* + * 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.jst.web.kb.validation; + +/** + * Presents an exception that can be thrown during KB validation. + * + * @author Alexey Kazakov + */ +public class KBValidationException extends Exception { + + private static final long serialVersionUID = -1958111192543021067L; + + public KBValidationException(String message, Throwable cause) { + super(message, cause); + } +} \ No newline at end of file Property changes on: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/validation/KBValidationException.java ___________________________________________________________________ Added: svn:mime-type + text/plain

12 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r33330 - 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-28 20:18:02 -0400 (Thu, 28 Jul 2011) New Revision: 33330 Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/InjectedPointHyperlinkTest.java trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/XMLInjectedPointHyperlinkDetectorTest.java 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/EventAndObserverMethodHyperlinkDetectorTest.java trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/InjectedPointHyperlinkDetectorTest.java trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/ProducerDisposerHyperlinkDetectorTest.java Log: https://issues.jboss.org/browse/JBIDE-9419 Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/InjectedPointHyperlinkTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/InjectedPointHyperlinkTest.java 2011-07-28 22:37:43 UTC (rev 33329) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/InjectedPointHyperlinkTest.java 2011-07-29 00:18:02 UTC (rev 33330) @@ -20,28 +20,28 @@ bean = b; } ArrayList<TestRegion> regionList = new ArrayList<TestRegion>(); - regionList.add(new TestRegion(97, 6, new TestHyperlink[]{ + regionList.add(new TestRegion(/*97, 6*/"Inject", new TestHyperlink[]{ new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " MessageManager.messageDispatcherProducer()", bean), })); // Inject - regionList.add(new TestRegion(106, 7, new TestHyperlink[]{ + regionList.add(new TestRegion(/*106, 7*/"Durable", new TestHyperlink[]{ new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " MessageManager.messageDispatcherProducer()", bean), })); // Logger - regionList.add(new TestRegion(115, 28, new TestHyperlink[]{ + regionList.add(new TestRegion(/*115, 28*/"MessageDispatcher dispatcher", new TestHyperlink[]{ new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " MessageManager.messageDispatcherProducer()", bean), })); // logger - regionList.add(new TestRegion(148, 6, new TestHyperlink[]{ + regionList.add(new TestRegion(/*148, 6*/"Inject", new TestHyperlink[]{ new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " MessageManager.getPolicy()", bean), })); // logger - regionList.add(new TestRegion(157, 7, new TestHyperlink[]{ + regionList.add(new TestRegion(/*157, 7*/"Durable", new TestHyperlink[]{ new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " MessageManager.getPolicy()", bean), })); // logger - regionList.add(new TestRegion(166, 23, new TestHyperlink[]{ + regionList.add(new TestRegion(/*166, 23*/"DispatcherPolicy policy", new TestHyperlink[]{ new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " MessageManager.getPolicy()", bean), })); // logger - regionList.add(new TestRegion(281, 31, new TestHyperlink[]{ + regionList.add(new TestRegion(/*281, 31*/"Durable DispatcherPolicy policy", new TestHyperlink[]{ new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " MessageManager.getPolicy()", bean), })); // logger - regionList.add(new TestRegion(318, 6, new TestHyperlink[]{ + regionList.add(new TestRegion(/*318, 6*/"policy", new TestHyperlink[]{ new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " MessageManager.getPolicy()", bean), })); // logger Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/XMLInjectedPointHyperlinkDetectorTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/XMLInjectedPointHyperlinkDetectorTest.java 2011-07-28 22:37:43 UTC (rev 33329) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/XMLInjectedPointHyperlinkDetectorTest.java 2011-07-29 00:18:02 UTC (rev 33330) @@ -16,7 +16,7 @@ public void testXMLInjectedPointHyperlinkDetector() throws Exception { ArrayList<TestRegion> regionList = new ArrayList<TestRegion>(); - regionList.add(new TestRegion(2166, 15, new TestHyperlink[]{ + regionList.add(new TestRegion(2166, 15/*"s:Inject"*/, new TestHyperlink[]{ new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " MyBean6.myType6") //new TestHyperlink(AlternativeInjectedPointListHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_SHOW_ALTERNATIVES) })); 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-28 22:37:43 UTC (rev 33329) +++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/CDIHyperlinkTestUtil.java 2011-07-29 00:18:02 UTC (rev 33330) @@ -11,6 +11,8 @@ import org.eclipse.core.runtime.IAdaptable; import org.eclipse.jdt.internal.ui.javaeditor.JavaEditor; import org.eclipse.jdt.internal.ui.text.JavaWordFinder; +import org.eclipse.jface.text.BadLocationException; +import org.eclipse.jface.text.FindReplaceDocumentAdapter; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IRegion; import org.eclipse.jface.text.Region; @@ -73,6 +75,9 @@ IDocument document = documentProvider.getDocument(editorInput); assertNotNull("The document for the file \"" + fileName + "\" is not loaded", document); + + if(regionList.get(0).region == null) + loadRegions(regionList, document); int expected = 0; for(TestRegion testRegion : regionList) @@ -99,6 +104,10 @@ int counter = 0; for (int i = 0; i < document.getLength(); i++) { + int lineNumber = document.getLineOfOffset(i); + int position = i - document.getLineOffset(lineNumber)+1; + lineNumber++; + TestData testData = new TestData(document, i); IHyperlink[] links = elPartitioner.detectHyperlinks(viewer, testData.getHyperlinkRegion(), true); @@ -110,7 +119,8 @@ counter++; TestRegion testRegion = findOffsetInRegions(i, regionList); if(testRegion == null){ - fail("Wrong detection for offset - "+i); + String information = findRegionInformation(document, i, regionList); + fail("Wrong detection for offset - "+i+" (line - "+lineNumber+" position - "+position+") "+information); }else{ checkTestRegion(links, testRegion); } @@ -118,8 +128,7 @@ else { for(TestRegion testRegion : regionList){ if(i >= testRegion.region.getOffset() && i <= testRegion.region.getOffset()+testRegion.region.getLength()) { - int line = document.getLineOfOffset(testRegion.region.getOffset()); - fail("Wrong detection for region - "+testRegion.region.getOffset()+" : "+testRegion.region.getLength()+" region - "+i); + fail("Wrong detection for region - "+getRegionInformation(document, testRegion)+" offset - "+i+" (line - "+lineNumber+" position - "+position+")"); } } } @@ -167,6 +176,30 @@ } return null; } + + private static void loadRegions(List<TestRegion> regionList, IDocument document) throws BadLocationException{ + FindReplaceDocumentAdapter adapter = new FindReplaceDocumentAdapter(document); + //String documentText = document.get(); + //int position = documentText.indexOf("{"); + IRegion region = adapter.find(0, "{", true, true, false, false); + if(region == null) + region = new Region(0,0); + for(TestRegion testRegion : regionList){ + //int newPosition = documentText.indexOf(testRegion.regionText, position); + IRegion newRegion = adapter.find(region.getOffset()+region.getLength(), testRegion.regionText, true, true, false, false); + if(newRegion != null){ + testRegion.region = newRegion; + region = newRegion; + }else + fail("Can not find string - "+testRegion.regionText); + } + + for(int i = regionList.size()-1; i >= 0; i--){ + TestRegion r = regionList.get(i); + if(r.hyperlinks.size() == 0) + regionList.remove(r); + } + } public static void checkHyperLinkInXml(IProject project, String fileName, int offset, String hyperlinkClassName) throws Exception { checkHyperLinkInXml(fileName, project, offset, hyperlinkClassName); @@ -214,6 +247,34 @@ } return null; } + + private static String findRegionInformation(IDocument document, int offset, List<TestRegion> regionList) throws BadLocationException{ + int index = 0; + for(int i = 0; i < regionList.size(); i++){ + TestRegion testRegion = regionList.get(i); + if(offset > testRegion.region.getOffset()+testRegion.region.getLength()){ + index = i; + } + } + String info = "previous region - " + getRegionInformation(document, regionList.get(index)); + if(index+1 < regionList.size()) + info += " next region - " + getRegionInformation(document, regionList.get(index+1)); + return info; + } + + private static String getRegionInformation(IDocument document, TestRegion region) throws BadLocationException{ + String info = ""; + int lineNumber = document.getLineOfOffset(region.region.getOffset()); + int position = region.region.getOffset() - document.getLineOffset(lineNumber)+1; + lineNumber++; + + if(region.regionText != null) + info += "<"+region.regionText+"> "; + + info += region.region.getOffset()+" - "+(region.region.getOffset()+region.region.getLength())+" line - "+lineNumber+" position - "+position; + + return info; + } public static IEditorPart openFileInEditor(IFile input) { return openFileInEditor(input, null); @@ -337,7 +398,8 @@ } public static class TestRegion{ - Region region; + IRegion region = null; + String regionText = null; ArrayList<TestHyperlink> hyperlinks = new ArrayList<TestHyperlink>(); public TestRegion(int offset, int length, TestHyperlink[] testHyperlinks){ @@ -346,6 +408,13 @@ hyperlinks.add(testHyperlink); } } + + public TestRegion(String regionText, TestHyperlink[] testHyperlinks){ + this.regionText = regionText; + for(TestHyperlink testHyperlink : testHyperlinks){ + hyperlinks.add(testHyperlink); + } + } } public static class TestHyperlink{ Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/EventAndObserverMethodHyperlinkDetectorTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/EventAndObserverMethodHyperlinkDetectorTest.java 2011-07-28 22:37:43 UTC (rev 33329) +++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/EventAndObserverMethodHyperlinkDetectorTest.java 2011-07-29 00:18:02 UTC (rev 33330) @@ -35,19 +35,18 @@ ArrayList<TestRegion> regionList = new ArrayList<TestRegion>(); - regionList.add(new TestRegion(959, 6, new TestHyperlink[]{new TestHyperlink(ObserverMethodListHyperlink.class, CDIExtensionsMessages.CDI_EVENT_LIST_HYPERLINK_OPEN_OBSERVER_METHODS, elementPaths)})); - regionList.add(new TestRegion(967, 16, new TestHyperlink[]{new TestHyperlink(ObserverMethodListHyperlink.class, CDIExtensionsMessages.CDI_EVENT_LIST_HYPERLINK_OPEN_OBSERVER_METHODS, elementPaths)})); - regionList.add(new TestRegion(985, 11, new TestHyperlink[]{new TestHyperlink(ObserverMethodListHyperlink.class, CDIExtensionsMessages.CDI_EVENT_LIST_HYPERLINK_OPEN_OBSERVER_METHODS, elementPaths)})); - regionList.add(new TestRegion(1006, 6, new TestHyperlink[]{new TestHyperlink(ObserverMethodListHyperlink.class, CDIExtensionsMessages.CDI_EVENT_LIST_HYPERLINK_OPEN_OBSERVER_METHODS, elementPaths)})); - regionList.add(new TestRegion(1014, 3, new TestHyperlink[]{new TestHyperlink(ObserverMethodListHyperlink.class, CDIExtensionsMessages.CDI_EVENT_LIST_HYPERLINK_OPEN_OBSERVER_METHODS, elementPaths)})); - regionList.add(new TestRegion(1019, 34, new TestHyperlink[]{new TestHyperlink(ObserverMethodListHyperlink.class, CDIExtensionsMessages.CDI_EVENT_LIST_HYPERLINK_OPEN_OBSERVER_METHODS, elementPaths)})); - regionList.add(new TestRegion(1055, 42, new TestHyperlink[]{new TestHyperlink(ObserverMethodListHyperlink.class, CDIExtensionsMessages.CDI_EVENT_LIST_HYPERLINK_OPEN_OBSERVER_METHODS, elementPaths)})); - regionList.add(new TestRegion(1107, 6, new TestHyperlink[]{new TestHyperlink(ObserverMethodListHyperlink.class, CDIExtensionsMessages.CDI_EVENT_LIST_HYPERLINK_OPEN_OBSERVER_METHODS, elementPaths)})); - regionList.add(new TestRegion(1115, 34, new TestHyperlink[]{new TestHyperlink(ObserverMethodListHyperlink.class, CDIExtensionsMessages.CDI_EVENT_LIST_HYPERLINK_OPEN_OBSERVER_METHODS, elementPaths)})); - regionList.add(new TestRegion(1151, 36, new TestHyperlink[]{new TestHyperlink(ObserverMethodListHyperlink.class, CDIExtensionsMessages.CDI_EVENT_LIST_HYPERLINK_OPEN_OBSERVER_METHODS, elementPaths)})); - regionList.add(new TestRegion(1188, 3, new TestHyperlink[]{new TestHyperlink(ObserverMethodListHyperlink.class, CDIExtensionsMessages.CDI_EVENT_LIST_HYPERLINK_OPEN_OBSERVER_METHODS, elementPaths)})); - regionList.add(new TestRegion(1235, 11, new TestHyperlink[]{new TestHyperlink(ObserverMethodListHyperlink.class, CDIExtensionsMessages.CDI_EVENT_LIST_HYPERLINK_OPEN_OBSERVER_METHODS, elementPaths)})); - regionList.add(new TestRegion(1334, 42, new TestHyperlink[]{new TestHyperlink(ObserverMethodListHyperlink.class, CDIExtensionsMessages.CDI_EVENT_LIST_HYPERLINK_OPEN_OBSERVER_METHODS, elementPaths)})); + regionList.add(new TestRegion(/*959, 6*/"Inject", new TestHyperlink[]{new TestHyperlink(ObserverMethodListHyperlink.class, CDIExtensionsMessages.CDI_EVENT_LIST_HYPERLINK_OPEN_OBSERVER_METHODS, elementPaths)})); + regionList.add(new TestRegion(/*967, 16*/"Any Event<String", new TestHyperlink[]{new TestHyperlink(ObserverMethodListHyperlink.class, CDIExtensionsMessages.CDI_EVENT_LIST_HYPERLINK_OPEN_OBSERVER_METHODS, elementPaths)})); + regionList.add(new TestRegion(/*985, 11*/"stringEvent", new TestHyperlink[]{new TestHyperlink(ObserverMethodListHyperlink.class, CDIExtensionsMessages.CDI_EVENT_LIST_HYPERLINK_OPEN_OBSERVER_METHODS, elementPaths)})); + regionList.add(new TestRegion(/*1006, 6*/"Inject", new TestHyperlink[]{new TestHyperlink(ObserverMethodListHyperlink.class, CDIExtensionsMessages.CDI_EVENT_LIST_HYPERLINK_OPEN_OBSERVER_METHODS, elementPaths)})); + regionList.add(new TestRegion(/*1014, 3*/"Any", new TestHyperlink[]{new TestHyperlink(ObserverMethodListHyperlink.class, CDIExtensionsMessages.CDI_EVENT_LIST_HYPERLINK_OPEN_OBSERVER_METHODS, elementPaths)})); + regionList.add(new TestRegion(/*1019, 34*/"NonRuntimeBindingType Event<String", new TestHyperlink[]{new TestHyperlink(ObserverMethodListHyperlink.class, CDIExtensionsMessages.CDI_EVENT_LIST_HYPERLINK_OPEN_OBSERVER_METHODS, elementPaths)})); + regionList.add(new TestRegion(/*1055, 42*/"stringEventWithAnyAndNonRuntimeBindingType", new TestHyperlink[]{new TestHyperlink(ObserverMethodListHyperlink.class, CDIExtensionsMessages.CDI_EVENT_LIST_HYPERLINK_OPEN_OBSERVER_METHODS, elementPaths)})); + regionList.add(new TestRegion(/*1107, 6*/"Inject", new TestHyperlink[]{new TestHyperlink(ObserverMethodListHyperlink.class, CDIExtensionsMessages.CDI_EVENT_LIST_HYPERLINK_OPEN_OBSERVER_METHODS, elementPaths)})); + regionList.add(new TestRegion(/*1115, 34*/"NonRuntimeBindingType Event<String", new TestHyperlink[]{new TestHyperlink(ObserverMethodListHyperlink.class, CDIExtensionsMessages.CDI_EVENT_LIST_HYPERLINK_OPEN_OBSERVER_METHODS, elementPaths)})); + regionList.add(new TestRegion(/*1151, 36*/"stringEventWithOnlyNonRuntimeBindingType", new TestHyperlink[]{new TestHyperlink(ObserverMethodListHyperlink.class, CDIExtensionsMessages.CDI_EVENT_LIST_HYPERLINK_OPEN_OBSERVER_METHODS, elementPaths)})); + regionList.add(new TestRegion(/*1235, 11*/"stringEvent", new TestHyperlink[]{new TestHyperlink(ObserverMethodListHyperlink.class, CDIExtensionsMessages.CDI_EVENT_LIST_HYPERLINK_OPEN_OBSERVER_METHODS, elementPaths)})); + regionList.add(new TestRegion(/*1334, 42*/"stringEventWithAnyAndNonRuntimeBindingType", new TestHyperlink[]{new TestHyperlink(ObserverMethodListHyperlink.class, CDIExtensionsMessages.CDI_EVENT_LIST_HYPERLINK_OPEN_OBSERVER_METHODS, elementPaths)})); CDIHyperlinkTestUtil.checkRegions(tckProject, "JavaSource/org/jboss/jsr299/tck/tests/event/bindingTypes/EventEmitter.java", regionList, new EventAndObserverMethodHyperlinkDetector()); } @@ -62,11 +61,10 @@ ArrayList<TestRegion> regionList = new ArrayList<TestRegion>(); - regionList.add(new TestRegion(1196, 4, new TestHyperlink[]{new TestHyperlink(EventListHyperlink.class, CDIExtensionsMessages.CDI_EVENT_LIST_HYPERLINK_OPEN_EVENTS, elementPaths)})); - regionList.add(new TestRegion(1201, 13, new TestHyperlink[]{new TestHyperlink(EventListHyperlink.class, CDIExtensionsMessages.CDI_EVENT_LIST_HYPERLINK_OPEN_EVENTS, elementPaths)})); - regionList.add(new TestRegion(1216, 15, new TestHyperlink[]{new TestHyperlink(EventListHyperlink.class, CDIExtensionsMessages.CDI_EVENT_LIST_HYPERLINK_OPEN_EVENTS, elementPaths)})); - regionList.add(new TestRegion(1232, 9, new TestHyperlink[]{new TestHyperlink(EventListHyperlink.class, CDIExtensionsMessages.CDI_EVENT_LIST_HYPERLINK_OPEN_EVENTS, elementPaths)})); - regionList.add(new TestRegion(1264, 18, new TestHyperlink[]{new TestHyperlink(EventListHyperlink.class, CDIExtensionsMessages.CDI_EVENT_LIST_HYPERLINK_OPEN_EVENTS, elementPaths)})); + regionList.add(new TestRegion(/*1201, 13*/"observeSimpleEvent", new TestHyperlink[]{new TestHyperlink(EventListHyperlink.class, CDIExtensionsMessages.CDI_EVENT_LIST_HYPERLINK_OPEN_EVENTS, elementPaths)})); + regionList.add(new TestRegion(/*1216, 15*/"Observes String", new TestHyperlink[]{new TestHyperlink(EventListHyperlink.class, CDIExtensionsMessages.CDI_EVENT_LIST_HYPERLINK_OPEN_EVENTS, elementPaths)})); + regionList.add(new TestRegion(/*1232, 9*/"someEvent", new TestHyperlink[]{new TestHyperlink(EventListHyperlink.class, CDIExtensionsMessages.CDI_EVENT_LIST_HYPERLINK_OPEN_EVENTS, elementPaths)})); + regionList.add(new TestRegion(/*1264, 18*/"OversizedException", new TestHyperlink[]{new TestHyperlink(EventListHyperlink.class, CDIExtensionsMessages.CDI_EVENT_LIST_HYPERLINK_OPEN_EVENTS, elementPaths)})); CDIHyperlinkTestUtil.checkRegions(tckProject, "JavaSource/org/jboss/jsr299/tck/tests/event/observer/checkedException/TeaCupPomeranian.java", regionList, new EventAndObserverMethodHyperlinkDetector()); } Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/InjectedPointHyperlinkDetectorTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/InjectedPointHyperlinkDetectorTest.java 2011-07-28 22:37:43 UTC (rev 33329) +++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/InjectedPointHyperlinkDetectorTest.java 2011-07-29 00:18:02 UTC (rev 33330) @@ -24,23 +24,23 @@ bean = b; } ArrayList<TestRegion> regionList = new ArrayList<TestRegion>(); - regionList.add(new TestRegion(115, 6, new TestHyperlink[]{ + regionList.add(new TestRegion(/*115, 6*/"Inject", new TestHyperlink[]{ new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " BasicLogger", bean), new TestHyperlink(AlternativeInjectedPointListHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_SHOW_ALTERNATIVES) })); // Inject - regionList.add(new TestRegion(133, 6, new TestHyperlink[]{ + regionList.add(new TestRegion(/*133, 6*/"Logger", new TestHyperlink[]{ new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " BasicLogger", bean), new TestHyperlink(AlternativeInjectedPointListHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_SHOW_ALTERNATIVES) })); // Logger - regionList.add(new TestRegion(140, 6, new TestHyperlink[]{ + regionList.add(new TestRegion(/*140, 6*/"logger", new TestHyperlink[]{ new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " BasicLogger", bean), new TestHyperlink(AlternativeInjectedPointListHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_SHOW_ALTERNATIVES) })); // logger - regionList.add(new TestRegion(196, 6, new TestHyperlink[]{ + regionList.add(new TestRegion(/*196, 6*/"logger", new TestHyperlink[]{ new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " BasicLogger", bean), new TestHyperlink(AlternativeInjectedPointListHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_SHOW_ALTERNATIVES) })); // logger - regionList.add(new TestRegion(250, 6, new TestHyperlink[]{ + regionList.add(new TestRegion(/*250, 6*/"logger", new TestHyperlink[]{ new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " BasicLogger", bean), new TestHyperlink(AlternativeInjectedPointListHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_SHOW_ALTERNATIVES) })); // logger @@ -55,18 +55,21 @@ bean = b; } ArrayList<TestRegion> regionList = new ArrayList<TestRegion>(); - regionList.add(new TestRegion(104, 6, new TestHyperlink[]{ + regionList.add(new TestRegion("Inject", new TestHyperlink[]{ new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " BasicLogger", bean) })); // Inject - regionList.add(new TestRegion(134, 13, new TestHyperlink[]{ + regionList.add(new TestRegion("Logger", new TestHyperlink[]{ new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " BasicLogger", bean) })); // Logger - regionList.add(new TestRegion(197, 6, new TestHyperlink[]{ + regionList.add(new TestRegion("logger", new TestHyperlink[]{ new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " BasicLogger", bean) })); // logger - regionList.add(new TestRegion(251, 6, new TestHyperlink[]{ + regionList.add(new TestRegion("logger", new TestHyperlink[]{ new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " BasicLogger", bean) })); // logger + regionList.add(new TestRegion("logger", new TestHyperlink[]{ + new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " BasicLogger", bean) + })); // logger CDIHyperlinkTestUtil.checkRegions(tckProject, "JavaSource/org/jboss/jsr299/tck/tests/jbt/openon/LoggerConsumer.java", regionList, new InjectedPointHyperlinkDetector()); } @@ -97,12 +100,14 @@ bean = b; } ArrayList<TestRegion> regionList = new ArrayList<TestRegion>(); - regionList.add(new TestRegion(880, 6, new TestHyperlink[]{new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " Fox", bean)})); - regionList.add(new TestRegion(894, 3, new TestHyperlink[]{new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " Fox", bean)})); // Fox - regionList.add(new TestRegion(898, 3, new TestHyperlink[]{new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " Fox", bean)})); - regionList.add(new TestRegion(975, 3, new TestHyperlink[]{new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " Fox", bean)})); - regionList.add(new TestRegion(979, 3, new TestHyperlink[]{new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " Fox", bean)})); - regionList.add(new TestRegion(1017, 3, new TestHyperlink[]{new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " Fox", bean)})); + regionList.add(new TestRegion(/*880, 6*/"Inject", new TestHyperlink[]{new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " Fox", bean)})); + regionList.add(new TestRegion(/*894, 3*/"Fox", new TestHyperlink[]{new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " Fox", bean)})); // Fox + regionList.add(new TestRegion(/*898, 3*/"fox", new TestHyperlink[]{new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " Fox", bean)})); + // Fake TestRegion for search purpose + regionList.add(new TestRegion("FoxFarm", new TestHyperlink[]{})); + regionList.add(new TestRegion(/*975, 3*/"Fox", new TestHyperlink[]{new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " Fox", bean)})); + regionList.add(new TestRegion(/*979, 3*/"fox", new TestHyperlink[]{new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " Fox", bean)})); + regionList.add(new TestRegion(/*1017, 3*/"fox", new TestHyperlink[]{new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " Fox", bean)})); CDIHyperlinkTestUtil.checkRegions(tckProject, "JavaSource/org/jboss/jsr299/tck/tests/context/dependent/FoxFarm.java", regionList, new InjectedPointHyperlinkDetector()); } @@ -114,12 +119,13 @@ bean = b; } ArrayList<TestRegion> regionList = new ArrayList<TestRegion>(); - regionList.add(new TestRegion(880, 6, new TestHyperlink[]{new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " Fox", bean)})); - regionList.add(new TestRegion(894, 3, new TestHyperlink[]{new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " Fox", bean)})); // Fox - regionList.add(new TestRegion(898, 3, new TestHyperlink[]{new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " Fox", bean)})); - regionList.add(new TestRegion(972, 3, new TestHyperlink[]{new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " Fox", bean)})); - regionList.add(new TestRegion(976, 3, new TestHyperlink[]{new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " Fox", bean)})); - regionList.add(new TestRegion(1014, 3, new TestHyperlink[]{new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " Fox", bean)})); + regionList.add(new TestRegion(/*880, 6*/"Inject", new TestHyperlink[]{new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " Fox", bean)})); + regionList.add(new TestRegion(/*894, 3*/"Fox", new TestHyperlink[]{new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " Fox", bean)})); // Fox + regionList.add(new TestRegion(/*898, 3*/"fox", new TestHyperlink[]{new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " Fox", bean)})); + regionList.add(new TestRegion("init(", new TestHyperlink[]{})); + regionList.add(new TestRegion(/*972, 3*/"Fox", new TestHyperlink[]{new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " Fox", bean)})); + regionList.add(new TestRegion(/*976, 3*/"fox", new TestHyperlink[]{new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " Fox", bean)})); + regionList.add(new TestRegion(/*1014, 3*/"fox", new TestHyperlink[]{new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " Fox", bean)})); CDIHyperlinkTestUtil.checkRegions(tckProject, "JavaSource/org/jboss/jsr299/tck/tests/context/dependent/FoxHole.java", regionList, new InjectedPointHyperlinkDetector()); } Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/ProducerDisposerHyperlinkDetectorTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/ProducerDisposerHyperlinkDetectorTest.java 2011-07-28 22:37:43 UTC (rev 33329) +++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/ProducerDisposerHyperlinkDetectorTest.java 2011-07-29 00:18:02 UTC (rev 33330) @@ -14,9 +14,9 @@ public void testProducerDisposerHyperlinkDetector() throws Exception { ArrayList<TestRegion> regionList = new ArrayList<TestRegion>(); - regionList.add(new TestRegion(1199, 8, new TestHyperlink[]{new TestHyperlink(DisposerHyperlink.class, CDIExtensionsMessages.CDI_PRODUCER_DISPOSER_HYPERLINK_OPEN_BOUND_DISPOSER+ " dispose")})); // @Produces - regionList.add(new TestRegion(1222, 7, new TestHyperlink[]{new TestHyperlink(DisposerHyperlink.class, CDIExtensionsMessages.CDI_PRODUCER_DISPOSER_HYPERLINK_OPEN_BOUND_DISPOSER+ " dispose")})); // producer - regionList.add(new TestRegion(1291, 7, new TestHyperlink[]{new TestHyperlink(ProducerHyperlink.class, CDIExtensionsMessages.CDI_PRODUCER_DISPOSER_HYPERLINK_OPEN_BOUND_PRODUCER+ " produce")})); // disposer + regionList.add(new TestRegion(/*1199, 8*/"Produces", new TestHyperlink[]{new TestHyperlink(DisposerHyperlink.class, CDIExtensionsMessages.CDI_PRODUCER_DISPOSER_HYPERLINK_OPEN_BOUND_DISPOSER+ " dispose")})); // @Produces + regionList.add(new TestRegion(/*1222, 7*/"produce", new TestHyperlink[]{new TestHyperlink(DisposerHyperlink.class, CDIExtensionsMessages.CDI_PRODUCER_DISPOSER_HYPERLINK_OPEN_BOUND_DISPOSER+ " dispose")})); // producer + regionList.add(new TestRegion(/*1291, 7*/"dispose", new TestHyperlink[]{new TestHyperlink(ProducerHyperlink.class, CDIExtensionsMessages.CDI_PRODUCER_DISPOSER_HYPERLINK_OPEN_BOUND_PRODUCER+ " produce")})); // disposer CDIHyperlinkTestUtil.checkRegions(tckProject, "JavaSource/org/jboss/jsr299/tck/tests/decorators/invocation/producer/method/ProducerImpl.java", regionList, new ProducerDisposerHyperlinkDetector()); }

12 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r33329 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation.

by jbosstools-commits＠lists.jboss.org

Author: akazakov Date: 2011-07-28 18:37:43 -0400 (Thu, 28 Jul 2011) New Revision: 33329 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java Log: https://issues.jboss.org/browse/JBIDE-9423 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-28 22:29:16 UTC (rev 33328) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2011-07-28 22:37:43 UTC (rev 33329) @@ -2132,7 +2132,7 @@ return false; } IParametedType superType = cdiProject.getNature().getTypeFactory().getParametedType(decorator.getBeanClass(), superInterfaceSignatures[0]); - return superType.getSignature().equals(delegatedType.getSignature()); + return superType==null?true:superType.getSignature().equals(delegatedType.getSignature()); } else if(superInterfaceSignatures.length>0) { return false; }

12 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r33328 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation.

by jbosstools-commits＠lists.jboss.org

Author: akazakov Date: 2011-07-28 18:29:16 -0400 (Thu, 28 Jul 2011) New Revision: 33328 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java Log: https://issues.jboss.org/browse/JBIDE-9423 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-28 22:14:27 UTC (rev 33327) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2011-07-28 22:29:16 UTC (rev 33328) @@ -2137,7 +2137,9 @@ return false; } IParametedType superType = cdiProject.getNature().getTypeFactory().getParametedType(decorator.getBeanClass(), superClassSignature); - return superType.getSignature().equals(delegatedType.getSignature()); + if(superType!=null) { + superType.getSignature().equals(delegatedType.getSignature()); + } } catch (JavaModelException e) { CDICorePlugin.getDefault().logError(e); }

12 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r33327 - in trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test: tck and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2011-07-28 18:14:27 -0400 (Thu, 28 Jul 2011) New Revision: 33327 Removed: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/WeldJarTest.java 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/tck/BuiltInBeanInjectionTest.java Log: JBIDE-9401 https://issues.jboss.org/browse/JBIDE-9401 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-28 22:14:14 UTC (rev 33326) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java 2011-07-28 22:14:27 UTC (rev 33327) @@ -112,7 +112,6 @@ suiteAll.addTestSuite(RemoveJarFromClasspathTest.class); suiteAll.addTestSuite(ExtensionFactoryTest.class); suiteAll.addTestSuite(ExtensionManagerTest.class); - suiteAll.addTestSuite(WeldJarTest.class); suiteAll.addTestSuite(BeansXMLTest.class); TestSuite dependentSuite = new TestSuite("Dependent Projects Tests"); dependentSuite.addTestSuite(DependentProjectTest.class); Deleted: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/WeldJarTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/WeldJarTest.java 2011-07-28 22:14:14 UTC (rev 33326) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/WeldJarTest.java 2011-07-28 22:14:27 UTC (rev 33327) @@ -1,69 +0,0 @@ -package org.jboss.tools.cdi.core.test; - -import java.io.IOException; -import java.util.Set; - -import junit.framework.TestCase; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.core.runtime.Path; -import org.jboss.tools.cdi.core.CDICorePlugin; -import org.jboss.tools.cdi.core.IBean; -import org.jboss.tools.cdi.core.ICDIProject; -import org.jboss.tools.cdi.core.IInjectionPoint; -import org.jboss.tools.test.util.JobUtils; -import org.jboss.tools.test.util.ResourcesUtils; - -/** - * - * @author V.Kabanovich - * - */ -public class WeldJarTest extends TestCase { - protected static String PLUGIN_ID = "org.jboss.tools.cdi.core.test"; - IProject project1 = null; - - public WeldJarTest() {} - - public void setUp() throws Exception { - project1 = ResourcesUtils.importProject(PLUGIN_ID, "/projects/CDITest1"); - JobUtils.waitForIdle(); - project1.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); - JobUtils.waitForIdle(); - } - - public void testWeldJar() throws CoreException, IOException { - ICDIProject cdi = CDICorePlugin.getCDIProject(project1, true); - Set<IBean> bs = cdi.getBeans(new Path("/CDITest1/src/cdi/test/MyShellImpl.java")); - assertFalse(bs.isEmpty()); - IBean b = bs.iterator().next(); - Set<IInjectionPoint> ps = b.getInjectionPoints(); - IInjectionPoint p = ps.iterator().next(); - Set<IBean> inbs = cdi.getBeans(false, p); - assertFalse(inbs.isEmpty()); - - bs = cdi.getBeans(new Path("/CDITest1/src/cdi/test/MyBeanManager.java")); - assertFalse(bs.isEmpty()); - b = bs.iterator().next(); - ps = b.getInjectionPoints(); - p = ps.iterator().next(); - inbs = cdi.getBeans(false, p); - assertFalse(inbs.isEmpty()); - - //Find bean defined in some-weld.jar - bs = cdi.getBeans("beanInWeldJar", false); - assertEquals(1, bs.size()); - } - - public void tearDown() throws Exception { - boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false); - JobUtils.waitForIdle(); - project1.delete(true, true, null); - JobUtils.waitForIdle(); - ResourcesUtils.setBuildAutomatically(saveAutoBuild); - JobUtils.waitForIdle(); - } -} \ No newline at end of file Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/BuiltInBeanInjectionTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/BuiltInBeanInjectionTest.java 2011-07-28 22:14:14 UTC (rev 33326) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/BuiltInBeanInjectionTest.java 2011-07-28 22:14:27 UTC (rev 33327) @@ -15,9 +15,9 @@ import org.eclipse.jdt.core.IType; import org.jboss.tools.cdi.core.CDIConstants; import org.jboss.tools.cdi.core.IBean; +import org.jboss.tools.cdi.core.IBuiltInBean; import org.jboss.tools.cdi.core.IClassBean; import org.jboss.tools.cdi.core.IInjectionPointField; -import org.jboss.tools.cdi.internal.core.impl.BuiltInBean; /** * @author Viacheslav Kabanovich @@ -35,7 +35,7 @@ assertFalse(beans.isEmpty()); IBean b = beans.iterator().next(); - assertTrue(b instanceof BuiltInBean); + assertTrue(b instanceof IBuiltInBean); IType t = b.getBeanClass(); assertEquals("javax.transaction.UserTransaction", t.getFullyQualifiedName()); } @@ -51,7 +51,7 @@ assertFalse(beans.isEmpty()); IBean b = beans.iterator().next(); - assertTrue(b instanceof BuiltInBean); + assertTrue(b instanceof IBuiltInBean); IType t = b.getBeanClass(); assertEquals("javax.validation.ValidatorFactory", t.getFullyQualifiedName()); } @@ -67,7 +67,7 @@ assertFalse(beans.isEmpty()); IBean b = beans.iterator().next(); - assertTrue(b instanceof BuiltInBean); + assertTrue(b instanceof IBuiltInBean); IType t = b.getBeanClass(); assertEquals("javax.validation.Validator", t.getFullyQualifiedName()); } @@ -83,7 +83,7 @@ assertFalse(beans.isEmpty()); IBean b = beans.iterator().next(); - assertTrue(b instanceof BuiltInBean); + assertTrue(b instanceof IBuiltInBean); IType t = b.getBeanClass(); assertEquals("java.security.Principal", t.getFullyQualifiedName()); } @@ -99,7 +99,7 @@ assertFalse(beans.isEmpty()); IBean b = beans.iterator().next(); - assertTrue(b instanceof BuiltInBean); + assertTrue(b instanceof IBuiltInBean); IType t = b.getBeanClass(); assertEquals(CDIConstants.BEAN_MANAGER_TYPE_NAME, t.getFullyQualifiedName()); }

12 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r33326 - 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-28 18:14:14 -0400 (Thu, 28 Jul 2011) New Revision: 33326 Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBuiltInBean.java Removed: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BuiltInBean.java Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BuiltInBeanFactory.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/scanner/lib/ClassPathMonitor.java Log: JBIDE-9401 https://issues.jboss.org/browse/JBIDE-9401 Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBuiltInBean.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBuiltInBean.java (rev 0) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBuiltInBean.java 2011-07-28 22:14:14 UTC (rev 33326) @@ -0,0 +1,28 @@ +/******************************************************************************* + * 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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.cdi.core; + +/** + * 3.6. Additional built-in beans. + * A Java EE or embeddable EJB container must provide the following built-in beans, all of which + * have qualifier @Default, scope @ Dependent, and have no bean EL name: + * UserTransaction, Principal, VlidationFactory, Validator, BeanManager. + * + * 6.7.5. The Conversation interface + * The container provides a built-in bean with bean type Conversation, scope @RequestScoped, and qualifier @Default, + * named javax.enterprise.context.conversation. + * + * @author Viacheslav Kabanovich + * + */ +public interface IBuiltInBean { + +} Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBuiltInBean.java ___________________________________________________________________ Added: svn:mime-type + text/plain Deleted: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BuiltInBean.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BuiltInBean.java 2011-07-28 21:07:02 UTC (rev 33325) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BuiltInBean.java 2011-07-28 22:14:14 UTC (rev 33326) @@ -1,166 +0,0 @@ -package org.jboss.tools.cdi.internal.core.impl; - -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import org.eclipse.jdt.core.IType; -import org.jboss.tools.cdi.core.CDIConstants; -import org.jboss.tools.cdi.core.IBean; -import org.jboss.tools.cdi.core.IInjectionPoint; -import org.jboss.tools.cdi.core.IQualifier; -import org.jboss.tools.cdi.core.IQualifierDeclaration; -import org.jboss.tools.cdi.core.IScope; -import org.jboss.tools.cdi.core.IScopeDeclaration; -import org.jboss.tools.cdi.core.IStereotypeDeclaration; -import org.jboss.tools.common.java.IAnnotationDeclaration; -import org.jboss.tools.common.java.IParametedType; -import org.jboss.tools.common.java.ITypeDeclaration; -import org.jboss.tools.common.text.ITextSourceReference; - -/** - * 3.6. Additional built-in beans. - - * scope @ Dependent, - * no bean EL name - * - * @author Viacheslav Kabanovich - * - */ -public class BuiltInBean extends CDIElement implements IBean { - protected IParametedType type; - protected Set<IQualifier> qualifiers = null; - - public BuiltInBean(IParametedType type) { - this.type = type; - } - - public IScope getScope() { - return getCDIProject().getScope(CDIConstants.DEPENDENT_ANNOTATION_TYPE_NAME); - } - - public Set<IScopeDeclaration> getScopeDeclarations() { - return new HashSet<IScopeDeclaration>(); - } - - public Set<IStereotypeDeclaration> getStereotypeDeclarations() { - return new HashSet<IStereotypeDeclaration>(); - } - - public List<IAnnotationDeclaration> getAnnotations() { - return new ArrayList<IAnnotationDeclaration>(); - } - - public IAnnotationDeclaration getAnnotation(String annotationTypeName) { - return null; - } - - public ITextSourceReference getAnnotationPosition(String annotationTypeName) { - return null; - } - - public boolean isAnnotationPresent(String annotationTypeName) { - return false; - } - - public IType getBeanClass() { - return type.getType(); - } - - public String getName() { - return null; - } - - public ITextSourceReference getNameLocation() { - return null; - } - - public Set<IParametedType> getLegalTypes() { - return getAllTypes(); - } - - public Set<IParametedType> getAllTypes() { - Set<IParametedType> result = new HashSet<IParametedType>(); - result.add(type); - return result; - } - - public Set<ITypeDeclaration> getAllTypeDeclarations() { - return new HashSet<ITypeDeclaration>(); - } - - public Set<ITypeDeclaration> getRestrictedTypeDeclaratios() { - return new HashSet<ITypeDeclaration>(); - } - - public Set<IQualifierDeclaration> getQualifierDeclarations() { - return new HashSet<IQualifierDeclaration>(); - } - - public Set<IQualifierDeclaration> getQualifierDeclarations(boolean includeInherited) { - return new HashSet<IQualifierDeclaration>(); - } - - public Set<IQualifier> getQualifiers() { - if(qualifiers == null) { - computeQualifiers(); - } - return qualifiers; - } - - protected void computeQualifiers() { - qualifiers = new HashSet<IQualifier>(); - } - - public boolean isAlternative() { - return false; - } - - public boolean isSelectedAlternative() { - return false; - } - - public IAnnotationDeclaration getAlternativeDeclaration() { - return null; - } - - public Set<IInjectionPoint> getInjectionPoints() { - return new HashSet<IInjectionPoint>(); - } - - public IBean getSpecializedBean() { - return null; - } - - public IAnnotationDeclaration getSpecializesAnnotationDeclaration() { - return null; - } - - public boolean isSpecializing() { - return false; - } - - public boolean isDependent() { - return true; - } - - public boolean isEnabled() { - return true; - } - - public boolean isNullable() { - return false; - } - - /* - * (non-Javadoc) - * @see org.jboss.tools.cdi.core.IBean#getSimpleJavaName() - */ - public String getSimpleJavaName() { - if(type!=null) { - return type.getSimpleName(); - } - return ""; - } -} \ No newline at end of file Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BuiltInBeanFactory.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BuiltInBeanFactory.java 2011-07-28 21:07:02 UTC (rev 33325) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BuiltInBeanFactory.java 2011-07-28 22:14:14 UTC (rev 33326) @@ -13,21 +13,29 @@ import java.util.HashSet; import java.util.Set; -import org.eclipse.core.runtime.IPath; import org.eclipse.jdt.core.IType; import org.jboss.tools.cdi.core.CDIConstants; -import org.jboss.tools.cdi.core.IBean; +import org.jboss.tools.cdi.core.IBuiltInBean; import org.jboss.tools.cdi.core.IScope; -import org.jboss.tools.common.java.IParametedType; +import org.jboss.tools.cdi.internal.core.impl.definition.TypeDefinition; /** + * 3.6. Additional built-in beans. + * A Java EE or embeddable EJB container must provide the following built-in beans, all of which + * have qualifier @Default, scope @ Dependent, and have no bean EL name: + * UserTransaction, Principal, VlidationFactory, Validator, BeanManager. * + * 6.7.5. The Conversation interface + * The container provides a built-in bean with bean type Conversation, scope @RequestScoped, and qualifier @Default, + * named javax.enterprise.context.conversation. + * * @author Viacheslav Kabanovich * */ public class BuiltInBeanFactory { - static Set<String> BUILT_IN = new HashSet<String>(); + public static final Set<String> BUILT_IN = new HashSet<String>(); + static { BUILT_IN.add(CDIConstants.USER_TRANSACTION_TYPE_NAME); BUILT_IN.add(CDIConstants.PRINCIPAL_TYPE_NAME); @@ -41,31 +49,44 @@ return type != null && BUILT_IN.contains(type.getFullyQualifiedName()); } - public static IBean newBean(CDIProject project, IParametedType type, IPath contextPath) { - BuiltInBean result = null; - if(type.getType().getFullyQualifiedName().equals(CDIConstants.CONVERSATION_TYPE_NAME)) { - result = new ConversationBuiltInBean(type); + public static ClassBean newClassBean(CDIProject project, TypeDefinition def) { + ClassBean result = null; + if(def.getType().getFullyQualifiedName().equals(CDIConstants.CONVERSATION_TYPE_NAME)) { + result = new ConversationBuiltInBean(); } else { - result = new BuiltInBean(type); + result = new BuiltInBean(); } result.setParent(project); - result.setSourcePath(contextPath); + result.setDefinition(def); return result; } - static class ConversationBuiltInBean extends BuiltInBean { - ConversationBuiltInBean(IParametedType type) { - super(type); - } +} - public String getName() { - return "javax.enterprise.context.conversation"; - } +class ConversationBuiltInBean extends ClassBean implements IBuiltInBean { + ConversationBuiltInBean() { + } - public IScope getScope() { - return getCDIProject().getScope(CDIConstants.REQUEST_SCOPED_ANNOTATION_TYPE_NAME); - } + public String getName() { + return "javax.enterprise.context.conversation"; + } + public IScope getScope() { + return getCDIProject().getScope(CDIConstants.REQUEST_SCOPED_ANNOTATION_TYPE_NAME); } } + +class BuiltInBean extends ClassBean implements IBuiltInBean { + + public BuiltInBean() { + } + + public IScope getScope() { + return getCDIProject().getScope(CDIConstants.DEPENDENT_ANNOTATION_TYPE_NAME); + } + + public String getName() { + return null; + } +} 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-28 21:07:02 UTC (rev 33325) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2011-07-28 22:14:14 UTC (rev 33326) @@ -40,6 +40,7 @@ import org.jboss.tools.cdi.core.IBean; import org.jboss.tools.cdi.core.IBeanMember; import org.jboss.tools.cdi.core.IBeanMethod; +import org.jboss.tools.cdi.core.IBuiltInBean; import org.jboss.tools.cdi.core.ICDIAnnotation; import org.jboss.tools.cdi.core.ICDIProject; import org.jboss.tools.cdi.core.IClassBean; @@ -210,6 +211,15 @@ } public Set<IBean> getResolvedBeans(Set<IBean> result, boolean attemptToResolveAmbiguousness) { + if(result.size() > 1) { + Iterator<IBean> it = result.iterator(); + while(it.hasNext()) { + IBean b = it.next(); + if(b instanceof IBuiltInBean) { + it.remove(); + } + } + } if(result.size() < 1 || !attemptToResolveAmbiguousness) { return result; } @@ -341,18 +351,6 @@ } } - if(BuiltInBeanFactory.isBuiltIn(type.getType())) { - Set<IBean> rslt = null; - rslt = getBeans(attemptToResolveAmbiguousDependency, type, qs.toArray(new IQualifierDeclaration[0])); - if(rslt.isEmpty()) { - IBean builtInBean = BuiltInBeanFactory.newBean(this, type, injectionPoint.getSourcePath()); - result.add(builtInBean); - } else { - result = rslt; - } - return result; - } - Set<IBean> beans = new HashSet<IBean>(); synchronized(allBeans) { beans.addAll(allBeans); @@ -360,7 +358,7 @@ boolean delegateInjectionPoint = injectionPoint.isDelegate(); for (IBean b: beans) { - if(b instanceof ClassBean) { + if(b instanceof ClassBean && !(b instanceof IBuiltInBean)) { IType bType = b.getBeanClass(); try { if(bType != null && Flags.isAbstract(bType.getFlags())) { @@ -1135,6 +1133,17 @@ } } + for (String builtin: BuiltInBeanFactory.BUILT_IN) { + IType type = n.getType(builtin); + if(type != null && !newClassBeans.containsKey(type)) { + TypeDefinition t = new TypeDefinition(); + t.setType(type, n.getDefinitions(), TypeDefinition.FLAG_NO_ANNOTATIONS); + ClassBean bean = BuiltInBeanFactory.newClassBean(this, t); + newClassBeans.put(t.getType(), bean); + beans.add(bean); + } + } + for (IClassBean bean: newClassBeans.values()) { IParametedType s = ((ClassBean)bean).getSuperType(); if(s != null && s.getType() != null) { @@ -1174,25 +1183,6 @@ buildInjectionPoinsByType(); - //Provide built-in bean Conversation - if(!beansByName.containsKey(CDIConstants.CONVERSATION_BEAN_NAME)) { - IType type = n.getType(CDIConstants.CONVERSATION_TYPE_NAME); - if(type != null) { - TypeDefinition t = new TypeDefinition(); - t.setType(type, n.getDefinitions(), TypeDefinition.FLAG_NO_ANNOTATIONS); - ClassBean bean = new ClassBean() { - public String getName() { - return "javax.enterprise.context.conversation"; - } - public IScope getScope() { - return getCDIProject().getScope(CDIConstants.REQUEST_SCOPED_ANNOTATION_TYPE_NAME); - } - }; - bean.setParent(this); - bean.setDefinition(t); - addBean(bean); - } - } } public void addBean(IBean bean) { Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/scanner/lib/ClassPathMonitor.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/scanner/lib/ClassPathMonitor.java 2011-07-28 21:07:02 UTC (rev 33325) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/scanner/lib/ClassPathMonitor.java 2011-07-28 22:14:14 UTC (rev 33326) @@ -12,11 +12,8 @@ import java.io.File; import java.util.ArrayList; -import java.util.HashMap; import java.util.HashSet; -import java.util.Iterator; import java.util.List; -import java.util.Map; import java.util.Set; import java.util.StringTokenizer; @@ -27,7 +24,6 @@ import org.eclipse.core.runtime.Path; import org.eclipse.jdt.core.IClasspathEntry; import org.eclipse.jdt.core.IJavaProject; -import org.eclipse.jdt.core.JavaCore; import org.jboss.tools.cdi.core.CDICoreNature; import org.jboss.tools.cdi.core.CDICorePlugin; import org.jboss.tools.common.model.XModelObject; @@ -74,7 +70,7 @@ newJars.getFileSystems().put(p, o); XModelObject b = o.getChildByPath("META-INF/beans.xml"); - if(b == null && !isWeldJar(fileName)) { + if(b == null) { continue; } newJars.getBeanModules().put(p, b); @@ -93,14 +89,6 @@ } } - private boolean isWeldJar(String fileName) { - if(!fileName.startsWith("weld-") && fileName.indexOf("-weld") < 0) return false; - if(fileName.startsWith("weld-extensions")) return false; - if(fileName.indexOf("-javadoc") > 0) return false; - if(fileName.indexOf("-sources") > 0) return false; - return true; - } - public IProject getProjectResource() { return project.getProject(); }

12 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r33325 - in trunk/jst/tests/org.jboss.tools.jst.web.kb.test: projects/utility and 22 other directories.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2011-07-28 17:07:02 -0400 (Thu, 28 Jul 2011) New Revision: 33325 Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/.classpath trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/.project trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/.settings/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/.settings/org.eclipse.jdt.core.prefs trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/.settings/org.eclipse.wst.common.component trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/.settings/org.eclipse.wst.common.project.facet.core.xml trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/bin/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/bin/META-INF/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/bin/META-INF/MANIFEST.MF trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/bin/foo/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/bin/foo/bar/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/bin/foo/bar/Dummy.class trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/src/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/src/META-INF/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/src/META-INF/MANIFEST.MF trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/src/foo/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/src/foo/bar/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/src/foo/bar/Dummy.java trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/test/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.classpath trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.project trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.settings/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.settings/.jsdtscope trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.settings/org.eclipse.jdt.core.prefs trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.settings/org.eclipse.wst.common.component trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.settings/org.eclipse.wst.common.project.facet.core.xml trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.settings/org.eclipse.wst.jsdt.ui.superType.container trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.settings/org.eclipse.wst.jsdt.ui.superType.name trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/WebContent/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/WebContent/META-INF/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/WebContent/META-INF/MANIFEST.MF trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/WebContent/WEB-INF/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/WebContent/WEB-INF/faces-config.xml trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/WebContent/WEB-INF/lib/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/WebContent/WEB-INF/web.xml trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/build/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/build/classes/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/build/classes/foo/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/build/classes/foo/bar/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/build/classes/foo/bar/DummyChild.class trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/src/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/src/foo/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/src/foo/bar/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/src/foo/bar/DummyChild.java trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/WebWithModuleTest.java Modified: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/JstWebKbAllTests.java Log: JBIDE-9420 https://issues.jboss.org/browse/JBIDE-9420 Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/.classpath =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/.classpath (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/.classpath 2011-07-28 21:07:02 UTC (rev 33325) @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="src"/> + <classpathentry kind="src" path="test"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/> + <classpathentry kind="output" path="bin"/> +</classpath> Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/.classpath ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/.project =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/.project (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/.project 2011-07-28 21:07:02 UTC (rev 33325) @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>utility</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.wst.common.project.facet.core.builder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.wst.validation.validationbuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jem.workbench.JavaEMFNature</nature> + <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.wst.common.project.facet.core.nature</nature> + </natures> +</projectDescription> Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/.project ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/.settings/org.eclipse.jdt.core.prefs 2011-07-28 21:07:02 UTC (rev 33325) @@ -0,0 +1,12 @@ +#Thu Jul 28 12:55:22 CEST 2011 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/.settings/org.eclipse.jdt.core.prefs ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/.settings/org.eclipse.wst.common.component =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/.settings/org.eclipse.wst.common.component (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/.settings/org.eclipse.wst.common.component 2011-07-28 21:07:02 UTC (rev 33325) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project-modules id="moduleCoreId" project-version="1.5.0"> + <wb-module deploy-name="utility"> + <wb-resource deploy-path="/" source-path="/src"/> + <wb-resource deploy-path="/" source-path="/test"/> + </wb-module> +</project-modules> Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/.settings/org.eclipse.wst.common.project.facet.core.xml =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/.settings/org.eclipse.wst.common.project.facet.core.xml 2011-07-28 21:07:02 UTC (rev 33325) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<faceted-project> + <fixed facet="java"/> + <fixed facet="jst.utility"/> + <installed facet="java" version="1.6"/> + <installed facet="jst.utility" version="1.0"/> +</faceted-project> Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/.settings/org.eclipse.wst.common.project.facet.core.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/bin/META-INF/MANIFEST.MF =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/bin/META-INF/MANIFEST.MF (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/bin/META-INF/MANIFEST.MF 2011-07-28 21:07:02 UTC (rev 33325) @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/bin/META-INF/MANIFEST.MF ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/bin/foo/bar/Dummy.class =================================================================== (Binary files differ) Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/bin/foo/bar/Dummy.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/src/META-INF/MANIFEST.MF =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/src/META-INF/MANIFEST.MF (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/src/META-INF/MANIFEST.MF 2011-07-28 21:07:02 UTC (rev 33325) @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/src/META-INF/MANIFEST.MF ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/src/foo/bar/Dummy.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/src/foo/bar/Dummy.java (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/src/foo/bar/Dummy.java 2011-07-28 21:07:02 UTC (rev 33325) @@ -0,0 +1,5 @@ +package foo.bar; + +public class Dummy { + +} Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/utility/src/foo/bar/Dummy.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.classpath =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.classpath (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.classpath 2011-07-28 21:07:02 UTC (rev 33325) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="src"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"> + <attributes> + <attribute name="owner.project.facets" value="java"/> + </attributes> + </classpathentry> + <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/> + <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/> + <classpathentry combineaccessrules="false" kind="src" path="/utility"/> + <classpathentry kind="output" path="build/classes"/> +</classpath> Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.classpath ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.project =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.project (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.project 2011-07-28 21:07:02 UTC (rev 33325) @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>webapp</name> + <comment></comment> + <projects> + <project>utility</project> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.wst.jsdt.core.javascriptValidator</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.wst.common.project.facet.core.builder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.jboss.tools.jst.web.kb.kbbuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.wst.validation.validationbuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jem.workbench.JavaEMFNature</nature> + <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature> + <nature>org.eclipse.wst.common.project.facet.core.nature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.wst.jsdt.core.jsNature</nature> + <nature>org.jboss.tools.jst.web.kb.kbnature</nature> + </natures> +</projectDescription> Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.project ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.settings/.jsdtscope =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.settings/.jsdtscope (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.settings/.jsdtscope 2011-07-28 21:07:02 UTC (rev 33325) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="WebContent"/> + <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/> + <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject"> + <attributes> + <attribute name="hide" value="true"/> + </attributes> + </classpathentry> + <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/> + <classpathentry kind="output" path=""/> +</classpath> Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.settings/org.eclipse.jdt.core.prefs 2011-07-28 21:07:02 UTC (rev 33325) @@ -0,0 +1,8 @@ +#Thu Jul 28 12:54:47 CEST 2011 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.settings/org.eclipse.jdt.core.prefs ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.settings/org.eclipse.wst.common.component =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.settings/org.eclipse.wst.common.component (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.settings/org.eclipse.wst.common.component 2011-07-28 21:07:02 UTC (rev 33325) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project-modules id="moduleCoreId" project-version="1.5.0"> + <wb-module deploy-name="webapp"> + <wb-resource deploy-path="/" source-path="/WebContent"/> + <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/> + <dependent-module archiveName="utility.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/utility/utility"> + <dependency-type>uses</dependency-type> + </dependent-module> + <property name="context-root" value="webapp"/> + <property name="java-output-path" value="/webapp/build/classes"/> + </wb-module> +</project-modules> Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.settings/org.eclipse.wst.common.project.facet.core.xml =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.settings/org.eclipse.wst.common.project.facet.core.xml 2011-07-28 21:07:02 UTC (rev 33325) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<faceted-project> + <fixed facet="java"/> + <fixed facet="jst.web"/> + <fixed facet="wst.jsdt.web"/> + <installed facet="java" version="1.6"/> + <installed facet="jst.web" version="3.0"/> + <installed facet="wst.jsdt.web" version="1.0"/> +</faceted-project> Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.settings/org.eclipse.wst.common.project.facet.core.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.settings/org.eclipse.wst.jsdt.ui.superType.container =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.settings/org.eclipse.wst.jsdt.ui.superType.container (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.settings/org.eclipse.wst.jsdt.ui.superType.container 2011-07-28 21:07:02 UTC (rev 33325) @@ -0,0 +1 @@ +org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.settings/org.eclipse.wst.jsdt.ui.superType.name =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.settings/org.eclipse.wst.jsdt.ui.superType.name (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/.settings/org.eclipse.wst.jsdt.ui.superType.name 2011-07-28 21:07:02 UTC (rev 33325) @@ -0,0 +1 @@ +Window \ No newline at end of file Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/WebContent/META-INF/MANIFEST.MF =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/WebContent/META-INF/MANIFEST.MF (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/WebContent/META-INF/MANIFEST.MF 2011-07-28 21:07:02 UTC (rev 33325) @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/WebContent/META-INF/MANIFEST.MF ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/WebContent/WEB-INF/faces-config.xml =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/WebContent/WEB-INF/faces-config.xml (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/WebContent/WEB-INF/faces-config.xml 2011-07-28 21:07:02 UTC (rev 33325) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<faces-config + 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://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd" + version="2.0"> + +</faces-config> Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/WebContent/WEB-INF/faces-config.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/WebContent/WEB-INF/web.xml =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/WebContent/WEB-INF/web.xml (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/WebContent/WEB-INF/web.xml 2011-07-28 21:07:02 UTC (rev 33325) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" version="3.0"> + <display-name>webapp</display-name> + <servlet> + <servlet-name>Faces Servlet</servlet-name> + <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + <servlet-mapping> + <servlet-name>Faces Servlet</servlet-name> + <url-pattern>/faces/*</url-pattern> + </servlet-mapping> +</web-app> \ No newline at end of file Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/WebContent/WEB-INF/web.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/build/classes/foo/bar/DummyChild.class =================================================================== (Binary files differ) Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/build/classes/foo/bar/DummyChild.class ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/src/foo/bar/DummyChild.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/src/foo/bar/DummyChild.java (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/src/foo/bar/DummyChild.java 2011-07-28 21:07:02 UTC (rev 33325) @@ -0,0 +1,5 @@ +package foo.bar; + +public class DummyChild extends Dummy { + +} Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/webapp/src/foo/bar/DummyChild.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/JstWebKbAllTests.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/JstWebKbAllTests.java 2011-07-28 20:58:42 UTC (rev 33324) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/JstWebKbAllTests.java 2011-07-28 21:07:02 UTC (rev 33325) @@ -53,6 +53,13 @@ new String[]{"projects/TestBrokenBuilderOrder"}, new String[]{"TestBrokenBuilderOrder"}); suiteAll.addTest(testSetup); + suite = new TestSuite(WebWithModuleTest.class.getName()); + suite.addTestSuite(WebWithModuleTest.class); + testSetup = new XProjectImportTestSetUp(suite, + "org.jboss.tools.jst.web.kb.test", + new String[]{"projects/utility", "projects/webapp"}, + new String[]{"utility", "webapp"}); + suiteAll.addTest(testSetup); return suiteAll; } } \ No newline at end of file Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/WebWithModuleTest.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/WebWithModuleTest.java (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/WebWithModuleTest.java 2011-07-28 21:07:02 UTC (rev 33325) @@ -0,0 +1,87 @@ +/******************************************************************************* + * 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.jst.web.kb.test; + +import junit.framework.TestCase; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.CoreException; +import org.jboss.tools.common.model.XModelObject; +import org.jboss.tools.common.model.filesystems.FileSystemsHelper; +import org.jboss.tools.common.model.filesystems.impl.FileSystemsImpl; +import org.jboss.tools.common.model.filesystems.impl.Libs; +import org.jboss.tools.common.model.util.EclipseResourceUtil; +import org.jboss.tools.jst.web.kb.IKbProject; +import org.jboss.tools.jst.web.kb.KbProjectFactory; +import org.jboss.tools.test.util.JUnitUtils; + +/** + * + * @author Viacheslav Kabanovich + * + */ +public class WebWithModuleTest extends TestCase { + + protected IProject project = null; + protected boolean makeCopy = true; + + public WebWithModuleTest() { + super("MyFaces Kb Model Test"); + } + + public void setUp() throws Exception { + project = ResourcesPlugin.getWorkspace().getRoot().getProject("webapp"); + assertNotNull("Can't load webapp", project); //$NON-NLS-1$ + } + + /** + * webapp project has kb nature, and depends on utility project without kb nature. + * In this case we add sources of 'utility' to file systems of 'webapp'. + * + * Check that file systems created but no links added to 'webapp'. + * + * Warning: If we decide to stop adding sources of one project to other project, + * this test should be removed. + * + * @throws CoreException + */ + public void testWebProject() throws CoreException { + KbProjectFactory.getKbProject(project, true); + XModelObject o = EclipseResourceUtil.createObjectForResource(project); + XModelObject libsrc = null; + XModelObject f = FileSystemsHelper.getFileSystems(o.getModel()); + Libs libs = ((FileSystemsImpl)f).getLibs(); + libs.requestForUpdate(); + libs.update(); + + //Check that sources of 'utility' are loaded by model of 'webapp'. + XModelObject[] fs = f.getChildren(); + for (XModelObject s: fs) { + String name = s.getAttributeValue("name"); + if(name.equals("lib-src")) { + libsrc = s; + } + } + assertNotNull(libsrc); + XModelObject q = libsrc.getChildByPath("foo/bar/Dummy.java"); + assertNotNull(q); + + //Check that no links is added to 'webapp' + IResource[] ms = project.members(); + for (IResource m: ms) { + assertFalse(m.isLinked()); + } + + } + +} \ No newline at end of file Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/WebWithModuleTest.java ___________________________________________________________________ Added: svn:mime-type + text/plain

12 years, 9 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits July 2011