July 2011 - jbosstools-commits - Jboss List Archives

JBoss Tools SVN: r33183 - in trunk/cdi/tests: org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: dazarov Date: 2011-07-25 17:24:22 -0400 (Mon, 25 Jul 2011) New Revision: 33183 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestDecorator2.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestDecorator2.qfxresult trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestInterceptor4.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestInterceptor4.qfxresult Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIMarkerResolutionTest.java Log: https://issues.jboss.org/browse/JBIDE-7683 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestDecorator2.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestDecorator2.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestDecorator2.java 2011-07-25 21:24:22 UTC (rev 33183) @@ -0,0 +1,16 @@ +package org.jboss.jsr299.tck.tests.jbt.quickfixes; + +import javax.decorator.Decorator; +import javax.decorator.Delegate; +import javax.enterprise.inject.Produces; +import javax.inject.Inject; + +@Decorator +public class TestDecorator2 { + @Inject @Delegate @AAnnotation String str; + + @Produces + public String produce(){ + return "a"; + } +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestDecorator2.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestDecorator2.qfxresult =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestDecorator2.qfxresult (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestDecorator2.qfxresult 2011-07-25 21:24:22 UTC (rev 33183) @@ -0,0 +1,15 @@ +package org.jboss.jsr299.tck.tests.jbt.quickfixes; + +import javax.decorator.Decorator; +import javax.decorator.Delegate; +import javax.inject.Inject; + +@Decorator +public class TestDecorator2 { + @Inject @Delegate @AAnnotation String str; + + + public String produce(){ + return "a"; + } +} Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestInterceptor4.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestInterceptor4.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestInterceptor4.java 2011-07-25 21:24:22 UTC (rev 33183) @@ -0,0 +1,16 @@ +package org.jboss.jsr299.tck.tests.jbt.quickfixes; + +import javax.enterprise.inject.Produces; +import javax.interceptor.Interceptor; + +import org.jboss.jsr299.tck.tests.decorators.interceptor.FooBinding; + +@Interceptor +@FooBinding +public class TestInterceptor4{ + + @Produces + public String produce(){ + return "a"; + } +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestInterceptor4.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestInterceptor4.qfxresult =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestInterceptor4.qfxresult (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestInterceptor4.qfxresult 2011-07-25 21:24:22 UTC (rev 33183) @@ -0,0 +1,15 @@ +package org.jboss.jsr299.tck.tests.jbt.quickfixes; + +import javax.interceptor.Interceptor; + +import org.jboss.jsr299.tck.tests.decorators.interceptor.FooBinding; + +@Interceptor +@FooBinding +public class TestInterceptor4{ + + + public String produce(){ + return "a"; + } +} Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIMarkerResolutionTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIMarkerResolutionTest.java 2011-07-25 21:11:58 UTC (rev 33182) +++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIMarkerResolutionTest.java 2011-07-25 21:24:22 UTC (rev 33183) @@ -707,4 +707,32 @@ DeleteAnnotationMarkerResolution.class); } + public void testDeleteProducerFromInterceptorResolution() throws CoreException{ + checkResolution(tckProject, + new String[]{ + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestInterceptor4.java" + }, + new String[]{ + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestInterceptor4.qfxresult" + }, + CDICoreValidator.PROBLEM_TYPE, + CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME, + CDIValidationErrorManager.PRODUCER_IN_INTERCEPTOR_ID, + DeleteAnnotationMarkerResolution.class); + } + + public void testDeleteProducerFromDecoratorResolution() throws CoreException{ + checkResolution(tckProject, + new String[]{ + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestDecorator2.java" + }, + new String[]{ + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestDecorator2.qfxresult" + }, + CDICoreValidator.PROBLEM_TYPE, + CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME, + CDIValidationErrorManager.PRODUCER_IN_DECORATOR_ID, + DeleteAnnotationMarkerResolution.class); + } + } \ No newline at end of file

