JBoss Tools SVN: r35018 - in trunk/cdi/tests: org.jboss.tools.cdi.core.test and 8 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-09-23 17:30:26 -0400 (Fri, 23 Sep 2011)
New Revision: 35018
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/pom.xml
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/pom.xml
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.ui.test/pom.xml
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/pom.xml
trunk/cdi/tests/org.jboss.tools.cdi.seam.faces.core.test/pom.xml
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/pom.xml
trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/pom.xml
trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/pom.xml
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/pom.xml
trunk/cdi/tests/pom.xml
Log:
update code coverage for each test plugin to show coverage for all dependencies from cdi plugins
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/pom.xml
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/pom.xml 2011-09-23 20:46:06 UTC (rev 35017)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/pom.xml 2011-09-23 21:30:26 UTC (rev 35018)
@@ -8,9 +8,12 @@
</parent>
<groupId>org.jboss.tools.cdi.tests</groupId>
<artifactId>org.jboss.tools.cdi.core.test</artifactId>
-
<packaging>eclipse-test-plugin</packaging>
+ <properties>
+ <emma.instrument.bundles>org.jboss.tools.cdi.core,org.jboss.tools.cdi.xml</emma.instrument.bundles>
+ </properties>
+
<build>
<plugins>
<plugin>
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/pom.xml
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/pom.xml 2011-09-23 20:46:06 UTC (rev 35017)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/pom.xml 2011-09-23 21:30:26 UTC (rev 35018)
@@ -8,12 +8,10 @@
</parent>
<groupId>org.jboss.tools.cdi.tests</groupId>
<artifactId>org.jboss.tools.cdi.seam.config.core.test</artifactId>
-
<packaging>eclipse-test-plugin</packaging>
<properties>
- <emma.filter>org.jboss.tools.cdi*</emma.filter>
- <emma.instrument.bundles>org.jboss.tools.cdi.xml,org.jboss.tools.cdi.core,org.jboss.tools.cdi.seam.config.core</emma.instrument.bundles>
+ <emma.instrument.bundles>org.jboss.tools.cdi.seam.config.core,org.jboss.tools.cdi.core,org.jboss.tools.cdi.xml</emma.instrument.bundles>
</properties>
<build>
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.ui.test/pom.xml
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.ui.test/pom.xml 2011-09-23 20:46:06 UTC (rev 35017)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.ui.test/pom.xml 2011-09-23 21:30:26 UTC (rev 35018)
@@ -9,12 +9,10 @@
</parent>
<groupId>org.jboss.tools.cdi.tests</groupId>
<artifactId>org.jboss.tools.cdi.seam.config.ui.test</artifactId>
-
<packaging>eclipse-test-plugin</packaging>
<properties>
- <emma.filter>org.jboss.tools.cdi.seam.config.ui.*</emma.filter>
- <emma.instrument.bundles>org.jboss.tools.cdi.seam.config.ui</emma.instrument.bundles>
+ <emma.instrument.bundles>org.jboss.tools.cdi.seam.config.ui,org.jboss.tools.cdi.core,org.jboss.tools.cdi.ui,org.jboss.tools.cdi.xml,org.jboss.tools.cdi.seam.config.core,org.jboss.tools.cdi.seam.solder.core</emma.instrument.bundles>
</properties>
<build>
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/pom.xml
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/pom.xml 2011-09-23 20:46:06 UTC (rev 35017)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/pom.xml 2011-09-23 21:30:26 UTC (rev 35018)
@@ -7,15 +7,9 @@
<version>1.2.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.cdi.tests</groupId>
- <artifactId>org.jboss.tools.cdi.seam.core.test</artifactId>
-
+ <artifactId>org.jboss.tools.cdi.seam.core.test</artifactId>
<packaging>eclipse-test-plugin</packaging>
-
- <properties>
- <emma.filter>org.jboss.tools.cdi.seam.core*</emma.filter>
- <emma.instrument.bundles>org.jboss.tools.cdi.seam.core</emma.instrument.bundles>
- </properties>
-
+
<build>
<plugins>
<plugin>
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.faces.core.test/pom.xml
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.faces.core.test/pom.xml 2011-09-23 20:46:06 UTC (rev 35017)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.faces.core.test/pom.xml 2011-09-23 21:30:26 UTC (rev 35018)
@@ -8,14 +8,12 @@
</parent>
<groupId>org.jboss.tools.cdi.tests</groupId>
<artifactId>org.jboss.tools.cdi.seam.faces.core.test</artifactId>
-
<packaging>eclipse-test-plugin</packaging>
-
+
<properties>
- <emma.filter>org.jboss.tools.cdi.seam.faces.core*</emma.filter>
- <emma.instrument.bundles>org.jboss.tools.cdi.seam.faces.core</emma.instrument.bundles>
+ <emma.instrument.bundles>org.jboss.tools.cdi.seam.faces.core,org.jboss.tools.cdi.core,org.jboss.tools.cdi.xml</emma.instrument.bundles>
</properties>
-
+
<build>
<plugins>
<plugin>
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/pom.xml
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/pom.xml 2011-09-23 20:46:06 UTC (rev 35017)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/pom.xml 2011-09-23 21:30:26 UTC (rev 35018)
@@ -8,12 +8,10 @@
</parent>
<groupId>org.jboss.tools.cdi.tests</groupId>
<artifactId>org.jboss.tools.cdi.seam.solder.core.test</artifactId>
-
<packaging>eclipse-test-plugin</packaging>
<properties>
- <emma.filter>org.jboss.tools.cdi.seam.solder.core*</emma.filter>
- <emma.instrument.bundles>org.jboss.tools.cdi.seam.solder.core</emma.instrument.bundles>
+ <emma.instrument.bundles>org.jboss.tools.cdi.seam.solder.core,org.jboss.tools.cdi.core,org.jboss.tools.cdi.xml</emma.instrument.bundles>
</properties>
<build>
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/pom.xml
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/pom.xml 2011-09-23 20:46:06 UTC (rev 35017)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/pom.xml 2011-09-23 21:30:26 UTC (rev 35018)
@@ -8,12 +8,10 @@
</parent>
<groupId>org.jboss.tools.cdi.tests</groupId>
<artifactId>org.jboss.tools.cdi.seam.text.ext.test</artifactId>
-
<packaging>eclipse-test-plugin</packaging>
<properties>
- <emma.filter>org.jboss.tools.cdi.seam.text.ext*</emma.filter>
- <emma.instrument.bundles>org.jboss.tools.cdi.seam.text.ext</emma.instrument.bundles>
+ <emma.instrument.bundles>org.jboss.tools.cdi.seam.text.ext,org.jboss.tools.cdi.core,org.jboss.tools.cdi.ui,org.jboss.tools.cdi.xml,org.jboss.tools.cdi.seam.config.core,org.jboss.tools.cdi.seam.solder.core</emma.instrument.bundles>
</properties>
<build>
Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/pom.xml
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/pom.xml 2011-09-23 20:46:06 UTC (rev 35017)
+++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/pom.xml 2011-09-23 21:30:26 UTC (rev 35018)
@@ -8,12 +8,10 @@
</parent>
<groupId>org.jboss.tools.cdi.tests</groupId>
<artifactId>org.jboss.tools.cdi.text.ext.test</artifactId>
-
<packaging>eclipse-test-plugin</packaging>
<properties>
- <emma.filter>org.jboss.tools.cdi.text.ext*</emma.filter>
- <emma.instrument.bundles>org.jboss.tools.cdi.text.ext</emma.instrument.bundles>
+ <emma.instrument.bundles>org.jboss.tools.cdi.text.ext,org.jboss.tools.cdi.core,org.jboss.tools.cdi.ui,org.jboss.tools.cdi.xml</emma.instrument.bundles>
</properties>
<build>
Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/pom.xml
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/pom.xml 2011-09-23 20:46:06 UTC (rev 35017)
+++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/pom.xml 2011-09-23 21:30:26 UTC (rev 35018)
@@ -8,12 +8,10 @@
</parent>
<groupId>org.jboss.tools.cdi.tests</groupId>
<artifactId>org.jboss.tools.cdi.ui.test</artifactId>
-
<packaging>eclipse-test-plugin</packaging>
<properties>
- <emma.filter>org.jboss.tools.cdi.ui*</emma.filter>
- <emma.instrument.bundles>org.jboss.tools.cdi.ui</emma.instrument.bundles>
+ <emma.instrument.bundles>org.jboss.tools.cdi.ui,org.jboss.tools.cdi.core,org.jboss.tools.cdi.xml</emma.instrument.bundles>
</properties>
<build>
Modified: trunk/cdi/tests/pom.xml
===================================================================
--- trunk/cdi/tests/pom.xml 2011-09-23 20:46:06 UTC (rev 35017)
+++ trunk/cdi/tests/pom.xml 2011-09-23 21:30:26 UTC (rev 35018)
@@ -11,7 +11,6 @@
<name>cdi.tests</name>
<properties>
<emma.filter>org.jboss.tools.cdi*</emma.filter>
- <emma.instrument.bundles>org.jboss.tools.cdi.core</emma.instrument.bundles>
</properties>
<packaging>pom</packaging>
<modules>
14 years, 6 months
JBoss Tools SVN: r35017 - trunk/download.jboss.org/jbosstools/updates/requirements/springide.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-09-23 16:46:06 -0400 (Fri, 23 Sep 2011)
New Revision: 35017
Modified:
trunk/download.jboss.org/jbosstools/updates/requirements/springide/build.xml
trunk/download.jboss.org/jbosstools/updates/requirements/springide/pom.xml
Log:
tweaks to pom and build scripts
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/springide/build.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/springide/build.xml 2011-09-23 20:29:13 UTC (rev 35016)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/springide/build.xml 2011-09-23 20:46:06 UTC (rev 35017)
@@ -22,10 +22,10 @@
org.eclipse.equinox.launcher.Main -vm ${JAVA_HOME} -consoleLog -nosplash -data /tmp \
-application org.eclipse.ant.core.antRunner -f build.xml
-->
- <target name="default" depends="mirror,apply.patch,regenerate.metadta" />
- <target name="patch.and.regen" depends="apply.patch,regenerate.metadta" />
+ <target name="default" depends="init,mirror,apply.patch,regenerate.metadata" />
+ <target name="patch.and.regen" depends="init,apply.patch,regenerate.metadata" />
- <target name="mirror">
+ <target name="init">
<!-- Other URLs:
http://dist.springframework.org/release/IDE/
http://dist.springframework.org/snapshot/IDE/weekly/
@@ -35,7 +35,9 @@
<property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/springide/" />
<property name="siteVersion" value="2.6.0.201103160035" />
<property name="compress" value="true" />
-
+ </target>
+
+ <target name="mirror">
<p2.mirror>
<repository location="file:${destination}/${siteVersion}/" name="springide plugins for Eclipse 3.6 - 3.7" />
<source>
@@ -54,7 +56,6 @@
<slicingoptions includefeatures="true" followstrict="true" latestversiononly="false" platformfilter="true" />
</p2.mirror>
-
</target>
<target name="apply.patch">
@@ -87,7 +88,7 @@
<delete dir="${destination}/${siteVersion}/plugins/org.springframework.ide.eclipse/" quiet="true" />
</target>
- <target name="regenerate.metadta">
+ <target name="regenerate.metadata">
<p2.publish.featuresAndBundles metadataRepository="file:${destination}/${siteVersion}/" artifactRepository="file:${destination}/${siteVersion}/" publishartifacts="true" source="${destination}/${siteVersion}/" compress="${compress}" />
</target>
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/springide/pom.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/springide/pom.xml 2011-09-23 20:29:13 UTC (rev 35016)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/springide/pom.xml 2011-09-23 20:46:06 UTC (rev 35017)
@@ -105,7 +105,7 @@
<!-- remove the target/ folder -->
<delete dir="${project.build.directory}" quiet="true" />
<echo>To apply patch to disable SpringIDE welcome page (JBDS-1838), run build.xml in this folder passing in these parameters:
- -DsiteVersion=${siteVersion} -DURL=${sourceURL}
+ patch.and.regen -DsiteVersion=${siteVersion} -DURL=${sourceURL}
</echo>
</tasks>
</configuration>
14 years, 6 months
JBoss Tools SVN: r35015 - trunk/download.jboss.org/jbosstools/updates/requirements/springide.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-09-23 16:28:59 -0400 (Fri, 23 Sep 2011)
New Revision: 35015
Modified:
trunk/download.jboss.org/jbosstools/updates/requirements/springide/pom.xml
Log:
because we can't call an eclipse process from Tycho direcly, just echo instuctions to console (JBDS-1838)
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/springide/pom.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/springide/pom.xml 2011-09-23 20:28:44 UTC (rev 35014)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/springide/pom.xml 2011-09-23 20:28:59 UTC (rev 35015)
@@ -7,14 +7,16 @@
<version>0.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
- <!-- TODO: when there's enough of these scripts, externalize these to a parent pom in ../ -->
+ <!-- TODO: when there's enough of these scripts, externalize these to a
+ parent pom in ../ -->
<tychoVersion>0.13.0</tychoVersion>
<maven.antrun.plugin.version>1.3</maven.antrun.plugin.version>
-
+
<!-- TODO: update this every time you use this script against a new target
version + resulting folder -->
<sourceURL>http://dist.springsource.com/release/TOOLS/update/e3.7</sourceURL>
- <siteVersion>2.7.2.201109131000</siteVersion>
+ <siteVersion>2.7.2.201109122348</siteVersion>
+ <destination>${project.build.directory}/../${siteVersion}</destination>
</properties>
<build>
@@ -72,7 +74,7 @@
</iu>
</ius>
<!-- The destination directory to mirror to. -->
- <destination>${project.build.directory}/../${siteVersion}</destination>
+ <destination>${destination}</destination>
<!-- Whether only strict dependencies should be followed. -->
<!-- "strict" means perfect version match -->
<followStrictOnly>true</followStrictOnly>
@@ -102,6 +104,9 @@
<tasks>
<!-- remove the target/ folder -->
<delete dir="${project.build.directory}" quiet="true" />
+ <echo>To apply patch to disable SpringIDE welcome page (JBDS-1838), run build.xml in this folder passing in these parameters:
+ -DsiteVersion=${siteVersion} -DURL=${sourceURL}
+ </echo>
</tasks>
</configuration>
<goals>
14 years, 6 months
JBoss Tools SVN: r35014 - trunk/download.jboss.org/jbosstools/updates/requirements/springide.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-09-23 16:28:44 -0400 (Fri, 23 Sep 2011)
New Revision: 35014
Modified:
trunk/download.jboss.org/jbosstools/updates/requirements/springide/build.xml
Log:
add patch script for 2.6 and 2.7 (JBDS-1838)
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/springide/build.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/springide/build.xml 2011-09-23 20:19:50 UTC (rev 35013)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/springide/build.xml 2011-09-23 20:28:44 UTC (rev 35014)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project default="mirror">
+<project default="default">
<!-- run locally in Eclipse (to resolve p2 tasks) using these commandline options:
-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}
@@ -14,7 +14,17 @@
org.eclipse.equinox.launcher.Main -vm ${JAVA_HOME} -consoleLog -nosplash -data /tmp \
-application org.eclipse.ant.core.antRunner \
-f ~/RHDS/updates/requirements/springide/build.xml -Ddestination=/tmp/pmd-repo
+
+ or, run local:
+
+ export JAVA_HOME=/opt/jdk1.6.0; \
+ java -cp ~/eclipse/eclipse370/plugins/org.eclipse.equinox.launcher_1.2.0.v20110502.jar \
+ org.eclipse.equinox.launcher.Main -vm ${JAVA_HOME} -consoleLog -nosplash -data /tmp \
+ -application org.eclipse.ant.core.antRunner -f build.xml
-->
+ <target name="default" depends="mirror,apply.patch,regenerate.metadta" />
+ <target name="patch.and.regen" depends="apply.patch,regenerate.metadta" />
+
<target name="mirror">
<!-- Other URLs:
http://dist.springframework.org/release/IDE/
@@ -22,11 +32,12 @@
http://dist.springsource.com/release/TOOLS/update/e3.6/
-->
<property name="URL" value="http://dist.springsource.com/release/TOOLS/update/e3.6/" />
- <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/springide/2.6.0.201103160035/" />
+ <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/springide/" />
+ <property name="siteVersion" value="2.6.0.201103160035" />
<property name="compress" value="true" />
<p2.mirror>
- <repository location="file:${destination}/2.6.0.201103160035/" name="springide plugins for Eclipse 3.6 - 3.7" />
+ <repository location="file:${destination}/${siteVersion}/" name="springide plugins for Eclipse 3.6 - 3.7" />
<source>
<repository location="${URL}" />
</source>
@@ -41,9 +52,43 @@
<iu id="org.springframework.ide.eclipse.autowire.feature.feature.group" />
<iu id="org.springframework.ide.eclipse.mylyn.feature.feature.group" />
- <slicingoptions includefeatures="true" followstrict="true" latestversiononly="true" platformfilter="true" />
+ <slicingoptions includefeatures="true" followstrict="true" latestversiononly="false" platformfilter="true" />
</p2.mirror>
- <p2.publish.featuresAndBundles metadataRepository="file:${destination}/2.6.0.201103160035/" artifactRepository="file:${destination}/2.6.0.201103160035/" publishartifacts="true" source="${destination}/2.6.0.201103160035/" compress="${compress}" />
</target>
+
+ <target name="apply.patch">
+ <echo>JBDS-1838 :: Apply patch to disable SpringIDE welcome page</echo>
+ <!-- unzip jar
+ replace about.ini
+ replace MANIFEST.MF
+ delete welcome.xml META-INF/VMWARE.*
+ zip jar -->
+ <copy file="${destination}/${siteVersion}/plugins/org.springframework.ide.eclipse_${siteVersion}-RELEASE.jar" tofile="${destination}/${siteVersion}/plugins/org.springframework.ide.eclipse_${siteVersion}-RELEASE_ORIGINAL.jar" />
+ <unzip src="${destination}/${siteVersion}/plugins/org.springframework.ide.eclipse_${siteVersion}-RELEASE.jar" dest="${destination}/${siteVersion}/plugins/org.springframework.ide.eclipse" />
+ <echo file="${destination}/${siteVersion}/plugins/org.springframework.ide.eclipse/about.ini">
+aboutText=%title
+featureImage=feature_image.png
+</echo>
+ <echo file="${destination}/${siteVersion}/plugins/org.springframework.ide.eclipse/META-INF/MANIFEST.MF">Manifest-Version: 1.0
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-Vendor: %providerName
+Bundle-Version: ${siteVersion}-RELEASE
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.springframework.ide.eclipse
+</echo>
+ <delete quiet="true">
+ <fileset dir="${destination}/${siteVersion}/plugins/org.springframework.ide.eclipse" includes="welcome.xml" />
+ <fileset dir="${destination}/${siteVersion}/plugins/org.springframework.ide.eclipse/META-INF" includes="eclipse.inf, VMWARE.RSA, VMWARE.SF" />
+ </delete>
+ <zip destfile="${destination}/${siteVersion}/plugins/org.springframework.ide.eclipse_${siteVersion}-RELEASE.jar" basedir="${destination}/${siteVersion}/plugins/org.springframework.ide.eclipse/" />
+ <delete dir="${destination}/${siteVersion}/plugins/org.springframework.ide.eclipse/" quiet="true" />
+ </target>
+
+ <target name="regenerate.metadta">
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/${siteVersion}/" artifactRepository="file:${destination}/${siteVersion}/" publishartifacts="true" source="${destination}/${siteVersion}/" compress="${compress}" />
+ </target>
+
</project>
14 years, 6 months
JBoss Tools SVN: r35013 - trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-09-23 16:19:50 -0400 (Fri, 23 Sep 2011)
New Revision: 35013
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/CDISeamSolderGenericBeanExtension.java
Log:
Check for null added before invoking addAnnotation method.
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/CDISeamSolderGenericBeanExtension.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/CDISeamSolderGenericBeanExtension.java 2011-09-23 19:00:23 UTC (rev 35012)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/CDISeamSolderGenericBeanExtension.java 2011-09-23 20:19:50 UTC (rev 35013)
@@ -148,7 +148,10 @@
}
AnnotationDeclaration gd = f.getAnnotation(GENERIC_QUALIFIER_TYPE_NAME);
f.removeAnnotation(gd);
- f.addAnnotation(createInjectGenericAnnotation(gd, context.getRootContext().getProject()), context.getRootContext());
+ IJavaAnnotation ja = createInjectGenericAnnotation(gd, context.getRootContext().getProject());
+ if(ja != null) {
+ f.addAnnotation(ja, context.getRootContext());
+ }
}
}
@@ -167,7 +170,10 @@
AnnotationDeclaration gd = p.getAnnotation(GENERIC_QUALIFIER_TYPE_NAME);
if(gd != null) {
p.removeAnnotation(gd);
- p.addAnnotation(createInjectGenericAnnotation(gd, context.getRootContext().getProject()), context.getRootContext());
+ IJavaAnnotation ja = createInjectGenericAnnotation(gd, context.getRootContext().getProject());
+ if(ja != null) {
+ p.addAnnotation(ja, context.getRootContext());
+ }
}
}
}
14 years, 6 months
JBoss Tools SVN: r35012 - trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2011-09-23 15:00:23 -0400 (Fri, 23 Sep 2011)
New Revision: 35012
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/XHTMLValidatorTest.java
Log:
JBIDE-9588
Poor performance of XHTML template validation
JUnit Test for XHTML Syntax Validator is added
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/XHTMLValidatorTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/XHTMLValidatorTest.java 2011-09-23 18:44:18 UTC (rev 35011)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/XHTMLValidatorTest.java 2011-09-23 19:00:23 UTC (rev 35012)
@@ -30,8 +30,20 @@
protected static String PROJECT_PATH = "/projects/jsf2pr";
protected static final String FILE_NAME = "WebContent/XHTMLValidatorTest.xhtml";
- protected static final double NOT_BAD_DIFF_PERCENTAGE = 200.0;
+ protected static Set<String> LOCALIZED_ERROR_MESSAGES = new HashSet<String>();
+ static {
+ LOCALIZED_ERROR_MESSAGES.add(MessageFormat.format(JSFValidationMessage.XHTML_VALIDATION_NO_END_TAG,
+ XHTMLValidationTestMessages.XHTML_GOOD_TAGNAME));
+ LOCALIZED_ERROR_MESSAGES.add(MessageFormat.format(JSFValidationMessage.XHTML_VALIDATION_NO_START_TAG,
+ XHTMLValidationTestMessages.XHTML_WRONG_TAGNAME));
+ }
+ // "Bad" file validation time should be not greater than "Good" file validation time multiplied by 10
+ protected static final double NOT_BAD_DIFF_PERCENTAGE = 1000.0;
+
+ // Each validation session should take less that 1 second (1000ms)
+ protected static final long MAX_VALIDATION_TIME = 1000;
+
IProject project;
/* (non-Javadoc)
@@ -69,6 +81,7 @@
ValidationResult result = validator.validate(file, IResourceDelta.CHANGED, state, new NullProgressMonitor());
long goodValidationTime = System.currentTimeMillis() - start;
System.out.println("Good XHTML file with no XHTML Syntax errors validation time: " + goodValidationTime + " ms");
+ assertTrue("Good XHTML file with no XHTML Syntax errors validation takes too much time (more than " + MAX_VALIDATION_TIME + " ms)", (goodValidationTime < MAX_VALIDATION_TIME));
assertNotNull("No validation result is returned", result);
assertNotNull("No validation result is returned", result.getReporter(null));
List messages = result.getReporter(null).getMessages();
@@ -82,6 +95,7 @@
result = validator.validate(file, IResourceDelta.CHANGED, state, new NullProgressMonitor());
long badValidationTime = System.currentTimeMillis() - start;
System.out.println("Bad XHTML file with no XHTML Syntax errors validation time: " + badValidationTime + " ms");
+ assertTrue("Bad XHTML file with no XHTML Syntax errors validation takes too much time (more than " + MAX_VALIDATION_TIME + " ms)", (badValidationTime < MAX_VALIDATION_TIME));
assertNotNull("No validation result is returned", result);
assertNotNull("No validation result is returned", result.getReporter(null));
messages = result.getReporter(null).getMessages();
@@ -100,19 +114,15 @@
result = validator.validate(file, IResourceDelta.CHANGED, state, new NullProgressMonitor());
goodValidationTime = System.currentTimeMillis() - start;
System.out.println("Good XHTML file with XHTML Syntax errors validation time: " + goodValidationTime + " ms");
+ assertTrue("Good XHTML file with XHTML Syntax errors validation takes too much time (more than " + MAX_VALIDATION_TIME + " ms)", (goodValidationTime < MAX_VALIDATION_TIME));
assertNotNull("No validation result is returned", result);
assertNotNull("No validation result is returned", result.getReporter(null));
messages = result.getReporter(null).getMessages();
assertEquals("Wrong number of error messages reported", 2, messages == null ? 0 : messages.size());
- Set<String> localizedErrorMessages = new HashSet<String>();
- localizedErrorMessages.add(MessageFormat.format(JSFValidationMessage.XHTML_VALIDATION_NO_END_TAG,
- XHTMLValidationTestMessages.XHTML_GOOD_TAGNAME));
- localizedErrorMessages.add(MessageFormat.format(JSFValidationMessage.XHTML_VALIDATION_NO_START_TAG,
- XHTMLValidationTestMessages.XHTML_WRONG_TAGNAME));
for (Object m : messages) {
assertTrue("Wrong type of validation message is returned", (m instanceof Message));
Message message = (Message)m;
- assertTrue("Unexpected error message found: " + message.getText(), localizedErrorMessages.contains(message.getText()));
+ assertTrue("Unexpected error message found: " + message.getText(), LOCALIZED_ERROR_MESSAGES.contains(message.getText()));
}
// Validate bad file with XHTML Syntax errors
@@ -123,19 +133,15 @@
result = validator.validate(file, IResourceDelta.CHANGED, state, new NullProgressMonitor());
badValidationTime = System.currentTimeMillis() - start;
System.out.println("Bad XHTML file with XHTML Syntax errors validation time: " + badValidationTime + " ms");
+ assertTrue("Bad XHTML file with XHTML Syntax errors validation takes too much time (more than " + MAX_VALIDATION_TIME + " ms)", (badValidationTime < MAX_VALIDATION_TIME));
assertNotNull("No validation result is returned", result);
assertNotNull("No validation result is returned", result.getReporter(null));
messages = result.getReporter(null).getMessages();
assertEquals("Wrong number of error messages reported", 2, messages == null ? 0 : messages.size());
- localizedErrorMessages = new HashSet<String>();
- localizedErrorMessages.add(MessageFormat.format(JSFValidationMessage.XHTML_VALIDATION_NO_END_TAG,
- XHTMLValidationTestMessages.XHTML_GOOD_TAGNAME));
- localizedErrorMessages.add(MessageFormat.format(JSFValidationMessage.XHTML_VALIDATION_NO_START_TAG,
- XHTMLValidationTestMessages.XHTML_WRONG_TAGNAME));
for (Object m : messages) {
assertTrue("Wrong type of validation message is returned", (m instanceof Message));
Message message = (Message)m;
- assertTrue("Unexpected error message found: " + message.getText(), localizedErrorMessages.contains(message.getText()));
+ assertTrue("Unexpected error message found: " + message.getText(), LOCALIZED_ERROR_MESSAGES.contains(message.getText()));
}
// Check that the difference between good and bad files validation time is not greater that NOT_BAD_DIFF_PERCENTAGE (%) of a good value
diff = 100*badValidationTime/goodValidationTime;
14 years, 6 months
JBoss Tools SVN: r35010 - trunk/download.jboss.org/jbosstools/updates/requirements/springide.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-09-23 14:44:04 -0400 (Fri, 23 Sep 2011)
New Revision: 35010
Added:
trunk/download.jboss.org/jbosstools/updates/requirements/springide/pom.xml
Log:
new site builder (p2 mirror) for SpringIDE 2.7.2 - uses Tycho 0.13 instead of Ant
Added: trunk/download.jboss.org/jbosstools/updates/requirements/springide/pom.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/springide/pom.xml (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/springide/pom.xml 2011-09-23 18:44:04 UTC (rev 35010)
@@ -0,0 +1,115 @@
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>org.jboss.tools.requirements.springide</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <properties>
+ <!-- TODO: when there's enough of these scripts, externalize these to a parent pom in ../ -->
+ <tychoVersion>0.13.0</tychoVersion>
+ <maven.antrun.plugin.version>1.3</maven.antrun.plugin.version>
+
+ <!-- TODO: update this every time you use this script against a new target
+ version + resulting folder -->
+ <sourceURL>http://dist.springsource.com/release/TOOLS/update/e3.7</sourceURL>
+ <siteVersion>2.7.2.201109131000</siteVersion>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <!-- see http://wiki.eclipse.org/Tycho/Additional_Tools -->
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-p2-extras-plugin</artifactId>
+ <version>${tychoVersion}</version>
+ <executions>
+ <execution>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>mirror</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <source>
+ <repository>
+ <url>${sourceURL}</url>
+ <layout>p2</layout>
+ </repository>
+ </source>
+
+ <!-- List of IUs to mirror. If omitted, all IUs will be mirrored. -->
+ <!-- Omitted IU version element means latest version of the IU -->
+ <ius>
+ <iu>
+ <id>org.springframework.ide.eclipse.feature.feature.group</id>
+ </iu>
+ <iu>
+ <id>org.springframework.ide.eclipse.aop.feature.feature.group</id>
+ </iu>
+ <iu>
+ <id>org.springframework.ide.eclipse.osgi.feature.feature.group</id>
+ </iu>
+ <iu>
+ <id>org.springframework.ide.eclipse.webflow.feature.feature.group</id>
+ </iu>
+ <iu>
+ <id>org.springframework.ide.eclipse.batch.feature.feature.group</id>
+ </iu>
+ <iu>
+ <id>org.springframework.ide.eclipse.integration.feature.feature.group</id>
+ </iu>
+ <iu>
+ <id>org.springframework.ide.eclipse.security.feature.feature.group</id>
+ </iu>
+ <iu>
+ <id>org.springframework.ide.eclipse.autowire.feature.feature.group</id>
+ </iu>
+ <iu>
+ <id>org.springframework.ide.eclipse.mylyn.feature.feature.group</id>
+ </iu>
+ </ius>
+ <!-- The destination directory to mirror to. -->
+ <destination>${project.build.directory}/../${siteVersion}</destination>
+ <!-- Whether only strict dependencies should be followed. -->
+ <!-- "strict" means perfect version match -->
+ <followStrictOnly>true</followStrictOnly>
+ <!-- Whether or not to follow optional requirements. -->
+ <includeOptional>false</includeOptional>
+ <!-- Whether or not to follow non-greedy requirements. -->
+ <includeNonGreedy>true</includeNonGreedy>
+ <!-- filter properties. E.g. filter only one platform -->
+ <!-- <filter> <osgi.os>linux</osgi.os> <osgi.ws>gtk</osgi.ws> <osgi.arch>x86_64</osgi.arch>
+ </filter> -->
+ <latestVersionOnly>true</latestVersionOnly>
+ <mirrorMetadataOnly>false</mirrorMetadataOnly>
+ <compress>true</compress>
+ <append>false</append>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>${maven.antrun.plugin.version}</version>
+ <executions>
+ <execution>
+ <id>install</id>
+ <phase>install</phase>
+ <configuration>
+ <quiet>true</quiet>
+ <tasks>
+ <!-- remove the target/ folder -->
+ <delete dir="${project.build.directory}" quiet="true" />
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
14 years, 6 months
JBoss Tools SVN: r35009 - trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2011-09-23 14:20:14 -0400 (Fri, 23 Sep 2011)
New Revision: 35009
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/XHTMLValidatorTest.java
Log:
JBIDE-9588
Poor performance of XHTML template validation
JUnit Test for XHTML Syntax Validator is added
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/XHTMLValidatorTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/XHTMLValidatorTest.java 2011-09-23 18:18:02 UTC (rev 35008)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/XHTMLValidatorTest.java 2011-09-23 18:20:14 UTC (rev 35009)
@@ -7,11 +7,8 @@
import java.util.List;
import java.util.Set;
-import org.apache.xerces.impl.dv.dtd.NOTATIONDatatypeValidator;
import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IResourceDelta;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
@@ -19,14 +16,9 @@
import org.eclipse.wst.validation.ValidationResult;
import org.eclipse.wst.validation.ValidationState;
import org.eclipse.wst.validation.internal.core.Message;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.xml.core.internal.validation.core.AbstractNestedValidator;
-import org.eclipse.wst.xml.core.internal.validation.core.ValidationReport;
import org.jboss.tools.common.base.test.validation.TestUtil;
import org.jboss.tools.jsf.web.validation.JSFValidationMessage;
import org.jboss.tools.jsf.web.validation.XHTMLValidator;
-import org.jboss.tools.jsf.web.validation.i18n.I18nValidationComponent;
-import org.jboss.tools.jst.web.kb.preferences.ELSeverityPreferences;
import org.jboss.tools.test.util.JobUtils;
import org.jboss.tools.test.util.ResourcesUtils;
import org.jboss.tools.tests.AbstractResourceMarkerTest;
@@ -96,7 +88,7 @@
assertEquals("Wrong number of error messages reported", 0, messages == null ? 0 : messages.size());
// Check that the difference between good and bad files validation time is not greater that NOT_BAD_DIFF_PERCENTAGE (%) of a good value
- double diff = 100*(badValidationTime - goodValidationTime)/goodValidationTime;
+ double diff = 100*badValidationTime/goodValidationTime;
System.out.println("(With no errors) Validation time difference: " + diff + "%");
assertTrue("Validation time difference between good and wrong content is greater than " + NOT_BAD_DIFF_PERCENTAGE + "%", (diff < NOT_BAD_DIFF_PERCENTAGE));
@@ -146,7 +138,7 @@
assertTrue("Unexpected error message found: " + message.getText(), localizedErrorMessages.contains(message.getText()));
}
// Check that the difference between good and bad files validation time is not greater that NOT_BAD_DIFF_PERCENTAGE (%) of a good value
- diff = 100*(badValidationTime - goodValidationTime)/goodValidationTime;
+ diff = 100*badValidationTime/goodValidationTime;
System.out.println("(With errors) Validation time difference: " + diff + "%");
assertTrue("Validation time difference between good and wrong content is greater than " + NOT_BAD_DIFF_PERCENTAGE + "%", (diff < NOT_BAD_DIFF_PERCENTAGE));
} finally {
14 years, 6 months