JBoss Tools SVN: r21874 - branches/modular_build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-05-03 18:20:26 -0400 (Mon, 03 May 2010)
New Revision: 21874
Modified:
branches/modular_build/parent-pom.xml
Log:
reconfigure the suffix used in plugin qualifiers
Modified: branches/modular_build/parent-pom.xml
===================================================================
--- branches/modular_build/parent-pom.xml 2010-05-03 22:20:04 UTC (rev 21873)
+++ branches/modular_build/parent-pom.xml 2010-05-03 22:20:26 UTC (rev 21874)
@@ -18,7 +18,7 @@
<plugin>
<groupId>org.codehaus.tycho</groupId>
<artifactId>maven-osgi-packaging-plugin</artifactId>
- <version>${tycho-version}</version>
+ <version>${tychoVersion}</version>
<configuration>
<format>'v'yyyyMMdd-HHmm</format>
</configuration>
@@ -379,6 +379,15 @@
<!-- https://issues.sonatype.org/browse/TYCHO-413: does not work - doesn't
respect username & ssh key -->
<distributionManagement>
+
+ <snapshotRepository>
+ <id>jbosstools.internal.repo.snapshot</id>
+ <name>JBoss Tools Internal Snapshot Repository</name>
+ <url>sftp://filemgmt.jboss.org/downloads_htdocs/tools/repository/SNAPSHOT/
+ </url>
+ <uniqueVersion>false</uniqueVersion>
+ </snapshotRepository>
+
<!-- http://download.jboss.org/jbosstools/ -->
<!-- <repository> <id>jbosstools.internal.repo</id> <url> scp://filemgmt.jboss.org/downloads_htdocs/tools/repository/
</url> </repository> -->
14 years, 8 months
JBoss Tools SVN: r21873 - branches/modular_build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-05-03 18:20:04 -0400 (Mon, 03 May 2010)
New Revision: 21873
Modified:
branches/modular_build/parent-pom.xml
Log:
reconfigure the suffix used in plugin qualifiers
Modified: branches/modular_build/parent-pom.xml
===================================================================
--- branches/modular_build/parent-pom.xml 2010-05-03 22:02:28 UTC (rev 21872)
+++ branches/modular_build/parent-pom.xml 2010-05-03 22:20:04 UTC (rev 21873)
@@ -16,6 +16,15 @@
<build>
<plugins>
<plugin>
+ <groupId>org.codehaus.tycho</groupId>
+ <artifactId>maven-osgi-packaging-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <format>'v'yyyyMMdd-HHmm</format>
+ </configuration>
+ </plugin>
+
+ <plugin>
<groupId>org.sonatype.tycho</groupId>
<artifactId>tycho-maven-plugin</artifactId>
<version>${tychoVersion}</version>
14 years, 8 months
JBoss Tools SVN: r21872 - branches/modular_build/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-05-03 18:02:28 -0400 (Mon, 03 May 2010)
New Revision: 21872
Modified:
branches/modular_build/build/build.xml
Log:
fix expected paths
Modified: branches/modular_build/build/build.xml
===================================================================
--- branches/modular_build/build/build.xml 2010-05-03 21:50:49 UTC (rev 21871)
+++ branches/modular_build/build/build.xml 2010-05-03 22:02:28 UTC (rev 21872)
@@ -1126,7 +1126,7 @@
<for param="expected.dir" list="${get.sources.expected.dirs}" delimiter=",
">
<sequential>
- <delete dir="@{expected.dir}" includeemptydirs="true" />
+ <delete dir="${WORKINGDIR}/(a){expected.dir}" includeemptydirs="true" />
<delete file="${WORKINGDIR}/svn.info-(a){expected.dir}.txt" />
</sequential>
</for>
@@ -1144,9 +1144,9 @@
<for param="expected.dir" list="${get.sources.expected.dirs}" delimiter=",
">
<sequential>
- <assert failonerror="true" message="Dir @{expected.dir} not found!">
+ <assert failonerror="true" message="Dir ${WORKINGDIR}/(a){expected.dir} not found!">
<bool>
- <available file="@{expected.dir}" type="dir" />
+ <available file="${WORKINGDIR}/(a){expected.dir}" type="dir" />
</bool>
</assert>
</sequential>
@@ -1154,9 +1154,9 @@
<for param="expected.file" list="${get.sources.expected.files}" delimiter=",
">
<sequential>
- <assert failonerror="true" message="Dir @{expected.file} not found!">
+ <assert failonerror="true" message="Dir ${WORKINGDIR}/(a){expected.file} not found!">
<bool>
- <available file="@{expected.file}" type="file" />
+ <available file="${WORKINGDIR}/(a){expected.file}" type="file" />
</bool>
</assert>
</sequential>
@@ -1185,9 +1185,9 @@
<for param="expected.dir" list="${get.sources.expected.dirs}" delimiter=",
">
<sequential>
- <assert failonerror="true" message="Dir @{expected.dir} not found!">
+ <assert failonerror="true" message="Dir ${WORKINGDIR}/(a){expected.dir} not found!">
<bool>
- <available file="@{expected.dir}" type="dir" />
+ <available file="${WORKINGDIR}/(a){expected.dir}" type="dir" />
</bool>
</assert>
</sequential>
@@ -1195,9 +1195,9 @@
<for param="expected.file" list="${get.sources.expected.files}" delimiter=",
">
<sequential>
- <assert failonerror="true" message="Dir @{expected.file} not found!">
+ <assert failonerror="true" message="Dir ${WORKINGDIR}/(a){expected.file} not found!">
<bool>
- <available file="@{expected.file}" type="file" />
+ <available file="${WORKINGDIR}/(a){expected.file}" type="file" />
</bool>
</assert>
</sequential>
@@ -1223,9 +1223,9 @@
<for param="expected.dir" list="${get.sources.expected.dirs}" delimiter=",
">
<sequential>
- <assert failonerror="true" message="Dir @{expected.dir} not found!">
+ <assert failonerror="true" message="Dir ${WORKINGDIR}/(a){expected.dir} not found!">
<bool>
- <available file="@{expected.dir}" type="dir" />
+ <available file="${WORKINGDIR}/(a){expected.dir}" type="dir" />
</bool>
</assert>
</sequential>
@@ -1233,9 +1233,9 @@
<for param="expected.file" list="${get.sources.expected.files}" delimiter=",
">
<sequential>
- <assert failonerror="true" message="Dir @{expected.file} not found!">
+ <assert failonerror="true" message="Dir ${WORKINGDIR}/(a){expected.file} not found!">
<bool>
- <available file="@{expected.file}" type="file" />
+ <available file="${WORKINGDIR}/(a){expected.file}" type="file" />
</bool>
</assert>
</sequential>
14 years, 8 months
JBoss Tools SVN: r21871 - branches/modular_build/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-05-03 17:50:49 -0400 (Mon, 03 May 2010)
New Revision: 21871
Modified:
branches/modular_build/build/build.xml
Log:
fix code to get feature.id from feature path when generating site.xml; add tests
Modified: branches/modular_build/build/build.xml
===================================================================
--- branches/modular_build/build/build.xml 2010-05-03 21:45:42 UTC (rev 21870)
+++ branches/modular_build/build/build.xml 2010-05-03 21:50:49 UTC (rev 21871)
@@ -656,10 +656,10 @@
</else>
</if>
- <!-- Call maven to generate pom.xml, then build site from site.xml -->
<if>
<equals arg1="${COMPONENTS.to.build}" arg2="site" />
<then>
+ <!-- Call maven to generate pom.xml, then build site from site.xml -->
<antcall target="run.build">
<param name="COMPONENTS.to.build" value="${COMPONENTS.to.build}" />
<param name="MAVEN_FLAGS" value="verify -q -B -fae -Dmaven.test.skip" />
@@ -667,6 +667,7 @@
</antcall>
</then>
<else>
+ <!-- Or just call maven to build site -->
<antcall target="mvn">
<param name="MAVEN_DIR" value="${WORKINGDIR}/${update.site.path}" />
<param name="MAVEN_FLAGS" value="verify -q -B -fae -Dmaven.test.skip" />
@@ -682,10 +683,7 @@
<copy todir="${WORKINGDIR}/${update.site.path}/target/site">
<fileset dir="${WORKINGDIR}/${update.site.path}" includes="web/*, index.html" />
</copy>
- <zip destfile="${destinationZip}"
- basedir="${WORKINGDIR}/${update.site.path}/target/site"
- update="false"
- />
+ <zip destfile="${destinationZip}" basedir="${WORKINGDIR}/${update.site.path}/target/site" update="false" />
<!-- Copy zip into workspace so it can be archived by Hudson -->
<if>
@@ -733,7 +731,7 @@
</echo>
</target>
-
+
<target name="genSiteXml" description="Generate a site.xml to contain the features in a category">
<property name="updateSiteJarDir" value="${WORKINGDIR}/${COMPONENT}/site" />
<property name="COMPONENT" value="${COMPONENT}" />
@@ -757,27 +755,9 @@
<sequential>
<var name="feature.jarfile" unset="true" />
<var name="feature.id" unset="true" />
- <propertyregex property="feature.jarfile"
- defaultvalue="@{featureJar}"
- input="@{featureJar}"
- regexp=".+/features/[^/]+/target/([^/]+feature.+\.jar)"
- replace="\1"
- override="true"
- />
- <propertyregex property="feature.id"
- defaultvalue="${feature.jarfile}"
- input="${feature.jarfile}"
- regexp="([^_]+)_(\d+\.\d+\.\d+\..+)\.jar"
- replace="\1"
- override="true"
- />
- <propertyregex property="feature.id"
- defaultvalue="${feature.jarfile}"
- input="${feature.jarfile}"
- regexp="([^_]+)-(\d+\.\d+\.\d+-SNAPSHOT)\.jar"
- replace="\1"
- override="true"
- />
+ <antcallback target="get.feature.id" return="feature.id">
+ <property name="featureJar" value="@{featureJar}" />
+ </antcallback>
<echo append="true" file="${updateSiteJarDir}/site.xml"> <feature url="features/${feature.id}_0.0.0.jar" id="${feature.id}" version="0.0.0">
<category name="${category.name}"/>
</feature>
@@ -791,6 +771,84 @@
</echo>
</target>
+ <target name="get.feature.id">
+ <propertyregex property="feature.jarfile"
+ defaultvalue="${featureJar}"
+ input="${featureJar}"
+ regexp=".+/features/[^/]+/target/([^/]+feature.+\.jar)"
+ replace="\1"
+ override="true"
+ />
+ <propertyregex property="feature.id"
+ defaultvalue="${feature.jarfile}"
+ input="${feature.jarfile}"
+ regexp="([^_]+)_(\d+\.\d+\.\d+\..+)\.jar"
+ replace="\1"
+ override="true"
+ />
+ <propertyregex property="feature.id"
+ defaultvalue="${feature.id}"
+ input="${feature.id}"
+ regexp="([^_]+)-(\d+\.\d+\.\d+\..+)\.jar"
+ replace="\1"
+ override="true"
+ />
+ <propertyregex property="feature.id"
+ defaultvalue="${feature.id}"
+ input="${feature.id}"
+ regexp="([^_]+)-(\d+\.\d+\.\d+-SNAPSHOT)\.jar"
+ replace="\1"
+ override="true"
+ />
+ <var name="featureJar" unset="true" />
+ </target>
+
+
+ <!-- single test, runs faster -->
+ <target name="test.get.feature.id.vpe">
+ <antcall target="test.get.feature.id">
+ <param name="COMPONENTS" value="vpe" />
+ </antcall>
+ </target>
+
+ <!-- test all feature.id fetches -->
+ <target name="test.get.feature.id" depends="init, test.expected.values">
+ <for param="COMPONENT" list="${COMPONENTS}" delimiter=";,
+ ">
+ <sequential>
+ <for param="featureJar" delimiter=", ">
+ <!-- list="org.jboss.tools.xulrunner.feature, org.jboss.tools.vpe.feature" -->
+ <path>
+ <fileset dir="${basedir}/@{COMPONENT}" includes="**/features/**/target/*.jar" />
+ </path>
+ <sequential>
+ <echo level="info">Test @{featureJar}</echo>
+ <antcallback target="get.feature.id" return="feature.id">
+ <property name="featureJar" value="@{featureJar}" />
+ </antcallback>
+ <var name="featureJar.path" unset="true" />
+ <propertyregex override="true"
+ property="feature.id.expected.name"
+ defaultvalue="@{featureJar}"
+ input="@{featureJar}"
+ regexp="${basedir}\/(.+)"
+ replace="get.feature.id.expected.\1"
+ />
+ <!-- <echo><property name="get.feature.id.expected.@{featureJar}" value="${feature.id}"/> </echo> -->
+
+ <propertycopy name="feature.id.expected" from="${feature.id.expected.name}" />
+ <assert failonerror="true" message="Expected: ${feature.id.expected}; got: ${feature.id}">
+ <bool>
+ <equals arg1="${feature.id.expected}" arg2="${feature.id}" />
+ </bool>
+ </assert>
+ <var name="feature.id.expected" unset="true" />
+ </sequential>
+ </for>
+ </sequential>
+ </for>
+ </target>
+
<!-- TODO: figure out why this fails with error:
insecure -e option not allowed.
This account is restricted by rssh.
@@ -867,6 +925,171 @@
<property name="get.components.to.test.expected"
value="tests,common,flow,jbpm,jmx,archives,as,drools,bpel,smooks,freemarker,profiler,portlet,xulrunner,jst,vpe,jsf,esb,tptp,ws,cdi,struts,hibernatetools,seam,examples,birt,maven,"
/>
+
+ <!-- expected values for test.get.feature.id -->
+ <property name="get.feature.id.expected.tests/features/org.jboss.tools.test.feature/target/org.jboss.tools.test.feature-3.1.0-SNAPSHOT.jar"
+ value="org.jboss.tools.test.feature"
+ />
+ <property name="get.feature.id.expected.common/features/org.jboss.tools.common.all.feature/target/org.jboss.tools.common.all.feature-3.1.0-SNAPSHOT.jar"
+ value="org.jboss.tools.common.all.feature"
+ />
+ <property name="get.feature.id.expected.common/features/org.jboss.tools.common.all.tests.feature/target/org.jboss.tools.common.all.tests.feature-3.1.0-SNAPSHOT.jar"
+ value="org.jboss.tools.common.all.tests.feature"
+ />
+ <property name="get.feature.id.expected.common/features/org.jboss.tools.common.core.feature/target/org.jboss.tools.common.core.feature-3.1.0-SNAPSHOT.jar"
+ value="org.jboss.tools.common.core.feature"
+ />
+ <property name="get.feature.id.expected.common/features/org.jboss.tools.common.feature/target/org.jboss.tools.common.feature-3.1.0-SNAPSHOT.jar"
+ value="org.jboss.tools.common.feature"
+ />
+ <property name="get.feature.id.expected.common/features/org.jboss.tools.common.text.ext.feature/target/org.jboss.tools.common.text.ext.feature-3.1.0-SNAPSHOT.jar"
+ value="org.jboss.tools.common.text.ext.feature"
+ />
+ <property name="get.feature.id.expected.common/features/org.jboss.tools.common.ui.feature/target/org.jboss.tools.common.ui.feature-3.1.0-SNAPSHOT.jar"
+ value="org.jboss.tools.common.ui.feature"
+ />
+ <property name="get.feature.id.expected.common/features/org.jboss.tools.common.verification.feature/target/org.jboss.tools.common.verification.feature-3.1.0-SNAPSHOT.jar"
+ value="org.jboss.tools.common.verification.feature"
+ />
+ <property name="get.feature.id.expected.flow/features/org.jboss.tools.flow.common.feature/target/org.jboss.tools.flow.common.feature-4.0.0-SNAPSHOT.jar"
+ value="org.jboss.tools.flow.common.feature"
+ />
+ <property name="get.feature.id.expected.jbpm/features/org.jboss.tools.flow.jpdl4.feature/target/org.jboss.tools.flow.jpdl4.feature-4.0.0-SNAPSHOT.jar"
+ value="org.jboss.tools.flow.jpdl4.feature"
+ />
+ <property name="get.feature.id.expected.jbpm/features/org.jboss.tools.jbpm.common.feature/target/org.jboss.tools.jbpm.common.feature-4.3.0-SNAPSHOT.jar"
+ value="org.jboss.tools.jbpm.common.feature"
+ />
+ <property name="get.feature.id.expected.jbpm/features/org.jboss.tools.jbpm.convert.feature/target/org.jboss.tools.jbpm.convert.feature-1.0.0-SNAPSHOT.jar"
+ value="org.jboss.tools.jbpm.convert.feature"
+ />
+ <property name="get.feature.id.expected.jbpm/features/org.jboss.tools.jbpm3.feature/target/org.jboss.tools.jbpm3.feature-3.2.0-SNAPSHOT.jar"
+ value="org.jboss.tools.jbpm3.feature"
+ />
+ <property name="get.feature.id.expected.jbpm/features/org.jboss.tools.jbpm3.tests.feature/target/org.jboss.tools.jbpm3.tests.feature-3.2.0-SNAPSHOT.jar"
+ value="org.jboss.tools.jbpm3.tests.feature"
+ />
+ <property name="get.feature.id.expected.jbpm/features/org.jboss.tools.jbpm4.feature/target/org.jboss.tools.jbpm4.feature-4.0.0-SNAPSHOT.jar"
+ value="org.jboss.tools.jbpm4.feature"
+ />
+ <property name="get.feature.id.expected.jbpm/features/org.jboss.tools.jbpm4.tests.feature/target/org.jboss.tools.jbpm4.tests.feature-4.3.0-SNAPSHOT.jar"
+ value="org.jboss.tools.jbpm4.tests.feature"
+ />
+ <property name="get.feature.id.expected.jbpm/features/org.jbpm.gd.jpdl.feature/target/org.jbpm.gd.jpdl.feature-3.2.0-SNAPSHOT.jar"
+ value="org.jbpm.gd.jpdl.feature"
+ />
+ <property name="get.feature.id.expected.jmx/features/org.jboss.tools.jmx.feature/target/org.jboss.tools.jmx.feature-1.1.0-SNAPSHOT.jar"
+ value="org.jboss.tools.jmx.feature"
+ />
+ <property name="get.feature.id.expected.jmx/features/org.jboss.tools.jmx.tests.feature/target/org.jboss.tools.jmx.tests.feature-1.1.0-SNAPSHOT.jar"
+ value="org.jboss.tools.jmx.tests.feature"
+ />
+ <property name="get.feature.id.expected.archives/features/org.jboss.ide.eclipse.archives.feature/target/org.jboss.ide.eclipse.archives.feature-3.1.0-SNAPSHOT.jar"
+ value="org.jboss.ide.eclipse.archives.feature"
+ />
+ <property name="get.feature.id.expected.archives/features/org.jboss.ide.eclipse.archives.test.feature/target/org.jboss.ide.eclipse.archives.test.feature-3.1.0-SNAPSHOT.jar"
+ value="org.jboss.ide.eclipse.archives.test.feature"
+ />
+ <property name="get.feature.id.expected.as/features/org.jboss.ide.eclipse.as.test.feature/target/org.jboss.ide.eclipse.as.test.feature-2.1.0-SNAPSHOT.jar"
+ value="org.jboss.ide.eclipse.as.test.feature"
+ />
+ <property name="get.feature.id.expected.bpel/features/org.jboss.tools.bpel.feature/target/org.jboss.tools.bpel.feature-1.0.0-SNAPSHOT.jar"
+ value="org.jboss.tools.bpel.feature"
+ />
+ <property name="get.feature.id.expected.bpel/features/org.jboss.tools.bpel.tests.feature/target/org.jboss.tools.bpel.tests.feature-1.0.0-SNAPSHOT.jar"
+ value="org.jboss.tools.bpel.tests.feature"
+ />
+ <property name="get.feature.id.expected.smooks/features/org.jboss.tools.smooks.feature/target/org.jboss.tools.smooks.feature-1.1.0-SNAPSHOT.jar"
+ value="org.jboss.tools.smooks.feature"
+ />
+ <property name="get.feature.id.expected.smooks/features/org.jboss.tools.smooks.test.feature/target/org.jboss.tools.smooks.test.feature-1.1.0-SNAPSHOT.jar"
+ value="org.jboss.tools.smooks.test.feature"
+ />
+ <property name="get.feature.id.expected.freemarker/features/org.jboss.ide.eclipse.freemarker.feature/target/org.jboss.ide.eclipse.freemarker.feature-1.1.0-SNAPSHOT.jar"
+ value="org.jboss.ide.eclipse.freemarker.feature"
+ />
+ <property name="get.feature.id.expected.freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature/target/org.jboss.ide.eclipse.freemarker.test.feature-1.1.0-SNAPSHOT.jar"
+ value="org.jboss.ide.eclipse.freemarker.test.feature"
+ />
+ <property name="get.feature.id.expected.profiler/features/org.jboss.tools.profiler.feature/target/org.jboss.tools.profiler.feature-1.0.0-SNAPSHOT.jar"
+ value="org.jboss.tools.profiler.feature"
+ />
+ <property name="get.feature.id.expected.portlet/features/org.jboss.tools.portlet.feature/target/org.jboss.tools.portlet.feature-1.1.0-SNAPSHOT.jar"
+ value="org.jboss.tools.portlet.feature"
+ />
+ <property name="get.feature.id.expected.portlet/features/org.jboss.tools.portlet.test.feature/target/org.jboss.tools.portlet.test.feature-1.1.0-SNAPSHOT.jar"
+ value="org.jboss.tools.portlet.test.feature"
+ />
+ <property name="get.feature.id.expected.jst/features/org.jboss.tools.jst.feature/target/org.jboss.tools.jst.feature-3.1.0-SNAPSHOT.jar"
+ value="org.jboss.tools.jst.feature"
+ />
+ <property name="get.feature.id.expected.jst/features/org.jboss.tools.jst.web.tiles.feature/target/org.jboss.tools.jst.web.tiles.feature-3.1.0-SNAPSHOT.jar"
+ value="org.jboss.tools.jst.web.tiles.feature"
+ />
+ <property name="get.feature.id.expected.vpe/features/org.jboss.tools.vpe.feature/target/org.jboss.tools.vpe.feature-3.1.0-SNAPSHOT.jar"
+ value="org.jboss.tools.vpe.feature"
+ />
+ <property name="get.feature.id.expected.vpe/features/org.jboss.tools.xulrunner.feature/target/org.jboss.tools.xulrunner.feature-1.9.1.2.jar"
+ value="org.jboss.tools.xulrunner.feature"
+ />
+ <property name="get.feature.id.expected.jsf/features/org.jboss.tools.jsf.feature/target/org.jboss.tools.jsf.feature-3.1.0-SNAPSHOT.jar"
+ value="org.jboss.tools.jsf.feature"
+ />
+ <property name="get.feature.id.expected.jsf/features/org.jboss.tools.richfaces.feature/target/org.jboss.tools.richfaces.feature-3.1.0-SNAPSHOT.jar"
+ value="org.jboss.tools.richfaces.feature"
+ />
+ <property name="get.feature.id.expected.esb/features/org.jboss.tools.esb.feature/target/org.jboss.tools.esb.feature-1.3.0-SNAPSHOT.jar"
+ value="org.jboss.tools.esb.feature"
+ />
+ <property name="get.feature.id.expected.esb/features/org.jboss.tools.esb.test.feature/target/org.jboss.tools.esb.test.feature-1.3.0-SNAPSHOT.jar"
+ value="org.jboss.tools.esb.test.feature"
+ />
+ <property name="get.feature.id.expected.tptp/features/org.jboss.tools.tptp.feature/target/org.jboss.tools.tptp.feature-1.1.0-SNAPSHOT.jar"
+ value="org.jboss.tools.tptp.feature"
+ />
+ <property name="get.feature.id.expected.ws/features/org.jboss.tools.ws.feature/target/org.jboss.tools.ws.feature-1.1.0-SNAPSHOT.jar"
+ value="org.jboss.tools.ws.feature"
+ />
+ <property name="get.feature.id.expected.cdi/features/org.jboss.tools.cdi.feature/target/org.jboss.tools.cdi.feature-1.0.0-SNAPSHOT.jar"
+ value="org.jboss.tools.cdi.feature"
+ />
+ <property name="get.feature.id.expected.struts/features/org.jboss.tools.struts.feature/target/org.jboss.tools.struts.feature-3.1.0-SNAPSHOT.jar"
+ value="org.jboss.tools.struts.feature"
+ />
+ <property name="get.feature.id.expected.hibernatetools/features/org.hibernate.eclipse.feature/target/org.hibernate.eclipse.feature-3.3.0-SNAPSHOT.jar"
+ value="org.hibernate.eclipse.feature"
+ />
+ <property name="get.feature.id.expected.hibernatetools/features/org.hibernate.eclipse.test.feature/target/org.hibernate.eclipse.test.feature-3.3.0-SNAPSHOT.jar"
+ value="org.hibernate.eclipse.test.feature"
+ />
+ <property name="get.feature.id.expected.seam/features/org.jboss.tools.seam.feature/target/org.jboss.tools.seam.feature-3.1.0-SNAPSHOT.jar"
+ value="org.jboss.tools.seam.feature"
+ />
+ <property name="get.feature.id.expected.seam/features/org.jboss.tools.seam.test.feature/target/org.jboss.tools.seam.test.feature-3.1.0-SNAPSHOT.jar"
+ value="org.jboss.tools.seam.test.feature"
+ />
+ <property name="get.feature.id.expected.examples/features/org.jboss.tools.community.project.examples.feature/target/org.jboss.tools.community.project.examples.feature-1.1.0-SNAPSHOT.jar"
+ value="org.jboss.tools.community.project.examples.feature"
+ />
+ <property name="get.feature.id.expected.examples/features/org.jboss.tools.project.examples.feature/target/org.jboss.tools.project.examples.feature-1.1.0-SNAPSHOT.jar"
+ value="org.jboss.tools.project.examples.feature"
+ />
+ <property name="get.feature.id.expected.examples/features/org.jboss.tools.project.examples.test.feature/target/org.jboss.tools.project.examples.test.feature-1.1.0-SNAPSHOT.jar"
+ value="org.jboss.tools.project.examples.test.feature"
+ />
+ <property name="get.feature.id.expected.birt/features/org.jboss.tools.birt.feature/target/org.jboss.tools.birt.feature-1.1.0-SNAPSHOT.jar"
+ value="org.jboss.tools.birt.feature"
+ />
+ <property name="get.feature.id.expected.birt/features/org.jboss.tools.birt.test.feature/target/org.jboss.tools.birt.test.feature-1.1.0-SNAPSHOT.jar"
+ value="org.jboss.tools.birt.test.feature"
+ />
+ <property name="get.feature.id.expected.maven/features/org.jboss.tools.maven.feature/target/org.jboss.tools.maven.feature-1.0.0-SNAPSHOT.jar"
+ value="org.jboss.tools.maven.feature"
+ />
+ <property name="get.feature.id.expected.maven/features/org.jboss.tools.maven.seam.feature/target/org.jboss.tools.maven.seam.feature-1.0.0-SNAPSHOT.jar"
+ value="org.jboss.tools.maven.seam.feature"
+ />
+
</target>
<target name="test.all">
14 years, 8 months
JBoss Tools SVN: r21870 - trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath.
by jbosstools-commits＠lists.jboss.org
Author: bbrodt
Date: 2010-05-03 17:45:42 -0400 (Mon, 03 May 2010)
New Revision: 21870
Modified:
trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/JoinCondition.java
trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/XPathValidator.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-6000
duplicated error message checking returned too soon. It should only check if we're sure that there really IS a problem.
Modified: trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/JoinCondition.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/JoinCondition.java 2010-05-03 20:37:23 UTC (rev 21869)
+++ trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/JoinCondition.java 2010-05-03 21:45:42 UTC (rev 21870)
@@ -91,12 +91,17 @@
final String name = expr.getVariableName();
IProblem problem;
- if (duplicateThing( "duplicate.joinCondition.link.check.", name)) {
- return ;
- }
+ // https://jira.jboss.org/jira/browse/JBIDE-6000
+ // this returns too soon - only check duplicateThing if we're sure that there really IS a problem
+// if (duplicateThing( "duplicate.joinCondition.link.check.", name)) {
+// return ;
+// }
if ( isEmpty ( prefix ) == false ) {
+ if (duplicateThing( "duplicate.joinCondition.link.check.", name)) {
+ return ;
+ }
problem = createError();
problem.fill("XPATH_PREFIX_NOT_ALLOWED",
toString(mNode.nodeName()),
@@ -116,6 +121,9 @@
);
if (isUndefined(target)) {
+ if (duplicateThing( "duplicate.joinCondition.link.check.", name)) {
+ return ;
+ }
problem = createError();
problem.fill("XPATH_LINK_UNDEF", name , expr.getText() );
repointOffsets(problem, expr);
Modified: trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/XPathValidator.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/XPathValidator.java 2010-05-03 20:37:23 UTC (rev 21869)
+++ trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath/XPathValidator.java 2010-05-03 21:45:42 UTC (rev 21870)
@@ -747,13 +747,19 @@
String name = expr.getVariableName();
IProblem problem;
+ // https://jira.jboss.org/jira/browse/JBIDE-6000
+ // this returns too soon - only check duplicateThing if we're sure that there really IS a problem
// check to make sure we don't print the same message twice.
- if (duplicateThing("duplicate.variable.check.", name)) {
- return;
- }
+// if (duplicateThing("duplicate.variable.check.", name)) {
+// return;
+// }
if (isEmpty(prefix) == false) {
+ // check to make sure we don't print the same message twice.
+ if (duplicateThing("duplicate.variable.check.", name)) {
+ return;
+ }
problem = createError();
problem.fill("XPATH_INVALID_VARREF_PREFIX", //$NON-NLS-1$
prefix + ":" + name); //$NON-NLS-1$
@@ -774,6 +780,10 @@
if (isUndefined(variable)) {
+ // check to make sure we don't print the same message twice.
+ if (duplicateThing("duplicate.variable.check.", name)) {
+ return;
+ }
problem = createError();
problem.fill("XPATH_UNDEF_VARIABLE", //$NON-NLS-1$
varName, expr.getText());
@@ -808,6 +818,10 @@
if (partName != null) {
if (WSDL_ND_MESSAGE.equals(varTypeNode.nodeName()) == false) {
+ // check to make sure we don't print the same message twice.
+ if (duplicateThing("duplicate.variable.check.", name)) {
+ return;
+ }
problem = createError();
problem.fill("XPATH_VARIABLE_PART", varName, partName, expr
.getText(), 0);
@@ -815,6 +829,10 @@
} else if (isUndefined(variablePart)) {
+ // check to make sure we don't print the same message twice.
+ if (duplicateThing("duplicate.variable.check.", name)) {
+ return;
+ }
problem = createError();
problem.fill("XPATH_UNDEF_VARIABLE_PART", //$NON-NLS-1$
varName, partName, expr.getText());
@@ -829,6 +847,10 @@
// there is no part name specified, but variable does have more then
// 1 part.
if (WSDL_ND_MESSAGE.equals(varTypeNode.nodeName())) {
+ // check to make sure we don't print the same message twice.
+ if (duplicateThing("duplicate.variable.check.", name)) {
+ return;
+ }
problem = createError();
problem.fill("XPATH_VARIABLE_PART", varName,
"text.term.unspecified", expr.getText(), 1);
14 years, 8 months
JBoss Tools SVN: r21869 - trunk/jmx/docs/reference/en-US.
by jbosstools-commits＠lists.jboss.org
Author: abogachuk
Date: 2010-05-03 16:37:23 -0400 (Mon, 03 May 2010)
New Revision: 21869
Modified:
trunk/jmx/docs/reference/en-US/connection.xml
Log:
updated
Modified: trunk/jmx/docs/reference/en-US/connection.xml
===================================================================
--- trunk/jmx/docs/reference/en-US/connection.xml 2010-05-03 20:37:03 UTC (rev 21868)
+++ trunk/jmx/docs/reference/en-US/connection.xml 2010-05-03 20:37:23 UTC (rev 21869)
@@ -6,7 +6,7 @@
<para>The <property>MBean Explorer</property> supports several different types of connections.
The tooling itself comes only with a default connection type, however other
- adopters can provide additional connection types that may require additional
+ adapters can provide additional connection types that may require additional
or non-spec behavior. Connections can be in either the connected state or
the disconnected state. Some connection types (such as the default connection type)
allow you to control the current state. Other connection types may not. </para>
@@ -15,15 +15,19 @@
The default connection type, for example, can be created and deleted by you
at will. The AS Tools connection type, which represents a JBoss server, does not
allow you this level of control. A JBoss JMX connection is created when a JBoss server is created
- in the server's view, and deleted when said server is deleted. The JMX connection for
+ in the server's view, and deleted when the server is deleted. The JMX connection for
this server is in the connected state only when the server is started. </para>
<section><title>The Default Connection</title>
<para> There are two ways to connect to an application with remote management enabled:</para>
+ <itemizedlist>
+ <listitem><para>Simple</para></listitem>
+ <listitem><para>Advanced</para></listitem>
+ </itemizedlist>
- <para> The first step is the same for both - to connect to a MBean Server, click on the
+ <para> The first step is the same for both to connect to a MBean Server, click on the
<emphasis>
<property>New Connection</property></emphasis> icon
14 years, 8 months
JBoss Tools SVN: r21868 - trunk/jmx/docs/reference/en-US.
by jbosstools-commits＠lists.jboss.org
Author: abogachuk
Date: 2010-05-03 16:37:03 -0400 (Mon, 03 May 2010)
New Revision: 21868
Modified:
trunk/jmx/docs/reference/en-US/introduction.xml
Log:
added some general info about jmx technology
Modified: trunk/jmx/docs/reference/en-US/introduction.xml
===================================================================
--- trunk/jmx/docs/reference/en-US/introduction.xml 2010-05-03 20:36:35 UTC (rev 21867)
+++ trunk/jmx/docs/reference/en-US/introduction.xml 2010-05-03 20:37:03 UTC (rev 21868)
@@ -6,9 +6,38 @@
<para><property>JBoss Tools</property>' JMX project is a fork of <ulink
url="http://code.google.com/p/eclipse-jmx/">eclipse-jmx</ulink>, a project by Jeff Mesnil.
It was forked with permission. </para>
+
+ <section>
+ <title>What is JMX?</title>
+ <para>
+The Java Management Extensions (JMX) technology is a standard part of the Java Platform, Standard Edition (Java SE platform). The JMX technology was added to the platform in the Java 2 Platform, Standard Edition (J2SE) 5.0 release.
+</para>
+ <para>
+The JMX technology provides a simple, standard way of managing resources such as applications, devices, and services. Because the JMX technology is dynamic, you can use it to monitor and manage resources as they are created, installed and implemented. You can also use the JMX technology to monitor and manage the Java Virtual Machine (Java VM).
+</para>
+ <para>
+The JMX specification defines the architecture, design patterns, APIs, and services in the Java programming language for management and monitoring of applications and networks.
+</para>
+ <para>
+Using the JMX technology, a given resource is instrumented by one or more Java objects known as Managed Beans, or MBeans. These MBeans are registered in a core-managed object server, known as an MBean server. The MBean server acts as a management agent and can run on most devices that have been enabled for the Java programming language.
+</para>
+
+ <para>
+The specifications define JMX agents that you use to manage any resources that have been correctly configured for management. A JMX agent consists of an MBean server, in which MBeans are registered, and a set of services for handling the MBeans. In this way, JMX agents directly control resources and make them available to remote management applications.
+</para>
+ <para>
+The way in which resources are instrumented is completely independent from the management infrastructure. Resources can therefore be rendered manageable regardless of how their management applications are implemented.
+</para>
+ <para>
+The JMX technology defines standard connectors (known as JMX connectors) that enable you to access JMX agents from remote management applications. JMX connectors using different protocols provide the same management interface. Consequently, a management application can manage resources transparently, regardless of the communication protocol used. JMX agents can also be used by systems or applications that are not compliant with the JMX specification, as long as those systems or applications support JMX agents.
+</para>
+<ulink
+ url="http://java.sun.com/docs/books/tutorial/jmx/overview/index.html">Read more about JMX</ulink>.
+ </section>
+
<section>
<title>What is JMX Tools?</title>
- <para><property>JMX Tools</property> allows to setup multiple JMX connections and provides view
+ <para><property>JBoss JMX Tools</property> allow to setup multiple JMX connections and provide view
for exploring the JMX tree and execute operations directly from Eclipse.</para>
<para>This chapter covers the basics of working with <property>JMX plugin</property>, which is
14 years, 8 months
JBoss Tools SVN: r21867 - trunk/jmx/docs/reference/en-US.
by jbosstools-commits＠lists.jboss.org
Author: abogachuk
Date: 2010-05-03 16:36:35 -0400 (Mon, 03 May 2010)
New Revision: 21867
Modified:
trunk/jmx/docs/reference/en-US/tasks.xml
Log:
added the new Managing Application section
Modified: trunk/jmx/docs/reference/en-US/tasks.xml
===================================================================
--- trunk/jmx/docs/reference/en-US/tasks.xml 2010-05-03 20:36:17 UTC (rev 21866)
+++ trunk/jmx/docs/reference/en-US/tasks.xml 2010-05-03 20:36:35 UTC (rev 21867)
@@ -7,12 +7,12 @@
<section>
<title>Quick Start</title>
- <para>To start using the <property>JMX Tools</property>, it's necessary to open
+ <para>To start using the <property>JMX Tools</property> it's necessary to open
<property>MBean Explorer</property>. Go to <emphasis><property>Window > Show View > Other</property></emphasis> and then select
<property>MBean Explorer</property> and click <emphasis><property>OK</property>.</emphasis></para>
- <para>The <property>MBean Explorer</property> lists all of the domains, mbeans, attributes, and operations inside a
- connection. When you double-click on a MBean in the <emphasis><property>MBean Explorer</property>,</emphasis> it opens a multi-page
+ <para>The <property>MBean Explorer</property> lists all the domains, mbeans, attributes, and operations inside a
+ connection. When you double-click a MBean in the <emphasis><property>MBean Explorer</property>,</emphasis> it opens a multi-page
editor to manage the MBean. The <property>MBean Editor</property> is composed of these pages:</para>
<itemizedlist>
@@ -31,6 +31,80 @@
</itemizedlist>
</section>
+
+ <section>
+ <title>Managing Application</title>
+
+
+<para>Like it's said in earlier in the guide the JMX technology allows to monitor and manage Java applications. In this section we will show you how to get connected to
+a sample java application and run the <property>sayHello()</property> method remotely from inside the <property>MBean Explorer</property>.</para>
+<orderedlist>
+<listitem><para>Unzip the bundle of sample classes.</para></listitem>
+<listitem><para>Compile the example Java classes from within the where you unpacked the files directory.</para>
+
+ <programlisting role="XML"><![CDATA[
+ javac com/example/*.java
+ ]]></programlisting>
+
+</listitem>
+<listitem><para>Start the <property>Main</property> application, specifying the properties that expose Main for remote management:</para>
+
+ <programlisting role="XML"><![CDATA[
+java -Dcom.sun.management.jmxremote.port=9999 \
+-Dcom.sun.management.jmxremote.authenticate=false \
+-Dcom.sun.management.jmxremote.ssl=false \
+com.example.Main
+ ]]></programlisting>
+
+<para>If everything was done correctly you will see the "Waiting for incoming requests..." message on the screen.</para>
+
+
+ </listitem>
+ <listitem><para>Now launch the Eclipse IDE, in Eclipse open the <property>MBean Explorer</property>. Go to <emphasis><property>Window > Show View > Other</property></emphasis> and then select
+ <property>MBean Explorer</property> and click <emphasis><property>OK</property></emphasis>)</para></listitem>
+ <listitem>
+ <para>Click the <emphasis>
+ <property>New Connection</property></emphasis> icon
+
+ <inlinemediaobject>
+ <imageobject>
+ <imagedata fileref="images/new_connection_icon.png"/>
+ </imageobject>
+ </inlinemediaobject>
+
+ in the <property>MBean Explorer</property> menu
+ bar.</para>
+ </listitem>
+
+ <listitem><para>In the <property>Create JMX Connection</property> dialog, hit <property>Next</property> and then click on the <property>Advanced</property> tab. </para></listitem>
+
+
+ <listitem><para>In the <property>JMX URL</property> input field enter the following URL:</para>
+
+ <programlisting role="XML"><![CDATA[
+ service:jmx:rmi:///jndi/rmi://:9999/jmxrmi
+ ]]></programlisting>
+
+ </listitem>
+
+ <listitem><para>Press <property>Finish</property> to esteblish the connection with the application.</para>
+ </listitem>
+
+ <listitem><para>Now expand the connection you have just created, then open the <property>com.example</property> package and click <property>sayHello()</property> method. </para>
+ <para>Once the <property>sayHello()</property> method is clicked the <property>MBean Editor</property> is activated. </para>
+
+ </listitem>
+
+ <listitem><para>In the <property>MBean Editor</property> go to the <property>Operation Details</property> section and hit the <property>sayHello()</property> button.</para><para> You will get the "Operation inoked successfully" message. </para>
+ </listitem>
+
+ <listitem><para>The final step is to make sure the application worked as it was expected. Open the terminal where you launched the application in step 3. Now you see the "hello, world" message on the screen. </para>
+ </listitem>
+</orderedlist>
+
+
+
+ </section>
<section>
<title>Tomcat Managing</title>
@@ -54,7 +128,7 @@
<para>You can manage Equinox through the Equinox monitoring framework.</para>
<para>Once you have installed the Equinox monitoring framework and restarted Eclipse:</para>
- <itemizedlist>
+ <orderedlist>
<listitem>
<para>Go to <emphasis>
<property>Window > Open Perspective > Other</property>
@@ -64,7 +138,7 @@
<!--<listitem>
<para>Select <emphasis>
<property>JMX Server > Open Connection</property>
- </emphasis> and click on <emphasis>
+ </emphasis> and click <emphasis>
<property>OK</property>
</emphasis></para>
</listitem>-->
@@ -76,7 +150,7 @@
</listitem>
<listitem>
- <para>Click on the <emphasis>
+ <para>Click the <emphasis>
<property>New Connection</property></emphasis> icon
<inlinemediaobject>
@@ -86,7 +160,7 @@
</inlinemediaobject>
in the <property>MBean Explorer</property> menu
- bar </para>
+ bar.</para>
</listitem>
<listitem>
@@ -95,7 +169,7 @@
<property>service:jmx:rmi:///jndi/rmi://:8118/jmxserver</property>
</emphasis></para>
</listitem>
- </itemizedlist>
+ </orderedlist>
<para>You now have access to the MBeans exposed by Equinox.</para>
</section>
@@ -226,7 +300,7 @@
<para> There are two ways to connect to an application with remote management enabled:</para>
- <para> The first step is the same for both - to connect to a MBean Server, click on the
+ <para> The first step is the same for both - to connect to a MBean Server, click the
<emphasis>
<property>New Connection</property></emphasis> icon
14 years, 8 months
JBoss Tools SVN: r21866 - branches/modular_build/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-05-03 16:36:17 -0400 (Mon, 03 May 2010)
New Revision: 21866
Modified:
branches/modular_build/build/build.xml
Log:
do an svn up if -Dbuild.if.sources.unchanged=true
Modified: branches/modular_build/build/build.xml
===================================================================
--- branches/modular_build/build/build.xml 2010-05-03 20:27:52 UTC (rev 21865)
+++ branches/modular_build/build/build.xml 2010-05-03 20:36:17 UTC (rev 21866)
@@ -323,6 +323,7 @@
<istrue value="${build.if.sources.unchanged}" />
</and>
<then>
+ <svn.fetch component="@{COMPONENT}" op="up" />
<echo file="build.cfg" message="@{COMPONENT}," append="true" />
</then>
</if>
14 years, 8 months
JBoss Tools SVN: r21865 - branches/modular_build/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-05-03 16:27:52 -0400 (Mon, 03 May 2010)
New Revision: 21865
Modified:
branches/modular_build/build/build.xml
Log:
generate per-component update site zips; improve overall update site zip; refactoring and misc. tweaks
Modified: branches/modular_build/build/build.xml
===================================================================
--- branches/modular_build/build/build.xml 2010-05-03 20:17:57 UTC (rev 21864)
+++ branches/modular_build/build/build.xml 2010-05-03 20:27:52 UTC (rev 21865)
@@ -33,6 +33,9 @@
<property name="product.version" value="3.1.0-beta-1"/>
-->
+ <!-- TODO: connect build type (snapshot, milestone, release) to update site description (nightly, milestone, stable) -->
+ <property name="update.site.description" value="Nightly Build" />
+
<!-- ****************************** Usage Instructions ****************************** -->
<target name="help" description="Usage Instructions" depends="init">
<echo>
@@ -58,10 +61,15 @@
cd /home/nboldt/workspace36/jbosstools-modular_build; \
ant -DCOMPONENTS=tests,common,jmx -DMAVEN_FLAGS="osgi-test:test -B -fn"
-or, to re-build the update site w/o building first:
+or, to re-build the overall update site w/o building first:
cd /home/nboldt/workspace36/jbosstools-modular_build; \
ant create.overall.update.site -Dbuild.if.sources.unchanged=true
+or, to re-build a single component's update site w/o first building, testing, and installing it into the m2 repo:
+ cd /home/nboldt/workspace36/jbosstools-modular_build; \
+ ant -DCOMPONENT=jmx create.update.site; \
+ ant -DCOMPONENT=jbpm create.update.site
+
Note: if tests stall on Linux, install Xvfb and this script will use that to run Maven.
Here is the order in which components must be built:
@@ -73,14 +81,22 @@
</for>
</target>
+ <!-- ******************* MAIN ENTRY TARGETS ******************* -->
<target name="run"
- depends="init, get.bootstrap.scripts, get.sources, get.components.to.build, run.build, collect.all.test.results, create.overall.update.site"
+ description="run a build, collect test results, generate overall update site"
+ depends="build, collect.all.test.results, create.overall.update.site"
/>
+ <target name="build"
+ description="run a build"
+ depends="init, get.bootstrap.scripts, get.sources, get.components.to.build, run.build"
+ />
+
<target name="test"
description="run tests w/o first getting sources + list of components to build; assumes an upstream build job was already run"
depends="init, get.bootstrap.scripts, get.components.to.test, run.build, collect.all.test.results"
/>
+ <!-- ******************* MAIN ENTRY TARGETS ******************* -->
<!-- override for local build -->
<condition property="isInHudson" value="true">
@@ -369,6 +385,28 @@
<target name="run.build">
<!-- could set -Dmaven.test.skip to skip tests, or use osgi-test:test to just (re-)run tests w/o first building -->
<property name="MAVEN_FLAGS" value="install -B -fn -q" />
+
+ <!-- commandline overrides to suppress doing tests -->
+ <if>
+ <or>
+ <isset property="notest" />
+ <isset property="notests" />
+ <isset property="skiptest" />
+ <isset property="skiptests" />
+ </or>
+ <then>
+ <property name="noXvfb" value="true" />
+ <if>
+ <not>
+ <contains string="${MAVEN_FLAGS}" substring="-Dmaven.test.skip" />
+ </not>
+ <then>
+ <var name="MAVEN_FLAGS" value="${MAVEN_FLAGS} -Dmaven.test.skip" />
+ </then>
+ </if>
+ </then>
+ </if>
+
<for param="COMPONENT" list="${COMPONENTS.to.build}" delimiter=",
">
<sequential>
@@ -378,24 +416,10 @@
<property name="COMPONENT" value="@{COMPONENT}" />
</ant>
- <var name="mvnExe" value="mvn" />
- <antcallback target="getMvnExe" return="mvnExe" />
+ <antcall target="mvn">
+ <param name="COMPONENT" value="@{COMPONENT}" />
+ </antcall>
- <echo level="verbose">Exe: ${COMMON_TOOLS}/apache-maven-${maven.version}/bin/${mvnExe}</echo>
- <echo level="verbose">Pom: ${WORKINGDIR}/(a){COMPONENT}/pom.xml</echo>
- <!-- 3 hr timeout = 10800000ms -->
- <exec executable="${COMMON_TOOLS}/apache-maven-${maven.version}/bin/${mvnExe}"
- dir="${WORKINGDIR}/@{COMPONENT}"
- failifexecutionfails="true"
- failonerror="true"
- timeout="10800000"
- >
- <env key="M2_HOME" value="${COMMON_TOOLS}/apache-maven-${maven.version}" />
- <env key="MAVEN_OPTS" value="-Xms512m -Xmx1024m -XX:PermSize=128m -XX:MaxPermSize=256m" />
- <!-- more debug output with <env key="MAVEN_OPTS" value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000"/> -->
- <!-- <arg line="-o -Dmaven.test.skip" /> -->
- <arg line="${MAVEN_FLAGS} -Dmaven.repo.local=${COMMON_TOOLS}/m2-repository" />
- </exec>
<!-- don't collect test results if there are no test results to collect! -->
<if>
<not>
@@ -410,11 +434,44 @@
<property name="no.tests.run" value="true" />
</else>
</if>
+
+ <!-- prevent recursion: overall site component is built with create.overall.update.site, not simpler create.update.site -->
+ <if>
+ <not>
+ <equals arg1="@{COMPONENT}" arg2="site" />
+ </not>
+ <then>
+ <antcall target="create.update.site">
+ <param name="COMPONENT" value="@{COMPONENT}" />
+ </antcall>
+ </then>
+ </if>
</sequential>
</for>
<now level="info">Builds done</now>
</target>
+ <target name="mvn">
+ <var name="mvnExe" value="mvn" />
+ <antcallback target="getMvnExe" return="mvnExe" />
+ <echo level="verbose">Exe: ${COMMON_TOOLS}/apache-maven-${maven.version}/bin/${mvnExe}</echo>
+ <echo level="verbose">Pom: ${WORKINGDIR}/${COMPONENT}/pom.xml</echo>
+ <property name="MAVEN_DIR" value="${WORKINGDIR}/${COMPONENT}" />
+ <!-- 3 hr timeout = 10800000ms -->
+ <exec executable="${COMMON_TOOLS}/apache-maven-${maven.version}/bin/${mvnExe}"
+ dir="${MAVEN_DIR}"
+ failifexecutionfails="true"
+ failonerror="true"
+ timeout="10800000"
+ >
+ <env key="M2_HOME" value="${COMMON_TOOLS}/apache-maven-${maven.version}" />
+ <env key="MAVEN_OPTS" value="-Xms512m -Xmx1024m -XX:PermSize=128m -XX:MaxPermSize=256m" />
+ <!-- more debug output with <env key="MAVEN_OPTS" value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000"/> -->
+ <!-- <arg line="-o -Dmaven.test.skip" /> -->
+ <arg line="${MAVEN_FLAGS} -Dmaven.repo.local=${COMMON_TOOLS}/m2-repository" />
+ </exec>
+ </target>
+
<!-- Use Xvfb wrapper for maven when invoking UI tests -->
<target name="getMvnExe" unless="noXvfb">
<if>
@@ -557,12 +614,8 @@
</if>
</target>
- <!-- TODO: generate site.xml files for each component from generated site.xml -->
- <target name="create.update.site">
- </target>
-
+ <!-- Used to build the overall update site for all components; requires a custom site.xml (generated from category.*.xml) and previously checked in pom.xml -->
<target name="create.overall.update.site" depends="init">
- <property name="update.site.description" value="Nightly Build" />
<!-- Clean up from last time, then fetch fresh sources (checkout or update) -->
<delete dir="${WORKINGDIR}/site/target" quiet="true" />
@@ -579,22 +632,57 @@
<echo file="${WORKINGDIR}/site/site.xml" message="${site.xml.transformed}" />
<var name="site.xml.transformed" unset="true" />
- <!-- Call maven to generate pom.xml, then build site from site.xml -->
- <antcall target="run.build">
+ <!-- Build update site -->
+ <antcall target="build.update.site">
<param name="COMPONENTS.to.build" value="site" />
- <param name="MAVEN_FLAGS" value="verify -B -fae -Dmaven.test.skip" />
- <param name="noXvfb" value="true" />
+ <param name="update.site.path" value="site" />
</antcall>
+ </target>
+ <target name="build.update.site">
+ <property name="update.site.path" value="site" />
+ <if>
+ <equals arg1="${update.site.path}" arg2="site" />
+ <then>
+ <var name="destinationZip"
+ value="${WORKINGDIR}/${update.site.path}/target/JBossTools-ALL-Update-SNAPSHOT.zip"
+ />
+ </then>
+ <else>
+ <var name="destinationZip"
+ value="${WORKINGDIR}/${update.site.path}/target/JBossTools-${COMPONENTS.to.build}-Update-SNAPSHOT.zip"
+ />
+ </else>
+ </if>
+
+ <!-- Call maven to generate pom.xml, then build site from site.xml -->
+ <if>
+ <equals arg1="${COMPONENTS.to.build}" arg2="site" />
+ <then>
+ <antcall target="run.build">
+ <param name="COMPONENTS.to.build" value="${COMPONENTS.to.build}" />
+ <param name="MAVEN_FLAGS" value="verify -q -B -fae -Dmaven.test.skip" />
+ <param name="noXvfb" value="true" />
+ </antcall>
+ </then>
+ <else>
+ <antcall target="mvn">
+ <param name="MAVEN_DIR" value="${WORKINGDIR}/${update.site.path}" />
+ <param name="MAVEN_FLAGS" value="verify -q -B -fae -Dmaven.test.skip" />
+ <param name="noXvfb" value="true" />
+ </antcall>
+ </else>
+ </if>
+
<!-- Delete pointless site.zip -->
- <delete file="${WORKINGDIR}/site/target/site.zip" />
+ <delete file="${WORKINGDIR}/${update.site.path}/target/site.zip" />
<!-- Create real update site zip, including web UI -->
- <copy todir="${WORKINGDIR}/site/target/site">
- <fileset dir="${WORKINGDIR}/site" includes="web/*, index.html" />
+ <copy todir="${WORKINGDIR}/${update.site.path}/target/site">
+ <fileset dir="${WORKINGDIR}/${update.site.path}" includes="web/*, index.html" />
</copy>
- <zip destfile="${WORKINGDIR}/site/target/JBossTools-Update-SNAPSHOT.zip"
- basedir="${WORKINGDIR}/site/target/site"
+ <zip destfile="${destinationZip}"
+ basedir="${WORKINGDIR}/${update.site.path}/target/site"
update="false"
/>
@@ -604,14 +692,104 @@
<equals arg1="${basedir}" arg2="${WORKINGDIR}" />
</not>
<then>
- <mkdir dir="${basedir}/site/target" />
- <copy todir="${basedir}/site/target" flatten="true" preservelastmodified="true" overwrite="true">
- <fileset dir="${WORKINGDIR}/site/target" includes="*Update*.zip" />
+ <mkdir dir="${basedir}/${update.site.path}/target" />
+ <copy todir="${basedir}/${update.site.path}/target"
+ flatten="true"
+ preservelastmodified="true"
+ overwrite="true"
+ >
+ <fileset dir="${WORKINGDIR}/${update.site.path}/target" includes="*Update*.zip" />
</copy>
</then>
</if>
</target>
+ <!-- Used to build the update site of a component; requires a site.xml and pom.xml be generated first -->
+ <target name="create.update.site" depends="init, genSitePomXml, genSiteXml">
+ <antcall target="build.update.site">
+ <param name="COMPONENTS.to.build" value="${COMPONENT}" />
+ <param name="update.site.path" value="${COMPONENT}/site" />
+ </antcall>
+ </target>
+
+ <target name="genSitePomXml" description="Generate a pom.xml to build update site">
+ <property name="updateSiteJarDir" value="${WORKINGDIR}/${COMPONENT}/site" />
+ <property name="COMPONENT" value="${COMPONENT}" />
+ <mkdir dir="${updateSiteJarDir}" />
+ <echo file="${updateSiteJarDir}/pom.xml"><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>
+ <parent>
+ <relativePath>../../parent-pom.xml</relativePath>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>org.jboss.tools.parent.pom</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>${COMPONENT}.site</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>eclipse-update-site</packaging>
+</project>
+</echo>
+
+ </target>
+
+ <target name="genSiteXml" description="Generate a site.xml to contain the features in a category">
+ <property name="updateSiteJarDir" value="${WORKINGDIR}/${COMPONENT}/site" />
+ <property name="COMPONENT" value="${COMPONENT}" />
+ <property name="category.name" value="${product.name} ${COMPONENT} ${update.site.description} Update Site" />
+
+ <mkdir dir="${updateSiteJarDir}" />
+ <echo file="${updateSiteJarDir}/site.xml"><?xml version="1.0" encoding="UTF-8"?>
+<site>
+ <description>To install these features, point Eclipse at this site.</description>
+ <!-- ${category.name} -->
+ <category-def label="${category.name}" name="${category.name}">
+ <description>${category.name}: contains all features in this build.</description>
+ </category-def>
+</echo>
+
+ <mkdir dir="${updateSiteJarDir}/../features" />
+ <for param="featureJar">
+ <path>
+ <fileset dir="${updateSiteJarDir}/../features" includes="**/target/*.jar" excludes="**/*test*" />
+ </path>
+ <sequential>
+ <var name="feature.jarfile" unset="true" />
+ <var name="feature.id" unset="true" />
+ <propertyregex property="feature.jarfile"
+ defaultvalue="@{featureJar}"
+ input="@{featureJar}"
+ regexp=".+/features/[^/]+/target/([^/]+feature.+\.jar)"
+ replace="\1"
+ override="true"
+ />
+ <propertyregex property="feature.id"
+ defaultvalue="${feature.jarfile}"
+ input="${feature.jarfile}"
+ regexp="([^_]+)_(\d+\.\d+\.\d+\..+)\.jar"
+ replace="\1"
+ override="true"
+ />
+ <propertyregex property="feature.id"
+ defaultvalue="${feature.jarfile}"
+ input="${feature.jarfile}"
+ regexp="([^_]+)-(\d+\.\d+\.\d+-SNAPSHOT)\.jar"
+ replace="\1"
+ override="true"
+ />
+ <echo append="true" file="${updateSiteJarDir}/site.xml"> <feature url="features/${feature.id}_0.0.0.jar" id="${feature.id}" version="0.0.0">
+ <category name="${category.name}"/>
+ </feature>
+</echo>
+ <var name="feature.jarfile" unset="true" />
+ <var name="feature.id" unset="true" />
+ </sequential>
+ </for>
+ <echo append="true" file="${updateSiteJarDir}/site.xml">
+</site>
+</echo>
+ </target>
+
<!-- TODO: figure out why this fails with error:
insecure -e option not allowed.
This account is restricted by rssh.
14 years, 8 months