14 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r33182 - in trunk/cdi/tests: org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: dazarov Date: 2011-07-25 17:11:58 -0400 (Mon, 25 Jul 2011) New Revision: 33182 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestDecorator.qfxresult trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestInterceptor3.qfxresult Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestInterceptor3.java trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIMarkerResolutionTest.java Log: https://issues.jboss.org/browse/JBIDE-7684 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestDecorator.qfxresult =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestDecorator.qfxresult (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestDecorator.qfxresult 2011-07-25 21:11:58 UTC (rev 33182) @@ -0,0 +1,11 @@ +package org.jboss.jsr299.tck.tests.jbt.quickfixes; + +import javax.decorator.Decorator; + +@Decorator +public class TestDecorator { + + public void method(String parameter){ + + } +} Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestInterceptor3.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestInterceptor3.java 2011-07-25 20:59:31 UTC (rev 33181) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestInterceptor3.java 2011-07-25 21:11:58 UTC (rev 33182) @@ -1,10 +1,15 @@ package org.jboss.jsr299.tck.tests.jbt.quickfixes; import javax.enterprise.inject.Disposes; +import javax.enterprise.inject.Produces; import javax.interceptor.Interceptor; @Interceptor public class TestInterceptor3 { + @Produces + public String produce(){ + return ""; + } public void method(@Disposes String parameter){ Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestInterceptor3.qfxresult =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestInterceptor3.qfxresult (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestInterceptor3.qfxresult 2011-07-25 21:11:58 UTC (rev 33182) @@ -0,0 +1,16 @@ +package org.jboss.jsr299.tck.tests.jbt.quickfixes; + +import javax.enterprise.inject.Produces; +import javax.interceptor.Interceptor; + +@Interceptor +public class TestInterceptor3 { + @Produces + public String produce(){ + return ""; + } + + public void method(String parameter){ + + } +} Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIMarkerResolutionTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIMarkerResolutionTest.java 2011-07-25 20:59:31 UTC (rev 33181) +++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIMarkerResolutionTest.java 2011-07-25 21:11:58 UTC (rev 33182) @@ -684,6 +684,9 @@ new String[]{ "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestInterceptor3.java" }, + new String[]{ + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestInterceptor3.qfxresult" + }, CDICoreValidator.PROBLEM_TYPE, CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME, CDIValidationErrorManager.DISPOSER_IN_INTERCEPTOR_ID, @@ -695,6 +698,9 @@ new String[]{ "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestDecorator.java" }, + new String[]{ + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestDecorator.qfxresult" + }, CDICoreValidator.PROBLEM_TYPE, CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME, CDIValidationErrorManager.DISPOSER_IN_DECORATOR_ID,

14 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r33181 - trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker.

by jbosstools-commits＠lists.jboss.org

Author: dazarov Date: 2011-07-25 16:59:31 -0400 (Mon, 25 Jul 2011) New Revision: 33181 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIProblemMarkerResolutionGenerator.java Log: https://issues.jboss.org/browse/JBIDE-7684, https://issues.jboss.org/browse/JBIDE-7683 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIProblemMarkerResolutionGenerator.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIProblemMarkerResolutionGenerator.java 2011-07-25 17:43:00 UTC (rev 33180) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIProblemMarkerResolutionGenerator.java 2011-07-25 20:59:31 UTC (rev 33181) @@ -332,11 +332,9 @@ IJavaElement element = findJavaElement(file, start); if(element != null){ IJavaElement disposerElement = findJavaElementByAnnotation(element, CDIConstants.DISPOSES_ANNOTATION_TYPE_NAME); - IJavaElement interceptorElement = findJavaElementByAnnotation(element, CDIConstants.INTERCEPTOR_ANNOTATION_TYPE_NAME); - if(disposerElement != null && interceptorElement != null){ + if(disposerElement != null){ return new IMarkerResolution[] { - new DeleteAnnotationMarkerResolution(disposerElement, CDIConstants.DISPOSES_ANNOTATION_TYPE_NAME), - new DeleteAnnotationMarkerResolution(interceptorElement, CDIConstants.INTERCEPTOR_ANNOTATION_TYPE_NAME) + new DeleteAnnotationMarkerResolution(disposerElement, CDIConstants.DISPOSES_ANNOTATION_TYPE_NAME) }; } } @@ -344,14 +342,32 @@ IJavaElement element = findJavaElement(file, start); if(element != null){ IJavaElement disposerElement = findJavaElementByAnnotation(element, CDIConstants.DISPOSES_ANNOTATION_TYPE_NAME); - IJavaElement decoratorElement = findJavaElementByAnnotation(element, CDIConstants.DECORATOR_TYPE_NAME); - if(disposerElement != null && decoratorElement != null){ + if(disposerElement != null){ return new IMarkerResolution[] { - new DeleteAnnotationMarkerResolution(disposerElement, CDIConstants.DISPOSES_ANNOTATION_TYPE_NAME), - new DeleteAnnotationMarkerResolution(decoratorElement, CDIConstants.DECORATOR_TYPE_NAME) + new DeleteAnnotationMarkerResolution(disposerElement, CDIConstants.DISPOSES_ANNOTATION_TYPE_NAME) }; } } + }else if(messageId == CDIValidationErrorManager.PRODUCER_IN_INTERCEPTOR_ID){ + IJavaElement element = findJavaElement(file, start); + if(element != null){ + IJavaElement producerElement = findJavaElementByAnnotation(element, CDIConstants.PRODUCES_ANNOTATION_TYPE_NAME); + if(producerElement != null){ + return new IMarkerResolution[] { + new DeleteAnnotationMarkerResolution(producerElement, CDIConstants.PRODUCES_ANNOTATION_TYPE_NAME) + }; + } + } + }else if(messageId == CDIValidationErrorManager.PRODUCER_IN_DECORATOR_ID){ + IJavaElement element = findJavaElement(file, start); + if(element != null){ + IJavaElement producerElement = findJavaElementByAnnotation(element, CDIConstants.PRODUCES_ANNOTATION_TYPE_NAME); + if(producerElement != null){ + return new IMarkerResolution[] { + new DeleteAnnotationMarkerResolution(producerElement, CDIConstants.PRODUCES_ANNOTATION_TYPE_NAME) + }; + } + } } } return new IMarkerResolution[] {};

14 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r33180 - in trunk/download.jboss.org/jbosstools/updates: indigo/extras/SR0 and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2011-07-25 13:43:00 -0400 (Mon, 25 Jul 2011) New Revision: 33180 Added: trunk/download.jboss.org/jbosstools/updates/requirements/pmd/build-3.2.6.xml Modified: trunk/download.jboss.org/jbosstools/updates/helios/extras/compositeArtifa... trunk/download.jboss.org/jbosstools/updates/helios/extras/compositeConten... trunk/download.jboss.org/jbosstools/updates/indigo/extras/SR0/compositeAr... trunk/download.jboss.org/jbosstools/updates/indigo/extras/SR0/compositeCo... trunk/download.jboss.org/jbosstools/updates/requirements/pmd/build.xml Log: https://issues.jboss.org/browse/JBDS-1788 switch to PMD 3.2.4 Modified: trunk/download.jboss.org/jbosstools/updates/helios/extras/compositeArtifa... =================================================================== --- trunk/download.jboss.org/jbosstools/updates/helios/extras/compositeArtifa... 2011-07-25 15:47:48 UTC (rev 33179) +++ trunk/download.jboss.org/jbosstools/updates/helios/extras/compositeArtifa... 2011-07-25 17:43:00 UTC (rev 33180) @@ -3,13 +3,13 @@ <repository name='JBoss Tools Requirements - Composite Helios Mirror - Extras' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'> <properties size='2'> <property name='p2.compressed' value='true'/> -<property name='p2.timestamp' value='1308010224000'/> +<property name='p2.timestamp' value='1311615394000'/> </properties> <children size='8'> <child location='../../requirements/egit/0.11/'/> <child location='../../requirements/findbugs/1.3.9/'/> <child location='../../requirements/mylyn/3.6-I20110415-0655/'/> -<child location='../../requirements/pmd/3.2.6/'/> +<child location='../../requirements/pmd/3.2.4/'/> <child location='../../requirements/springide/2.5.1.201011101000/'/> <child location='../../requirements/subclipse/1.6_1.3/'/> Modified: trunk/download.jboss.org/jbosstools/updates/helios/extras/compositeConten... =================================================================== --- trunk/download.jboss.org/jbosstools/updates/helios/extras/compositeConten... 2011-07-25 15:47:48 UTC (rev 33179) +++ trunk/download.jboss.org/jbosstools/updates/helios/extras/compositeConten... 2011-07-25 17:43:00 UTC (rev 33180) @@ -3,13 +3,13 @@ <repository name='JBoss Tools Requirements - Composite Helios Mirror - Extras' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'> <properties size='2'> <property name='p2.compressed' value='true'/> -<property name='p2.timestamp' value='1308010224000'/> +<property name='p2.timestamp' value='1311615397000'/> </properties> <children size='8'> <child location='../../requirements/egit/0.11/'/> <child location='../../requirements/findbugs/1.3.9/'/> <child location='../../requirements/mylyn/3.6-I20110415-0655/'/> -<child location='../../requirements/pmd/3.2.6/'/> +<child location='../../requirements/pmd/3.2.4/'/> <child location='../../requirements/springide/2.5.1.201011101000/'/> <child location='../../requirements/subclipse/1.6_1.3/'/> Modified: trunk/download.jboss.org/jbosstools/updates/indigo/extras/SR0/compositeAr... =================================================================== --- trunk/download.jboss.org/jbosstools/updates/indigo/extras/SR0/compositeAr... 2011-07-25 15:47:48 UTC (rev 33179) +++ trunk/download.jboss.org/jbosstools/updates/indigo/extras/SR0/compositeAr... 2011-07-25 17:43:00 UTC (rev 33180) @@ -3,14 +3,14 @@ <repository name='JBoss Tools Requirements - Composite Indigo Mirror - Extras' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'> <properties size='2'> <property name='p2.compressed' value='true'/> -<property name='p2.timestamp' value='1311107978000'/> +<property name='p2.timestamp' value='1311615409000'/> </properties> <children size='9'> <child location='../../../requirements/egit/1.0.0/'/> <child location='../../../requirements/findbugs/1.3.9/'/> <child location='../../../requirements/jslint/1.5/'/> <child location='../../../requirements/mylyn/3.6-v20110608-1400/'/> -<child location='../../../requirements/pmd/3.2.6/'/> +<child location='../../../requirements/pmd/3.2.4/'/> <child location='../../../requirements/springide/2.6.0.201103160035/'/> <child location='../../../requirements/subclipse/1.6_1.3/'/> Modified: trunk/download.jboss.org/jbosstools/updates/indigo/extras/SR0/compositeCo... =================================================================== --- trunk/download.jboss.org/jbosstools/updates/indigo/extras/SR0/compositeCo... 2011-07-25 15:47:48 UTC (rev 33179) +++ trunk/download.jboss.org/jbosstools/updates/indigo/extras/SR0/compositeCo... 2011-07-25 17:43:00 UTC (rev 33180) @@ -3,14 +3,14 @@ <repository name='JBoss Tools Requirements - Composite Indigo Mirror - Extras' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'> <properties size='2'> <property name='p2.compressed' value='true'/> -<property name='p2.timestamp' value='1311107988000'/> +<property name='p2.timestamp' value='1311615412000'/> </properties> <children size='9'> <child location='../../../requirements/egit/1.0.0/'/> <child location='../../../requirements/findbugs/1.3.9/'/> <child location='../../../requirements/jslint/1.5/'/> <child location='../../../requirements/mylyn/3.6-v20110608-1400/'/> -<child location='../../../requirements/pmd/3.2.6/'/> +<child location='../../../requirements/pmd/3.2.4/'/> <child location='../../../requirements/springide/2.6.0.201103160035/'/> <child location='../../../requirements/subclipse/1.6_1.3/'/> Copied: trunk/download.jboss.org/jbosstools/updates/requirements/pmd/build-3.2.6.xml (from rev 33179, trunk/download.jboss.org/jbosstools/updates/requirements/pmd/build.xml) =================================================================== --- trunk/download.jboss.org/jbosstools/updates/requirements/pmd/build-3.2.6.xml (rev 0) +++ trunk/download.jboss.org/jbosstools/updates/requirements/pmd/build-3.2.6.xml 2011-07-25 17:43:00 UTC (rev 33180) @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project default="mirror"> +  + <target name="mirror"> + <property name="URL" value="http://pmd.sourceforge.net/eclipse" /> + <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/pmd/3.2.6/" /> + <property name="compress" value="true" /> + + <p2.mirror> + <repository location="file:${destination}/3.2.6/" name="pmd plugins for Eclipse 3.6 - 3.7" /> + <source> + <repository location="${URL}" /> + </source> + + <slicingoptions includefeatures="true" followstrict="true" latestversiononly="true" /> + </p2.mirror> + + <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.2.6/" artifactRepository="file:${destination}/3.2.6/" publishartifacts="true" source="${destination}/3.2.6/" compress="${compress}" /> + </target> +</project> Modified: trunk/download.jboss.org/jbosstools/updates/requirements/pmd/build.xml =================================================================== --- trunk/download.jboss.org/jbosstools/updates/requirements/pmd/build.xml 2011-07-25 15:47:48 UTC (rev 33179) +++ trunk/download.jboss.org/jbosstools/updates/requirements/pmd/build.xml 2011-07-25 17:43:00 UTC (rev 33180) @@ -16,19 +16,12 @@ -f ~/RHDS/updates/requirements/pmd/build.xml -Ddestination=/tmp/pmd-repo --> <target name="mirror"> - <property name="URL" value="http://pmd.sourceforge.net/eclipse" /> - <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/pmd/3.2.6/" /> - <property name="compress" value="true" /> - <p2.mirror> - <repository location="file:${destination}/3.2.6/" name="pmd plugins for Eclipse 3.6 - 3.7" /> - <source> - <repository location="${URL}" /> - </source> +  - <slicingoptions includefeatures="true" followstrict="true" latestversiononly="true" /> - </p2.mirror> + <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/pmd/3.2.4/" /> + <property name="compress" value="true" /> - <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.2.6/" artifactRepository="file:${destination}/3.2.6/" publishartifacts="true" source="${destination}/3.2.6/" compress="${compress}" /> + <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.2.4/" artifactRepository="file:${destination}/3.2.4/" publishartifacts="true" source="${destination}/3.2.4/" compress="${compress}" /> </target> </project>

14 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r33179 - in trunk/cdi: tests/org.jboss.tools.cdi.seam.core.test/META-INF and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: vrubezhny Date: 2011-07-25 11:47:48 -0400 (Mon, 25 Jul 2011) New Revision: 33179 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/META-INF/MANIFEST.MF trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/META-INF/MANIFEST.MF trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/SeamResourceBundlesTest.java Log: JBIDE-9087 Support of Bundles bean in CDI projects with Seam International module. JUnit Test Case for Seam3 International module EL resolver is added Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/META-INF/MANIFEST.MF =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/META-INF/MANIFEST.MF 2011-07-25 14:03:02 UTC (rev 33178) +++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/META-INF/MANIFEST.MF 2011-07-25 15:47:48 UTC (rev 33179) @@ -17,4 +17,5 @@ org.jboss.tools.cdi.core;bundle-version="1.2.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy -Export-Package: org.jboss.tools.cdi.seam.core +Export-Package: org.jboss.tools.cdi.seam.core, + org.jboss.tools.cdi.seam.core.international.el Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/META-INF/MANIFEST.MF =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/META-INF/MANIFEST.MF 2011-07-25 14:03:02 UTC (rev 33178) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/META-INF/MANIFEST.MF 2011-07-25 15:47:48 UTC (rev 33179) @@ -18,5 +18,7 @@ org.jboss.tools.common;bundle-version="3.3.0", org.eclipse.ui;bundle-version="3.7.0", org.jboss.tools.common.base.test;bundle-version="3.3.0", - org.eclipse.jface.text;bundle-version="3.7.0" + org.eclipse.jface.text;bundle-version="3.7.0", + org.jboss.tools.common.el.core;bundle-version="3.3.0", + org.jboss.tools.common.text.ext;bundle-version="3.3.0" Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/SeamResourceBundlesTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/SeamResourceBundlesTest.java 2011-07-25 14:03:02 UTC (rev 33178) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/SeamResourceBundlesTest.java 2011-07-25 15:47:48 UTC (rev 33179) @@ -11,8 +11,9 @@ package org.jboss.tools.cdi.seam.core.test; import java.io.File; +import java.util.List; -import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IncrementalProjectBuilder; import org.eclipse.core.runtime.FileLocator; @@ -21,9 +22,15 @@ import org.jboss.tools.cdi.core.CDICorePlugin; import org.jboss.tools.cdi.core.test.tck.TCKTest; import org.jboss.tools.cdi.seam.core.CDISeamCorePlugin; +import org.jboss.tools.cdi.seam.core.international.el.CDIInternationalMessagesELResolver; +import org.jboss.tools.common.el.core.resolver.ELContext; +import org.jboss.tools.common.el.core.resolver.ELResolver; +import org.jboss.tools.common.text.TextProposal; +import org.jboss.tools.common.text.ext.util.Utils; import org.jboss.tools.common.util.FileUtil; import org.jboss.tools.jst.jsp.test.TestUtil; import org.jboss.tools.jst.jsp.test.ca.ContentAssistantTestCase; +import org.jboss.tools.jst.web.kb.PageContextFactory; import org.jboss.tools.jst.web.kb.internal.validation.ValidatorManager; import org.jboss.tools.test.util.JobUtils; import org.osgi.framework.Bundle; @@ -46,22 +53,102 @@ private String[] resourceBundleNames = new String[] {"bundles.messages"}; private String[] defaultResourceBundleNameProperties = new String[] {"bundles.messages.home_header", "bundles.messages.home_body", "bundles.messages.home_note"}; private String[] germanResourceBundleNameProperties = new String[] {"bundles.messages.de_home_header", "bundles.messages.de_home_body", "bundles.messages.de_home_note"}; + private String[] textDefaultResourceBundleNameProperties = new String[] {"home_header", "home_body", "home_note"}; + private String[] textGermanResourceBundleNameProperties = new String[] {"de_home_header", "de_home_body", "de_home_note"}; - public void testResourceBundles() { + boolean bReadyForTesting = false; + String errMessage = null; + + public SeamResourceBundlesTest () { + super(); + + boolean setupOK = true; // Set up seam-international.jar library into the project's WEB-INF/lib folder try { - assertTrue("Cannot set up SEAM International module and resource bundles into a test project", - setUpSeamInternationalLibraryAndResourceBundle()); + setupOK = setUpSeamInternationalLibraryAndResourceBundle(); + if (!setupOK) + errMessage = "Cannot set up SEAM International module and resource bundles into a test project"; } catch (Exception e) { - fail("Cannot set up SEAM International module and resource bundles into a test project: " - + e.getLocalizedMessage()); + setupOK = false; + errMessage = "Cannot set up SEAM International module and resource bundles into a test project: " + + e.getLocalizedMessage(); } + if (!setupOK) + return; + // Test that seam-international module is successfully installed on the CDI project - assertTrue("SEAM International module is not installed or incorrectly installed", - CDICorePlugin.getCDI(tckProject, true).getExtensionManager() - .isCDIExtensionAvailable(CDISeamCorePlugin.CDI_INTERNATIONAL_RUNTIME_EXTENTION)); + setupOK = CDICorePlugin.getCDI(tckProject, true).getExtensionManager() + .isCDIExtensionAvailable(CDISeamCorePlugin.CDI_INTERNATIONAL_RUNTIME_EXTENTION); + if (!setupOK) + errMessage = "SEAM International module is not installed or incorrectly installed"; + + bReadyForTesting = setupOK; + } + + /** + * The method checks if CDIInternationalMessagesELResolver present among the EL Resolvers, + * then if the required resolver found uses it to retrieve and test proposals for bundle and their properties + */ + public void testCDIInternationalMessages () { + assertTrue(errMessage, bReadyForTesting); + + IFile page = tckProject.getFile(PAGE_NAME); + assertTrue("Test page not found: " + PAGE_NAME, (page != null && page.exists())); + ELContext elContext = PageContextFactory.createPageContext(page); + + ELResolver[] elResolvers = elContext.getElResolvers(); + ELResolver cdiInternationalModuleResolver = null; + if (elResolvers != null) { + for (ELResolver r : elResolvers) { + if (r instanceof CDIInternationalMessagesELResolver) { + cdiInternationalModuleResolver = r; + break; + } + } + } + assertNotNull("Seam International module resolver is not set up on the project", cdiInternationalModuleResolver); + + List<TextProposal> bundleProposals = cdiInternationalModuleResolver.getProposals(elContext, "value=\"#{", 1); + assertTrue("Seam International module resolver didn't return proposals for bundles", + (bundleProposals != null && bundleProposals.size() > 0)); + proposalsExist(bundleProposals, resourceBundleNames); + + List<TextProposal> bundlePropertyProposals = cdiInternationalModuleResolver.getProposals(elContext, "value=\"#{bundles.messages.", 1); + assertTrue("Seam International module resolver didn't return proposals for bundles", + (bundlePropertyProposals != null && bundlePropertyProposals.size() > 0)); + proposalsExist(bundlePropertyProposals, textDefaultResourceBundleNameProperties); + proposalsExist(bundlePropertyProposals, textGermanResourceBundleNameProperties); + } + + public void proposalsExist(List<TextProposal> res, String[] proposals) { + TextProposal[] result = res.toArray(new TextProposal[res.size()]); + for (int i = 0; i < proposals.length; i++) { + boolean found = compareTextProposal(proposals[i], result); + assertTrue("Proposal " + proposals[i] + " not found!", found ); //$NON-NLS-1$ //$NON-NLS-2$ + } + } + + public boolean compareTextProposal(String proposal, TextProposal[] proposals){ + for (int i = 0; i < proposals.length; i++) { + String replacementString = proposals[i].getReplacementString().toLowerCase(); + if (replacementString.equalsIgnoreCase(proposal)) return true; + // For an attribute value proposal there will be the quote characters + + replacementString = Utils.trimQuotes(replacementString); + if (replacementString.equalsIgnoreCase(proposal)) return true; + + } + return false; + } + + /** + * The method tests CA on CDI Seam International Module Resource Bundles + */ + public void testResourceBundles() { + assertTrue(errMessage, bReadyForTesting); + // Perform CA test caTest.checkProposals(PAGE_NAME, "value=\"#{", 9, resourceBundleNames, false); caTest.checkProposals(PAGE_NAME, "value=\"#{bundles.messages.", 26, defaultResourceBundleNameProperties, false);

14 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r33178 - trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views.

by jbosstools-commits＠lists.jboss.org

Author: dgeraskov Date: 2011-07-25 10:03:02 -0400 (Mon, 25 Jul 2011) New Revision: 33178 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/QueryPageTabView.java Log: https://issues.jboss.org/browse/JBIDE-9392 Opened query page view creates jdbc connection. Need to close it before Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/QueryPageTabView.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/QueryPageTabView.java 2011-07-25 09:47:15 UTC (rev 33177) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/QueryPageTabView.java 2011-07-25 14:03:02 UTC (rev 33178) @@ -134,6 +134,9 @@ public void dispose() { KnownConfigurations.getInstance().getQueryPageModel().removeListDataListener(dataListener); + for (int i = 0; i < pageViewers.size(); i++) { + pageViewers.get(i).dispose(); + } super.dispose(); }

14 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r33177 - trunk/build/aggregate/bottests-site/features/org.jboss.tools.bot.test.feature.

by jbosstools-commits＠lists.jboss.org

Author: psrna Date: 2011-07-25 05:47:15 -0400 (Mon, 25 Jul 2011) New Revision: 33177 Modified: trunk/build/aggregate/bottests-site/features/org.jboss.tools.bot.test.feature/feature.xml Log: Modified: trunk/build/aggregate/bottests-site/features/org.jboss.tools.bot.test.feature/feature.xml =================================================================== --- trunk/build/aggregate/bottests-site/features/org.jboss.tools.bot.test.feature/feature.xml 2011-07-25 09:45:29 UTC (rev 33176) +++ trunk/build/aggregate/bottests-site/features/org.jboss.tools.bot.test.feature/feature.xml 2011-07-25 09:47:15 UTC (rev 33177) @@ -39,7 +39,7 @@ <plugin id="org.jboss.tools.bpel.ui.bot.test" download-size="0" install-size="0" version="0.0.0" /> <plugin id="org.jboss.tools.cdi.bot.test" download-size="0" install-size="0" version="0.0.0" /> <plugin id="org.jboss.tools.deltacloud.ui.bot.test" download-size="0" install-size="0" version="0.0.0" /> - <plugin id="org.jboss.tools.drools.ui.bot.test" download-size="0" install-size="0" version="0.0.0" /> + <plugin id="org.jboss.tools.esb.ui.bot.test" download-size="0" install-size="0" version="0.0.0" />

14 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r33176 - trunk/build/aggregate/bottests-site/features/org.jboss.tools.bot.test.feature.

by jbosstools-commits＠lists.jboss.org

Author: psrna Date: 2011-07-25 05:45:29 -0400 (Mon, 25 Jul 2011) New Revision: 33176 Modified: trunk/build/aggregate/bottests-site/features/org.jboss.tools.bot.test.feature/feature.xml Log: Modified: trunk/build/aggregate/bottests-site/features/org.jboss.tools.bot.test.feature/feature.xml =================================================================== --- trunk/build/aggregate/bottests-site/features/org.jboss.tools.bot.test.feature/feature.xml 2011-07-25 09:43:32 UTC (rev 33175) +++ trunk/build/aggregate/bottests-site/features/org.jboss.tools.bot.test.feature/feature.xml 2011-07-25 09:45:29 UTC (rev 33176) @@ -39,7 +39,7 @@ <plugin id="org.jboss.tools.bpel.ui.bot.test" download-size="0" install-size="0" version="0.0.0" /> <plugin id="org.jboss.tools.cdi.bot.test" download-size="0" install-size="0" version="0.0.0" /> <plugin id="org.jboss.tools.deltacloud.ui.bot.test" download-size="0" install-size="0" version="0.0.0" /> - + <plugin id="org.jboss.tools.drools.ui.bot.test" download-size="0" install-size="0" version="0.0.0" /> <plugin id="org.jboss.tools.esb.ui.bot.test" download-size="0" install-size="0" version="0.0.0" />

14 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r33175 - trunk/build/aggregate/bottests-site/features/org.jboss.tools.bot.test.feature.

by jbosstools-commits＠lists.jboss.org

Author: psrna Date: 2011-07-25 05:43:32 -0400 (Mon, 25 Jul 2011) New Revision: 33175 Modified: trunk/build/aggregate/bottests-site/features/org.jboss.tools.bot.test.feature/feature.xml Log: Modified: trunk/build/aggregate/bottests-site/features/org.jboss.tools.bot.test.feature/feature.xml =================================================================== --- trunk/build/aggregate/bottests-site/features/org.jboss.tools.bot.test.feature/feature.xml 2011-07-25 09:38:11 UTC (rev 33174) +++ trunk/build/aggregate/bottests-site/features/org.jboss.tools.bot.test.feature/feature.xml 2011-07-25 09:43:32 UTC (rev 33175) @@ -37,7 +37,7 @@  <plugin id="org.jboss.tools.bpel.ui.bot.test" download-size="0" install-size="0" version="0.0.0" /> - + <plugin id="org.jboss.tools.cdi.bot.test" download-size="0" install-size="0" version="0.0.0" /> <plugin id="org.jboss.tools.deltacloud.ui.bot.test" download-size="0" install-size="0" version="0.0.0" />  <plugin id="org.jboss.tools.esb.ui.bot.test" download-size="0" install-size="0" version="0.0.0" />

14 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r33174 - trunk/build/aggregate/bottests-site/features/org.jboss.tools.bot.test.feature.

by jbosstools-commits＠lists.jboss.org

Author: psrna Date: 2011-07-25 05:38:11 -0400 (Mon, 25 Jul 2011) New Revision: 33174 Modified: trunk/build/aggregate/bottests-site/features/org.jboss.tools.bot.test.feature/feature.xml Log: Modified: trunk/build/aggregate/bottests-site/features/org.jboss.tools.bot.test.feature/feature.xml =================================================================== --- trunk/build/aggregate/bottests-site/features/org.jboss.tools.bot.test.feature/feature.xml 2011-07-25 09:36:03 UTC (rev 33173) +++ trunk/build/aggregate/bottests-site/features/org.jboss.tools.bot.test.feature/feature.xml 2011-07-25 09:38:11 UTC (rev 33174) @@ -40,7 +40,7 @@  <plugin id="org.jboss.tools.deltacloud.ui.bot.test" download-size="0" install-size="0" version="0.0.0" />  - + <plugin id="org.jboss.tools.esb.ui.bot.test" download-size="0" install-size="0" version="0.0.0" />

14 years, 5 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits July 2011