JBoss Tools SVN: r41902 - trunk/common/plugins/org.jboss.tools.common.mylyn.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-06-12 18:38:50 -0400 (Tue, 12 Jun 2012)
New Revision: 41902
Modified:
trunk/common/plugins/org.jboss.tools.common.mylyn/build.properties
Log:
added provider picture
Modified: trunk/common/plugins/org.jboss.tools.common.mylyn/build.properties
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.mylyn/build.properties 2012-06-12 22:35:48 UTC (rev 41901)
+++ trunk/common/plugins/org.jboss.tools.common.mylyn/build.properties 2012-06-12 22:38:50 UTC (rev 41902)
@@ -4,7 +4,8 @@
.,\
plugin.properties,\
about.html,\
- plugin.xml
+ plugin.xml,\
+ jboss_about.png
src.includes = src/,\
META-INF/,\
about.html,\
13 years, 10 months
- 1
- 0
JBoss Tools SVN: r41901 - in trunk/common: tests/org.jboss.tools.common.mylyn.test/META-INF and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-06-12 18:35:48 -0400 (Tue, 12 Jun 2012)
New Revision: 41901
Modified:
trunk/common/plugins/org.jboss.tools.common.mylyn/META-INF/MANIFEST.MF
trunk/common/tests/org.jboss.tools.common.mylyn.test/META-INF/MANIFEST.MF
Log:
removed references to org.eclipse.mylyn according to http://wiki.eclipse.org/Mylyn/Restructuring it empty. API in org.eclipse.mylyn.tasks bundle
Modified: trunk/common/plugins/org.jboss.tools.common.mylyn/META-INF/MANIFEST.MF
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.mylyn/META-INF/MANIFEST.MF 2012-06-12 21:51:52 UTC (rev 41900)
+++ trunk/common/plugins/org.jboss.tools.common.mylyn/META-INF/MANIFEST.MF 2012-06-12 22:35:48 UTC (rev 41901)
@@ -6,7 +6,6 @@
Bundle-Vendor: JBoss by Red Hat
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: org.jboss.tools.common.mylyn,
- org.eclipse.mylyn;bundle-version="3.6.5",
org.eclipse.mylyn.commons.core;bundle-version="3.6.0",
org.eclipse.mylyn.commons.ui;bundle-version="3.6.1",
org.eclipse.mylyn.tasks.core;bundle-version="3.6.1",
Modified: trunk/common/tests/org.jboss.tools.common.mylyn.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/common/tests/org.jboss.tools.common.mylyn.test/META-INF/MANIFEST.MF 2012-06-12 21:51:52 UTC (rev 41900)
+++ trunk/common/tests/org.jboss.tools.common.mylyn.test/META-INF/MANIFEST.MF 2012-06-12 22:35:48 UTC (rev 41901)
@@ -5,7 +5,6 @@
Bundle-Version: 3.3.0.qualifier
Require-Bundle: org.jboss.tools.common.mylyn,
org.junit,
- org.eclipse.mylyn;bundle-version="3.6.0",
org.eclipse.mylyn.commons.core;bundle-version="3.6.0",
org.eclipse.mylyn.commons.ui;bundle-version="3.6.0",
org.eclipse.mylyn.tasks.core;bundle-version="3.6.0",
13 years, 10 months
- 1
- 0
JBoss Tools SVN: r41900 - trunk/build/publish.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-06-12 17:51:52 -0400 (Tue, 12 Jun 2012)
New Revision: 41900
Modified:
trunk/build/publish/publish.sh
Log:
simplify process for generating index page in STAGINGDIR/ root, for .aggregate builds only
Modified: trunk/build/publish/publish.sh
===================================================================
--- trunk/build/publish/publish.sh 2012-06-12 21:51:32 UTC (rev 41899)
+++ trunk/build/publish/publish.sh 2012-06-12 21:51:52 UTC (rev 41900)
@@ -267,35 +267,13 @@
mkdir -p ${STAGINGDIR}/logs
-if [[ ! $ANT_HOME ]]; then # find ant in PATH - select LAST entry if more than one
- ANT_HOME=$(for d in $(echo ${PATH//:/ }); do if [[ ${d/ant/} != ${d} ]]; then echo -n " ${d%/bin}"; fi; done); ANT_HOME=${ANT_HOME##* }
+# generate results page for an aggregate build only
+if [[ ${JOB_NAME/.aggregate} != ${JOB_NAME} ]] && [[ -d ${WORKSPACE}/sources/results ]]; then
+ pushd ${WORKSPACE}/sources/results >/dev/null
+ mvn install -DJOB_NAME=${JOB_NAME} -DBUILD_NUMBER=${BUILD_NUMBER} -DBUILD_ID=${BUILD_ID} -Dtarget.dir=${STAGINGDIR}
+ popd >/dev/null
fi
-ANT_EXEC="ant"
-if [[ -d ${ANT_HOME} ]] && [[ -x ${ANT_HOME}/bin/ant ]]; then
- export ANT_HOME=${ANT_HOME}
- ANT_EXEC=${ANT_HOME}/bin/ant
-fi
-ANT_LIB="" # add COMMON_TOOLS folder to ant's lib folder
-if [[ -d /home/hudson/static_build_env/jbds/tools ]]; then
- ANT_LIB=" -lib /home/hudson/static_build_env/jbds/tools"
-fi
-ANT_PARAMS=" -DZIPSUFFIX=${ZIPSUFFIX} -DJOB_NAME=${JOB_NAME} -Dinput.dir=${STAGINGDIR} -Doutput.dir=${STAGINGDIR}/logs -DWORKSPACE=${WORKSPACE}"
-for buildxml in ${WORKSPACE}/build/results/build.xml ${WORKSPACE}/sources/build/results/build.xml ${WORKSPACE}/sources/results/build.xml; do
- if [[ -f ${buildxml} ]]; then
- ANT_SCRIPT=${buildxml}
- RESULTS_DIR=${buildxml/\/build.xml/}
- fi
-done
-ANT_TARGET="buildResults.single"; if [[ ${JOB_NAME/.aggregate} != ${JOB_NAME} ]]; then ANT_TARGET="buildResults.aggregate"; fi
-if [[ ${ANT_SCRIPT} ]] && [[ -f ${ANT_SCRIPT} ]]; then ${ANT_EXEC}${ANT_LIB} -f ${ANT_SCRIPT} ${ANT_TARGET} ${ANT_PARAMS}; fi
-# copy buildResults.css, buildResults.html to ${STAGINGDIR}/logs
-if [[ ${RESULTS_DIR} ]] && [[ -d ${RESULTS_DIR} ]]; then
- for f in buildResults.html buildResults.css; do
- if [[ -f ${RESULTS_DIR}/${f} ]]; then rsync -arzq ${RESULTS_DIR}/${f} ${STAGINGDIR}/logs/; fi
- done
-fi
-
# purge duplicate zip files in logs/zips/all/*.zip
if [[ -d ${STAGINGDIR}/logs/zips ]]; then rm -f $(find ${STAGINGDIR}/logs/zips -type f -name "*.zip"); fi
13 years, 10 months
- 1
- 0
JBoss Tools SVN: r41899 - trunk/build/results.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-06-12 17:51:32 -0400 (Tue, 12 Jun 2012)
New Revision: 41899
Modified:
trunk/build/results/build.xml
Log:
don't need tmpdir and cleanup steps, so remove; parameterize target folder; use BUILD_ID if maven.build.timestamp not set
Modified: trunk/build/results/build.xml
===================================================================
--- trunk/build/results/build.xml 2012-06-12 18:56:39 UTC (rev 41898)
+++ trunk/build/results/build.xml 2012-06-12 21:51:32 UTC (rev 41899)
@@ -9,8 +9,6 @@
</condition>
<mkdir dir="${COMMON_TOOLS}" />
- <property name="tmpdir" value="${java.io.tmpdir}/jbosstools-results-build" />
-
<target name="get.ant-contrib" unless="ant-contrib.jar.exists">
<property name="ANTCONTRIB_MIRROR" value="http://sourceforge.net/projects/ant-contrib/files/ant-contrib/ant-contrib..." />
<get usetimestamp="true" dest="${COMMON_TOOLS}/ant-contrib-1.0b2-bin.zip" src="${ANTCONTRIB_MIRROR}/ant-contrib-1.0b2-bin.zip" />
@@ -37,9 +35,10 @@
</classpath>
</taskdef>
- <mkdir dir="${tmpdir}" />
- <delete dir="target/" quiet="true" />
- <mkdir dir="target/" />
+ <!-- run locally, or else target ${STAGINGDIR} folder if called from publish.sh -->
+ <property name="target.dir" value="./target/"/>
+ <delete dir="${target.dir}" quiet="true" />
+ <mkdir dir="${target.dir}" />
</target>
<target name="build" depends="init">
@@ -58,9 +57,15 @@
<if>
<contains string="${TIMESTAMP}" substring="maven.build.timestamp"/>
<then>
- <tstamp>
- <format property="TIMESTAMP" pattern="yyyyMMdd-HHmm" locale="en,US" timezone="GMT"/>
- </tstamp>
+ <propertyregex property="TIMESTAMP" input="${BUILD_ID}" defaultvalue="${BUILD_ID}" regexp="(\d{4})-(\d{2})-(\d{2})_(\d{2})-(\d{2}).+" replace="\1\2\3-\4\5"/>
+ <if>
+ <contains string="${TIMESTAMP}" substring="BUILD_ID"/>
+ <then>
+ <tstamp>
+ <format property="TIMESTAMP" pattern="yyyyMMdd-HHmm" locale="en,US" timezone="GMT"/>
+ </tstamp>
+ </then>
+ </if>
</then>
</if>
</then>
@@ -90,8 +95,6 @@
<echo level="verbose">TIMESTAMP = ${TIMESTAMP}</echo>
<antcall target="generate.html" />
-
- <antcall target="cleanup" />
</target>
<target name="generate.html">
@@ -119,7 +122,7 @@
</condition>
<!-- use locally built files with relative paths -->
- <copy todir="target/" overwrite="true">
+ <copy todir="${target.dir}" overwrite="true">
<fileset file="index-template.html" />
<mapper type="merge" to="index.html" />
<filterchain>
@@ -128,12 +131,6 @@
</copy>
</target>
- <target name="cleanup">
- <delete includeemptydirs="true" quiet="true">
- <fileset dir="${tmpdir}" />
- </delete>
- </target>
-
<!-- macros -->
<macrodef name="get.size">
13 years, 10 months
- 1
- 0
JBoss Tools SVN: r41898 - in trunk/build/results: OLD and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-06-12 14:56:39 -0400 (Tue, 12 Jun 2012)
New Revision: 41898
Added:
trunk/build/results/index-template.html
trunk/build/results/pom.xml
Removed:
trunk/build/results/OLD/buildResults.xsl
trunk/build/results/buildResults.css
trunk/build/results/buildResults.xsl
trunk/build/results/collect-test-results.xml
trunk/build/results/surefire-reports/NoTestsRun/TEST-org.jboss.tools.NoTestsRun.xml
Modified:
trunk/build/results/.gitignore
trunk/build/results/build.xml
Log:
JBIDE-6958 new results page for inclusion in build folder, with links to metadata
Modified: trunk/build/results/.gitignore
===================================================================
--- trunk/build/results/.gitignore 2012-06-12 18:12:11 UTC (rev 41897)
+++ trunk/build/results/.gitignore 2012-06-12 18:56:39 UTC (rev 41898)
@@ -1,3 +1 @@
-*.out.*
-zips
-buildResults.html
+target
Deleted: trunk/build/results/OLD/buildResults.xsl
===================================================================
--- trunk/build/results/OLD/buildResults.xsl 2012-06-12 18:12:11 UTC (rev 41897)
+++ trunk/build/results/OLD/buildResults.xsl 2012-06-12 18:56:39 UTC (rev 41898)
@@ -1,264 +0,0 @@
-<xsl:transform version="1.0"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xalan="http://xml.apache.org/xalan">
- <xsl:output method="html" indent="yes" xalan:indent-amount="4" />
- <xsl:template match="/projects">
-
- <xsl:variable name="baseurl">
- <xsl:value-of select="@baseurl" />
- </xsl:variable>
-
- <html>
- <head>
- <title>JBossTools Build Results</title>
- <link rel="stylesheet" type="text/css" href="buildResults.css" />
- </head>
- <body>
- <div id="header-blue">
- <table width="100%" height="100%">
- <tr>
- <td>
- <span id="title-blue">JBossTools Build Results</span>
- <br />
- <span id="buildName-blue">
- ${build-type} build
- ${jbds-build-name}
- <span id="buildName-blue" style="font-size: x-small;">
- [Hudson Build
- <a id="buildName-blue" style="font-size: x-small;"
- href="http://hudson.qa.jboss.com/hudson/view/DevStudio/job/${hudson-job-name}/$...">#${hudson-build-number},
- ${hudson-build-id}</a>
- ]
- </span>
- <span id="buildName-blue" style="font-size: x-small; font-style: italic;">
- <a id="buildName-blue"
- style="font-size: x-small; font-style: italic; color: black;"
- href="http://hudson.jboss.org/hudson/view/JBossTools/job/${hudson-job-name}/">Public
- Hudson Mirror</a>
- </span>
- </span>
- </td>
- <td align="right">
- <span id="buildDate-blue">${date}</span>
- <br />
- <span id="buildExecTime-blue">${build-time}</span>
- <br />
- <a id="buildLog-blue"
- href="http://download.jboss.org/jbosstools/builds/staging/${hudson-job-name}/logs/">Build Logs</a>
- </td>
- </tr>
- </table>
- </div>
-
- <div id="downloads-blue">
- <table id="links-blue" width="100%">
- <tr>
- <td>
- <a class="blue" href="http://www.jboss.org/tools">JBossTools</a>
- |
- <a class="blue" href="http://www.redhat.com/jbds">JBDS</a>
- |
- <a class="blue" href="http://tools.hibernate.org">Hibernate Tools</a>
- |
- <a class="blue"
- href="http://www.jboss.com/index.html?module=bb&op=viewforum&f=201">User
- Forum</a>
- |
- <a class="blue"
- href="http://jboss.com/index.html?module=bb&op=viewforum&f=162">Development
- Forum</a>
- |
- <a class="blue"
- href="http://jira.jboss.com/jira/secure/BrowseProject.jspa?id=10020">JIRA
- / Bugs</a>
- | #jbosstools on irc.freenode.net
- </td>
- <td align="right">
- <a class="blue" href="http://www.redhat.com">
- <img src="images/redhat.gif" border="0" />
- </a>
- <a class="blue" href="http://www.jboss.org">
- <img src="images/jboss.gif" border="0" />
- </a>
- <a class="blue" href="http://www.hibernate.org">
- <img src="images/hibernate.gif" border="0" />
- </a>
- <a class="blue" href="http://www.eclipse.org">
- <img src="images/eclipse.gif" border="0" />
- </a>
- </td>
- </tr>
- </table>
-
- <div id="downloadLinks">
-
- <table>
- <tr>
- <td colspan="2">
- First time here ? Read
- <a href="http://www.jboss.org/tools/download/installation.html">How
- to install JBoss Tools.</a>
- </td>
- </tr>
-
- <tr>
- <td colspan="2">
- <h1>p2 Repo / Update Site Zips:</h1>
- </td>
- </tr>
-
- <xsl:for-each select="project">
- <xsl:variable name="rowColor">
- <xsl:if test="position() mod 2 = 1">
- #CCCCEE
- </xsl:if>
- <xsl:if test="position() mod 2 = 0">
- #FFFFFF
- </xsl:if>
- <xsl:if test="contains(@name,'All')">
- #CCEECC
- </xsl:if>
- <xsl:if test="contains(@name,'Source')">
- #EECCCC
- </xsl:if>
- </xsl:variable>
-
- <tr bgcolor="{$rowColor}">
- <td>
- <img src="images/OK-small.png" />
- </td>
- <td class="downloadInfo">
- <xsl:for-each select=".">
- <b>
- <acronym title="{@name} :: {description}">
- <a class="allLink-blue" href="{$baseurl}/{download/@url}">
- <xsl:value-of select="concat(@name,' ',@version)" />
- </a>
- </acronym>
- <br />
- <a class="md5" href="{$baseurl}/{download/(a)url}.MD5">MD5</a>
- | filesize:
- <xsl:value-of select="download/@size" />
- </b>
- <br />
- </xsl:for-each>
- </td>
- </tr>
- </xsl:for-each>
- </table>
-
- </div>
-
- <div id="rightFrame">
- <div id="buildDrivers-blue">
- <b>SVN Revisions</b>
- <br />
- See
- <a
- href="http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.2_stable...">SVN_REVISION.txt</a>
- </div>
- <div id="buildDrivers-blue">
- <b>Target Platform</b>
- <table>
- <tr>
- <td rowspan="3">
- Eclipse Helios 3.6.1 +
- <br />
- Web Tools 3.2.2 +
- <br />
- TPTP + BIRT + DTP ...
- </td>
- <td>
- <a class="blue"
- href="http://download.jboss.org/jbosstools/updates/target-platform/latest/">Target Platform Update Site</a>
- </td>
- </tr>
- <tr>
- <td>
- <a class="blue"
- href="http://download.jboss.org/jbosstools/updates/target-platform/e361-wtp322....">Target Platform Update Zip</a>
- </td>
- </tr>
- <tr>
- <td>
- <a class="blue"
- href="http://anonsvn.jboss.org/repos/jbosstools/trunk/build/target-platform/uni...">Target Platform Definition File</a>
- </td>
- </tr>
- </table>
- </div>
- <div id="unitTestResults-blue">
- <b>Unit Test Results</b>
- <br />
-
- See
- <a
- href="http://hudson.qa.jboss.com/hudson/view/DevStudio_Stable_Branch/job/jbosst...">jbosstools-3.2_stable_branch.tests</a>
- <!-- <table> <tr> <td> <img src="images/test.gif" /> Tests </td> <td
- align="right">??? </td> </tr> <tr> <td> <img src="images/testerr.gif" />
- Errors </td> <td align="right">???</td> </tr> <tr> <td> <img src="images/testfail.gif"
- /> Failures </td> <td align="right">???</td> </tr> <tr> <td colspan="2">
- <b id="testPassPercentageAmount">%</b> tests passed <div id="testPercentage">
- <div id="testPassPercentage"> </div> <div id="testFailPercentage"> </div>
- </div> </td> </tr> </table> -->
-
- <script>
- <!-- var tests = 2228; var failures = 0; var errors = 0; var passPercent
- = Math.floor(((tests-(failures+errors))/tests) * 100); var failPercent =
- 100 - passPercent; document.getElementById("testPassPercentage").style.width
- = passPercent + '%'; document.getElementById("testFailPercentage").style.width
- = failPercent + '%'; document.getElementById("testPassPercentageAmount").innerHTML
- = passPercent + '%'; -->
- </script>
-
- <!-- <div align="right"> <a class="blue" style="align: right;" href="tests/test-results/org.jboss.ide.eclipse.tests.html">See
- full unit test results</a> </div> <div align="right"> <a class="blue" style="align:
- right;" href="tests/test-results/test-workspace.log.txt">See unit test workspace
- log</a> </div> <div id="coverageResults-blue"> <b>Test Coverage Results</b>
- <br /> <div align="right"> <a class="blue" style="align: right;" href="tests/test-results/emma-coverage/index.html">See
- test coverage results</a> </div> <div align="right"> <a class="blue" style="align:
- right;" href="tests/test-results/emma-coverage/coverage.es">See coverage
- session file</a> </div> </div> -->
- </div>
-
- <div id="buildInfo">
- <p>
- <b>WARNING</b>
- </p>
- <p>This build has been deemed by the JBossTools team to be in
- good working condition.
- Please note that this build may be a
- developer release, and if so
- should be treated
- with slightly more
- understanding and care than a stable release.
- Please see the
- release
- notes on JIRA and/or Sourceforge for further
- information.
- (This
- release is much less likely to
- set your
- computer aflame.)</p>
-
- <p>Any suggestions/issues should be posted on the relevant
- product
- forums and should clearly indicate that you are using an
- integration
- build. Please take care in making sure that your
- issue hasn't
- already been addressed when posting on forums or
- opening new
- JIRA issues.</p>
- </div>
-
- </div>
-
- </div>
-
- </body>
- </html>
-
-
-
- </xsl:template>
-</xsl:transform>
\ No newline at end of file
Modified: trunk/build/results/build.xml
===================================================================
--- trunk/build/results/build.xml 2012-06-12 18:12:11 UTC (rev 41897)
+++ trunk/build/results/build.xml 2012-06-12 18:56:39 UTC (rev 41898)
@@ -1,33 +1,18 @@
-<project default="buildResults.single">
-
- <!-- should be set by script or in Hudson -->
- <property name="ZIPSUFFIX" value="SNAPSHOT" />
-
- <!-- should be set by Hudson -->
- <!-- <property name="JOB_NAME" value="jbosstools-3.2.0.M2.continuous" /> -->
-
+<project default="build" name="jbosstools aggregate sources build.xml">
<!-- if ${WORKSPACE}/site folder exists, target that folder; else generate here. -->
<condition property="output.dir" value="${WORKSPACE}/results" else="${basedir}">
<available file="${WORKSPACE}/results" />
</condition>
- <condition property="WORKINGDIR" value="${WORKSPACE}/sources" else="${basedir}/../..">
- <available file="${WORKSPACE}/sources" type="dir" />
- </condition>
- <property name="input.dir" value="${WORKINGDIR}" />
-
- <mkdir dir="${WORKINGDIR}" />
-
- <condition property="COMMON_TOOLS" value="/home/hudson/static_build_env/jbds/tools">
+ <condition property="COMMON_TOOLS" value="/home/hudson/static_build_env/jbds/tools" else="${java.io.tmpdir}">
<available file="/home/hudson/static_build_env/jbds" type="dir" />
</condition>
- <condition property="COMMON_TOOLS" value="${WORKINGDIR}/../tools" else="${java.io.tmpdir}">
- <available file="${WORKINGDIR}/../tools" type="dir" />
- </condition>
<mkdir dir="${COMMON_TOOLS}" />
+ <property name="tmpdir" value="${java.io.tmpdir}/jbosstools-results-build" />
+
<target name="get.ant-contrib" unless="ant-contrib.jar.exists">
- <property name="ANTCONTRIB_MIRROR" value="http://downloads.sourceforge.net/ant-contrib/" />
+ <property name="ANTCONTRIB_MIRROR" value="http://sourceforge.net/projects/ant-contrib/files/ant-contrib/ant-contrib..." />
<get usetimestamp="true" dest="${COMMON_TOOLS}/ant-contrib-1.0b2-bin.zip" src="${ANTCONTRIB_MIRROR}/ant-contrib-1.0b2-bin.zip" />
<touch file="${COMMON_TOOLS}/ant-contrib-1.0b2-bin.zip" />
<mkdir dir="${java.io.tmpdir}/ant-contrib-1.0b2-bin.zip_" />
@@ -36,17 +21,14 @@
<delete dir="${java.io.tmpdir}/ant-contrib-1.0b2-bin.zip_" includeemptydirs="true" quiet="true" />
</target>
- <target name="get.saxon" unless="saxon.jar.exists">
- <!-- or use http://downloads.sourceforge.net/saxon/saxonhe9-3-0-4j.zip ? -->
- <property name="SAXON_MIRROR" value="http://downloads.sourceforge.net/project/saxon/Saxon-HE/9.3/saxonhe9-3-0-..." />
- <get usetimestamp="true" dest="${COMMON_TOOLS}/saxonhe9-3-0-4j.zip" src="${SAXON_MIRROR}" />
- <mkdir dir="${java.io.tmpdir}/saxonhe9-3-0-4j.zip_" />
- <unzip src="${COMMON_TOOLS}/saxonhe9-3-0-4j.zip" dest="${java.io.tmpdir}/saxonhe9-3-0-4j.zip_" overwrite="true" />
- <copy file="${java.io.tmpdir}/saxonhe9-3-0-4j.zip_/saxon9he.jar" tofile="${COMMON_TOOLS}/saxon.jar" failonerror="true" />
- <delete dir="${java.io.tmpdir}/saxonhe9-3-0-4j.zip_" includeemptydirs="true" quiet="true" />
- </target>
-
<target name="init">
+ <echo level="verbose">
+This script requires Ant 1.8+ and JDK 1.6+.
+-------------------------------------------
+$ant.version = ${ant.version}
+$ant.home = ${ant.home}
+$ant.java.version = ${ant.java.version}
+$java.home = ${java.home}</echo>
<available file="${COMMON_TOOLS}/ant-contrib.jar" type="file" property="ant-contrib.jar.exists" />
<antcall target="get.ant-contrib" />
<taskdef resource="net/sf/antcontrib/antlib.xml">
@@ -55,130 +37,138 @@
</classpath>
</taskdef>
- <available file="${COMMON_TOOLS}/saxon.jar" type="file" property="saxon.jar.exists" />
- <antcall target="get.saxon" />
+ <mkdir dir="${tmpdir}" />
+ <delete dir="target/" quiet="true" />
+ <mkdir dir="target/" />
+ </target>
- <condition property="aggregate_site_build.xml" value="${basedir}/../aggregate/build.xml">
- <available file="${basedir}/../aggregate/build.xml" type="file" />
+ <target name="build" depends="init">
+
+ <!-- pass in the following variables from Maven -->
+ <condition property="update.site.description_STRING" value="Nightly Build" else="${update.site.description}">
+ <contains string="${update.site.description}" substring="update.site.description" />
</condition>
- <macrodef name="get.size">
- <attribute name="file" />
- <attribute name="property" />
- <sequential>
- <var name="size" unset="true" />
- <var name="size-in-mb" unset="true" />
+ <property name="JOB_NAME" value=""/>
+ <if>
+ <contains string="${TIMESTAMP}" substring="TIMESTAMP"/>
+ <then>
+ <var name="TIMESTAMP" unset="true"/>
+ <var name="TIMESTAMP" value="${maven.build.timestamp}"/>
<if>
- <available file="@{file}" />
+ <contains string="${TIMESTAMP}" substring="maven.build.timestamp"/>
<then>
- <length file="@{file}" property="size" />
- <math result="size-in-mb">
- <op op="/">
- <op op="floor">
- <op op="*">
- <op op="/">
- <num value="${size}" />
- <num value="1048576" />
- </op>
- <num value="100" />
- </op>
- </op>
- <num value="100" />
- </op>
- </math>
-
- <property name="@{property}" value="${size-in-mb}" />
+ <tstamp>
+ <format property="TIMESTAMP" pattern="yyyyMMdd-HHmm" locale="en,US" timezone="GMT"/>
+ </tstamp>
</then>
- <else>
- <property name="@{property}" value="-1" />
- </else>
</if>
- </sequential>
- </macrodef>
- </target>
+ </then>
+ </if>
+ <condition property="JBT_VERSION_STRING" value="" else="${JBT_VERSION}">
+ <contains string="${JBT_VERSION}" substring="JBT_VERSION" />
+ </condition>
+ <condition property="BUILD_NUMBER_STRING" value="" else="${BUILD_NUMBER}">
+ <contains string="${BUILD_NUMBER}" substring="BUILD_NUMBER" />
+ </condition>
+ <condition property="BUILD_ALIAS_STRING" value="" else="${BUILD_ALIAS}">
+ <contains string="${BUILD_ALIAS}" substring="BUILD_ALIAS" />
+ </condition>
- <!-- NEW STUFF HERE -->
+ <condition property="qualifier" value="${JBT_VERSION_STRING}.v${TIMESTAMP}-${BUILD_ALIAS_STRING}"
+ else="${JBT_VERSION_STRING}.v${TIMESTAMP}-H${BUILD_NUMBER_STRING}-${BUILD_ALIAS_STRING}">
+ <contains string="${BUILD_NUMBER}" substring="BUILD_NUMBER" />
+ </condition>
+ <echo level="verbose">qualifier = ${qualifier}</echo>
+ <if>
+ <contains string="${TIMESTAMP}" substring="TIMESTAMP"/>
+ <then>
+ <var name="TIMESTAMP" unset="true"/>
+ <propertyregex property="TIMESTAMP" input="${qualifier}" defaultvalue="${qualifier}" regexp=".+v(\d{8}-\d{4}).+" select="\1"/>
+ </then>
+ </if>
+ <echo level="verbose">TIMESTAMP = ${TIMESTAMP}</echo>
- <target name="buildResults.single" depends="init" description="generate buildResults.html from build properties">
- <ant target="collect.zips" antfile="${aggregate_site_build.xml}">
- <property name="inputRepos" value="2" />
- <property name="inputRepo1" value="file://${input.dir}/all/repo/" />
- <property name="inputRepo2" value="http://download.jboss.org/jbosstools/builds/staging/${JOB_NAME}/all/repo/" />
- </ant>
- <ant target="collect.metadata" antfile="${aggregate_site_build.xml}">
- </ant>
- <antcall target="buildResults" />
- </target>
+ <antcall target="generate.html" />
- <target name="buildResults.aggregate" depends="init" description="generate buildResults.html from build properties">
- <ant target="collect.zips" antfile="${aggregate_site_build.xml}">
- <property name="inputRepos" value="2" />
- <property name="inputRepo1" value="file://${input.dir}/all/repo/" />
- <!-- for trunk use _composite_/trunk; for 3.4_stable_branch, use _composite_/3.4.juno -->
- <property name="inputRepo2" value="http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk/" />
- </ant>
- <ant target="collect.metadata" antfile="${aggregate_site_build.xml}">
- </ant>
- <antcall target="buildResults" />
+ <antcall target="cleanup" />
</target>
- <target name="test.buildResults.aggregate" depends="init" description="generate buildResults.html from build properties">
- <property name="isTest" value="true" />
- <ant target="collect.zips" antfile="${aggregate_site_build.xml}">
- <property name="inputRepos" value="1" />
- <!-- for trunk use _composite_/trunk; for 3.4_stable_branch, use _composite_/3.4.juno -->
- <property name="inputRepo1" value="http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk/" />
- </ant>
- <ant target="collect.metadata" antfile="${aggregate_site_build.xml}">
- </ant>
- <antcall target="buildResults" />
- </target>
+ <target name="generate.html">
+ <echo>Generate index pages using qualifier = ${qualifier}</echo>
- <target name="test.buildResults.single" depends="init" description="generate buildResults.html from build properties">
- <property name="isTest" value="true" />
- <ant target="collect.zips" antfile="${aggregate_site_build.xml}">
- <property name="inputRepos" value="1" />
- <property name="inputRepo1" value="http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.3_trunk...." />
- </ant>
- <ant target="collect.metadata" antfile="${aggregate_site_build.xml}">
- </ant>
- <antcall target="buildResults" />
+ <!-- replace links to jobs w/ correct stream (eg., 3.3_stable_branch, 3.4_stable_branch or 3.4_trunk) -->
+ <condition property="STREAM_SUFFIX" value="_stable_branch" else="_trunk">
+ <contains string="${JOB_NAME}" substring="_stable_branch" />
+ </condition>
+ <condition property="STREAM_NAME" value="3.3.indigo" else="Trunk">
+ <contains string="${JOB_NAME}" substring="_stable_branch" />
+ </condition>
+
+ <condition property="WARNING" value="This nightly build is a direct build from SVN/CVS and is provided as-is with no guarantees. Be advised that while there is no prior proof, if this build sets fire to your computer, you were sufficiently warned!" else="This build has been deemed by the JBossTools team to be in good working condition. Please note that this build may be a developer release, and if so should be treated with slightly more understanding and care than a stable release. Please see the release notes on JIRA and/or Sourceforge for further information.">
+ <contains string="${update.site.description_STRING}" substring="Nightly"/>
+ </condition>
+
+ <!-- set IDs for the chart widgets from the views -->
+ <!-- TODO: will later need to add a third case for 6.0 stable_branch -->
+ <condition property="PORTLET.1" value="125" else="118">
+ <contains string="${JOB_NAME}" substring="_stable_branch" />
+ </condition>
+ <condition property="PORTLET.2" value="126" else="119">
+ <contains string="${JOB_NAME}" substring="_stable_branch" />
+ </condition>
+
+ <!-- use locally built files with relative paths -->
+ <copy todir="target/" overwrite="true">
+ <fileset file="index-template.html" />
+ <mapper type="merge" to="index.html" />
+ <filterchain>
+ <expandproperties />
+ </filterchain>
+ </copy>
</target>
- <target name="buildResults" description="generate buildResults.html from build properties" depends="init">
- <var name="propertiesFileFound" unset="true" />
- <for param="propertiesFile" delimiter=", " list="${output.dir}/zips/build.properties.all.xml, zips/build.properties.all.xml, ../../logs/zips/build.properties.all.xml">
- <sequential>
- <if>
- <and>
- <available file="@{propertiesFile}" type="file" />
- <not>
- <isset property="propertiesFileFound" />
- </not>
- </and>
- <then>
- <var name="propertiesFileFound" value="true" />
- <delete quiet="true" file="buildResults.html" />
- <xslt in="@{propertiesFile}" out="buildResults.html" style="buildResults.xsl" force="true">
- <classpath>
- <pathelement location="${COMMON_TOOLS}/saxon.jar" />
- </classpath>
- </xslt>
- </then>
- <else>
- </else>
- </if>
- </sequential>
- </for>
- <if>
- <not>
- <isset property="propertiesFileFound" />
- </not>
- <then>
- <echo>Could not generate buildResults.html from zips/build.properties.all.xml - file does not exist!</echo>
- </then>
- </if>
- <var name="propertiesFileFound" unset="true" />
+ <target name="cleanup">
+ <delete includeemptydirs="true" quiet="true">
+ <fileset dir="${tmpdir}" />
+ </delete>
</target>
+<!-- macros -->
+
+ <macrodef name="get.size">
+ <attribute name="file" />
+ <attribute name="property" />
+ <sequential>
+ <var name="size" unset="true" />
+ <var name="size-in-mb" unset="true" />
+ <if>
+ <available file="@{file}" />
+ <then>
+ <length file="@{file}" property="size" />
+
+ <math result="size-in-mb">
+ <op op="/">
+ <op op="floor">
+ <op op="*">
+ <op op="/">
+ <num value="${size}" />
+ <num value="1048576" />
+ </op>
+ <num value="100" />
+ </op>
+ </op>
+ <num value="100" />
+ </op>
+ </math>
+
+ <property name="@{property}" value="${size-in-mb}" />
+ </then>
+ <else>
+ <property name="@{property}" value="-1" />
+ </else>
+ </if>
+ </sequential>
+ </macrodef>
+
</project>
Deleted: trunk/build/results/buildResults.css
===================================================================
--- trunk/build/results/buildResults.css 2012-06-12 18:12:11 UTC (rev 41897)
+++ trunk/build/results/buildResults.css 2012-06-12 18:56:39 UTC (rev 41898)
@@ -1,258 +0,0 @@
-@CHARSET "UTF-8";
-body {
- font-family: Verdana, Sans-Serif, Helvetica, Arial;
-}
-
-#header, #header-blue {
- width: 70%;
- position: absolute;
- top: 10px;
- left: 15%;
- padding: 5px;
- padding-bottom: 0px;
- margin-bottom: 0px;
- color: #fff;
-
- border-width: 1px;
- border-style: solid;
- border-color: #a00000;
-}
-
-#header {
- background: url(images/gradient-red.png) 0px 0px repeat-x;
-}
-
-#header-blue {
- background: url(images/gradient-blue.png) 0px 0px repeat-x;
-}
-
-#header table tr td, #header-blue table tr td {
- font-weight: bold;
- font-size: 14pt;
-}
-
-#title {
- color: #f0f0f0;
-}
-
-#title-blue {
- color: #000000;
-}
-
-#buildName {
- font-size: 10pt;
- color: #fc6;
-}
-
-#buildName-blue {
- font-size: 10pt;
- color: #0000d0;
-}
-
-#buildDate, #buildExecTime, #buildLog {
- font-size: 8pt;
- color: #ccc;
-}
-
-#buildDate-blue, #buildExecTime-blue {
- font-size: 8pt;
- color: #303060;
-}
-
-#buildLog-blue {
- font-size: 8pt;
- color: #0000d0;
-}
-
-#downloads, #downloads-blue {
- border-width: 1px;
- border-style: solid;
- border-color: #a00000;
- border-top-width: 0px;
- padding: 5px;
-
- width: 70%;
- position: absolute;
- top: 61px;
- left: 15%;
-}
-
-#links, #links-blue {
- border-width: 0px 0px 1px 0px;
- border-style: solid;
- border-color: #a00000;
- padding-bottom: 4px;
-}
-
-#links tr td {
- font-size: 8pt;
-}
-
-a {
- color: #a00000;
-}
-
-a.blue {
- color: #6060c0;
-}
-
-a:hover {
- color: #f00000;
-}
-
-a.blue:hover {
- color: #0000f0;
-}
-
-h1 {
- font-size: 11pt;
- color: #300000;
-}
-
-h1.blue {
- color: #000030;
-}
-
-h2 {
- font-size: 10pt;
- color: #d00000;
-}
-
-h2.blue {
- color: #0000d0;
-}
-
-p {
- font-size: 8pt;
- color: #202020;
-}
-
-div.line {
- background-color: #f00000;
- height: 1px;
-}
-
-div.line-blue {
- background-color: #0000f0;
- height: 1px;
-}
-
-#rightFrame {
- float: right;
- padding: 5px;
-}
-
-#buildDrivers, #unitTestResults, #coverageResults, #buildDrivers-blue, #unitTestResults-blue, #coverageResults-blue {
- font-size: 10pt;
- color: #000030;
-
- border-bottom-width: 1px;
- border-bottom-style: solid;
- border-bottom-color: #f00000;
-
- padding-bottom: 3px;
- margin-bottom: 3px;
-}
-
-#buildDrivers-blue, #unitTestResults-blue, #coverageResults-blue {
- border-bottom-color: #0000f0;
-}
-
-#buildDrivers table tr td, #buildDrivers-blue table tr td {
- font-size: 8pt;
-}
-
-#unitTestResults table tr td, #unitTestResults-blue table tr td {
- font-size: 9pt;
-}
-
-img {
- vertical-align: middle;
-}
-
-#downloadLinks {
- padding: 5px;
- float: left;
-}
-
-#downloadLinks h1 {
- font-size: 14pt;
-}
-
-.downloadInfo {
- font-size: 8pt;
- color: #909090;
-}
-
-a.allLink, a.allLink-blue {
- padding-left: 5px;
- font-size: 14pt;
- font-weight: bold;
- text-decoration: none;
- color: #c33;
-}
-
-a.allLink-blue {
- color: #3030c0;
-}
-
-a.pluginLink, a.pluginLink-blue {
- padding-left: 5px;
- font-size: 8pt;
- font-weight: bold;
- text-decoration: none;
- color: #c33;
-}
-
-a.pluginLink-blue {
- color: #3030c0;
-}
-
-a.md5 {
- font-size: 8pt;
- font-weight: bold;
- color: #666;
- text-decoration: none;
-}
-
-span.description {
- font-size: 10pt;
- color: black;
- font-weight: bold;
-}
-
-
-#buildInfo {
- width: 300px;
-}
-
-
-#buildInfo p, #buildInfo b {
- font-size: 8pt;
- color: #666;
-}
-
-#testPercentage {
- border: 1px solid #666;
- width: 200px;
- height: 15px;
-
-}
-
-#testPassPercentage {
- background-color: #21844f;
- height: 15px;
- float: left;
- clear: none;
-}
-
-#testFailPercentage {
- background-color: #de1f2f;
- height: 15px;
- float: left;
- clear: none;
-}
-
-#header-blue, #downloads-blue, #links-blue {
- border-color: #0000f0;
-}
\ No newline at end of file
Deleted: trunk/build/results/buildResults.xsl
===================================================================
--- trunk/build/results/buildResults.xsl 2012-06-12 18:12:11 UTC (rev 41897)
+++ trunk/build/results/buildResults.xsl 2012-06-12 18:56:39 UTC (rev 41898)
@@ -1,326 +0,0 @@
-<xsl:stylesheet version="2.0"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:saxon="http://saxon.sf.net/"
- xmlns="http://www.w3.org/1999/xhtml" extension-element-prefixes="saxon">
- <xsl:output method="html" indent="yes" />
- <xsl:template match="/properties">
- <html>
- <head>
- <title>JBossTools Build Results</title>
- <link rel="stylesheet" type="text/css" href="buildResults.css" />
- </head>
- <body>
- <div id="header-blue">
- <table width="100%" height="100%">
- </table>
- </div>
-
- <div id="downloads-blue">
- <table id="links-blue" width="100%">
- <tr>
- <td>
- <a class="blue" href="http://www.jboss.org/tools">JBossTools</a>
- |
- <a class="blue" href="http://www.redhat.com/jbds">JBDS</a>
- |
- <a class="blue" href="http://tools.hibernate.org">Hibernate Tools</a>
- |
- <a class="blue"
- href="http://www.jboss.com/index.html?module=bb&op=viewforum&f=201">User
- Forum</a>
- |
- <a class="blue"
- href="http://jboss.com/index.html?module=bb&op=viewforum&f=162">Development
- Forum</a>
- |
- <a class="blue"
- href="http://jira.jboss.com/jira/secure/BrowseProject.jspa?id=10020">JIRA
- / Bugs</a>
- | #jbosstools on irc.freenode.net
- </td>
- <td align="right">
- <a class="blue" href="http://www.redhat.com">
- <img src="images/redhat.gif" border="0" />
- </a>
- <a class="blue" href="http://www.jboss.org">
- <img src="images/jboss.gif" border="0" />
- </a>
- <a class="blue" href="http://www.hibernate.org">
- <img src="images/hibernate.gif" border="0" />
- </a>
- <a class="blue" href="http://www.eclipse.org">
- <img src="images/eclipse.gif" border="0" />
- </a>
- </td>
- </tr>
- </table>
-
- <div id="downloadLinks">
-
- <table>
- <tr>
- <td colspan="2">
- First time here ? Read
- <a href="http://www.jboss.org/tools/download/installation.html">How
- to install JBoss Tools.</a>
- </td>
- </tr>
-
- <tr>
- <td colspan="2">
- <h1>p2 Repo / Update Site Zips:</h1>
- </td>
- </tr>
-
- <!-- three use cases: a regular component build (as, ws, etc.), a
- different-SVN component build (teiid, pi4soa, savara), and a special component
- build (xulrunner) -->
- <xsl:for-each
- select="//property[contains(@name,'build.properties.JOB_NAME')]">
- <xsl:variable name="JOB_NAME">
- <xsl:value-of select="@value" />
- </xsl:variable>
- <xsl:variable name="COMPONENT">
- <xsl:choose>
- <!-- property name="jbosstools-3.4_trunk.component- -ws-SNAPSHOT.build.properties.JOB_NAME"
- value="jbosstools-3.4_trunk.component- -ws" -->
- <xsl:when test="contains(@value,'component--')">
- <xsl:value-of select="substring-after(@value,'component--')" />
- </xsl:when>
-
- <!-- property name="jbosstools-drools-5.2_trunk-SNAPSHOT.build.properties.JOB_NAME"
- value="jbosstools-drools-5.2_trunk" -->
- <xsl:when test="contains(@value, '_stable_branch')">
- <xsl:value-of
- select="substring-before(substring-after(@value,'jbosstools-'),'_stable_branch')" />
- </xsl:when>
- <xsl:when test="contains(@value, '_trunk')">
- <xsl:value-of
- select="substring-before(substring-after(@value,'jbosstools-'),'_trunk')" />
- </xsl:when>
-
- <!-- property name="xulrunner-1.9.1.2-2011-01-20_20-39-25-H36.build.properties.JOB_NAME"
- value="xulrunner-1.9.1.2" -->
- <xsl:otherwise>
- <xsl:value-of select="@value" />
- </xsl:otherwise>
- </xsl:choose>
- </xsl:variable>
-
- <tr>
- <td colspan="2">
- <a href="http://hudson.qa.jboss.com/hudson/job/{$JOB_NAME}/">
- <xsl:value-of select="$COMPONENT" />
- </a>
- </td>
- </tr>
-
- <xsl:for-each
- select="//property[contains(@name,'build.properties.filename') and contains(@name,$COMPONENT)]">
- <xsl:variable name="rowColor">
- <xsl:if test="position() mod 2 = 1">
- #CCCCEE
- </xsl:if>
- <xsl:if test="position() mod 2 = 0">
- #FFFFFF
- </xsl:if>
- <xsl:if test="contains(@name,'All')">
- #CCEECC
- </xsl:if>
- <xsl:if test="contains(@name,'Source')">
- #EECCCC
- </xsl:if>
- </xsl:variable>
-
- <tr bgcolor="{$rowColor}">
- <!-- <td> <img src="images/OK-small.png" /> </td> -->
- <td class="downloadInfo">
- <xsl:for-each select=".">
- <b>
- <xsl:variable name="filelabel">
- <xsl:choose>
- <!-- property name="jbosstools-3.4_trunk.component- -ws-SNAPSHOT.build.properties.JOB_NAME"
- value="jbosstools-3.4_trunk.component- -ws" -->
- <xsl:when test="contains(@value,'component--')">
- <xsl:value-of select="substring-after(@value,'component--')" />
- </xsl:when>
-
- <!-- property name="jbosstools-drools-5.2_trunk-SNAPSHOT.build.properties.JOB_NAME"
- value="jbosstools-drools-5.2_trunk" -->
- <xsl:when test="contains(@value, '_stable_branch')">
- <xsl:value-of
- select="replace(substring-after(@value,'jbosstools-'),'_stable_branch','')" />
- </xsl:when>
- <xsl:when test="contains(@value, '_trunk')">
- <xsl:value-of
- select="replace(substring-after(@value,'jbosstools-'),'_trunk','')" />
- </xsl:when>
-
- <!-- property name="xulrunner-1.9.1.2-2011-01-20_20-39-25-H36.build.properties.JOB_NAME"
- value="xulrunner-1.9.1.2" -->
- <xsl:otherwise>
- <xsl:value-of select="@value" />
- </xsl:otherwise>
- </xsl:choose>
- </xsl:variable>
- <!-- Update, Sources, etc. -->
- <xsl:variable name="fileType">
- <xsl:choose>
- <xsl:when test="contains($filelabel, 'Update')">
- <xsl:value-of
- select="'Update'" />
- </xsl:when>
- <xsl:when test="contains($filelabel, 'Sources')">
- <xsl:value-of
- select="'Sources'" />
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="'Other'" />
- </xsl:otherwise>
- </xsl:choose>
- </xsl:variable>
-
- <a class="allLink-blue" href="{@value}">
- <xsl:value-of select="$filelabel" />
- </a>
- <ul>
- <li>
- md5:
- <xsl:for-each
- select="//property[contains(@name,'build.properties.filemd5') and contains(@name,$COMPONENT) and contains(@name,$fileType)]">
- <xsl:value-of select="@value" />
- </xsl:for-each>
- </li><li>size:
- <xsl:for-each
- select="//property[contains(@name,'build.properties.filesize') and contains(@name,$COMPONENT) and contains(@name,$fileType)]">
- <xsl:value-of select="@value" /> bytes
- </xsl:for-each>
- </li>
-
- <xsl:for-each
- select="tokenize(//property[contains(@name,'build.properties.SVN_REVISION') and contains(@name,$COMPONENT)]/@value,',')">
- <li>SVN: <xsl:value-of select="." /></li>
- </xsl:for-each>
- </ul>
- </b>
- </xsl:for-each>
- </td>
- </tr>
- </xsl:for-each>
- </xsl:for-each>
- </table>
-
- </div>
-
- <div id="rightFrame">
- <div id="buildDrivers-blue">
- <b>SVN Revisions</b>
- <br />
- See
- <a
- href="http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.4_trunk....">SVN_REVISION.txt</a>
- </div>
- <div id="buildDrivers-blue">
- <b>Target Platform</b>
- <table>
- <tr>
- <td rowspan="3">
- Eclipse Juno 4.2 +
- <br />
- Web Tools 3.4 +
- <br />
- BIRT + DTP ...
- </td>
- <td>
- <a class="blue"
- href="http://download.jboss.org/jbosstools/updates/target-platform_3.4.juno.M6/...">Target Platform Update Site</a>
- </td>
- </tr>
- <tr>
- <td>
- <a class="blue"
- href="http://download.jboss.org/jbosstools/updates/target-platform_3.4.juno.M6/...">Target Platform Update Zip</a>
- </td>
- </tr>
- <tr>
- <td>
- <a class="blue"
- href="http://anonsvn.jboss.org/repos/jbosstools/trunk/build/target-platform/uni...">Target Platform Definition File</a>
- </td>
- </tr>
- </table>
- </div>
- <div id="unitTestResults-blue">
- <b>Unit Test Results</b>
- <br />
-
- See
- <a
- href="http://hudson.qa.jboss.com/hudson/job/jbosstools-3.4_trunk.tests/">jbosstools-3.4_trunk.tests</a>
- <!-- <table> <tr> <td> <img src="images/test.gif" /> Tests </td> <td
- align="right">??? </td> </tr> <tr> <td> <img src="images/testerr.gif" />
- Errors </td> <td align="right">???</td> </tr> <tr> <td> <img src="images/testfail.gif"
- /> Failures </td> <td align="right">???</td> </tr> <tr> <td colspan="2">
- <b id="testPassPercentageAmount">%</b> tests passed <div id="testPercentage">
- <div id="testPassPercentage"> </div> <div id="testFailPercentage"> </div>
- </div> </td> </tr> </table> -->
-
- <script>
- <!-- var tests = 2228; var failures = 0; var errors = 0; var passPercent
- = Math.floor(((tests-(failures+errors))/tests) * 100); var failPercent =
- 100 - passPercent; document.getElementById("testPassPercentage").style.width
- = passPercent + '%'; document.getElementById("testFailPercentage").style.width
- = failPercent + '%'; document.getElementById("testPassPercentageAmount").innerHTML
- = passPercent + '%'; -->
- </script>
-
- <!-- <div align="right"> <a class="blue" style="align: right;" href="tests/test-results/org.jboss.ide.eclipse.tests.html">See
- full unit test results</a> </div> <div align="right"> <a class="blue" style="align:
- right;" href="tests/test-results/test-workspace.log.txt">See unit test workspace
- log</a> </div> <div id="coverageResults-blue"> <b>Test Coverage Results</b>
- <br /> <div align="right"> <a class="blue" style="align: right;" href="tests/test-results/emma-coverage/index.html">See
- test coverage results</a> </div> <div align="right"> <a class="blue" style="align:
- right;" href="tests/test-results/emma-coverage/coverage.es">See coverage
- session file</a> </div> </div> -->
- </div>
-
- <div id="buildInfo">
- <p>
- <b>WARNING</b>
- </p>
- <p>This build has been deemed by the JBossTools team to be in
- good working condition.
- Please note that this build may be a
- developer release, and if so
- should be treated
- with slightly more
- understanding and care than a stable release.
- Please see the
- release
- notes on JIRA and/or Sourceforge for further
- information.
- (This
- release is much less likely to
- set your
- computer aflame.)</p>
-
- <p>Any suggestions/issues should be posted on the relevant
- product
- forums and should clearly indicate that you are using an
- integration
- build. Please take care in making sure that your
- issue hasn't
- already been addressed when posting on forums or
- opening new
- JIRA issues.</p>
- </div>
-
- </div>
-
- </div>
-
- </body>
- </html>
-
-
- </xsl:template>
-</xsl:stylesheet>
Deleted: trunk/build/results/collect-test-results.xml
===================================================================
--- trunk/build/results/collect-test-results.xml 2012-06-12 18:12:11 UTC (rev 41897)
+++ trunk/build/results/collect-test-results.xml 2012-06-12 18:56:39 UTC (rev 41898)
@@ -1,226 +0,0 @@
-<project default="collect.test.results.for.hudson" basedir="." name="Generate test results even when no tests were run. Prevents build from failing if tests are disabled.">
- <!-- ****************************** Configuration ****************************** -->
-
- <!-- override for local build -->
- <condition property="isInHudson" value="true">
- <or>
- <contains string="${user.dir}" substring="hudson" />
- <contains string="${user.name}" substring="hudson" />
- <contains string="${user.home}" substring="hudson" />
- </or>
- </condition>
- <target name="local" unless="isInHudson">
- <property name="WORKINGDIR" value="${basedir}" />
- <property name="COMMON_TOOLS" value="${java.io.tmpdir}" />
- </target>
-
- <target name="get.ant-contrib" unless="ant-contrib.jar.exists">
- <property name="ANTCONTRIB_MIRROR" value="http://downloads.sourceforge.net/ant-contrib/" />
- <get usetimestamp="true" dest="${COMMON_TOOLS}/ant-contrib-1.0b2-bin.zip" src="${ANTCONTRIB_MIRROR}/ant-contrib-1.0b2-bin.zip" />
- <touch file="${COMMON_TOOLS}/ant-contrib-1.0b2-bin.zip" />
- <mkdir dir="${java.io.tmpdir}/ant-contrib-1.0b2-bin.zip_" />
- <unzip src="${COMMON_TOOLS}/ant-contrib-1.0b2-bin.zip" dest="${java.io.tmpdir}/ant-contrib-1.0b2-bin.zip_" overwrite="true" />
- <copy file="${java.io.tmpdir}/ant-contrib-1.0b2-bin.zip_/ant-contrib/lib/ant-contrib.jar" tofile="${COMMON_TOOLS}/ant-contrib.jar" failonerror="true" />
- <delete dir="${java.io.tmpdir}/ant-contrib-1.0b2-bin.zip_" includeemptydirs="true" quiet="true" />
- </target>
-
- <target name="init" depends="local">
- <!-- https://jira.jboss.org/jira/browse/JBQA-3313 Use static, shared space outside workspace, instead of working directly in the workspace -->
- <condition property="WORKINGDIR" value="/home/hudson/static_build_env/jbds/tools/sources" else="${basedir}">
- <available file="/home/hudson/static_build_env/jbds" type="dir" />
- </condition>
- <mkdir dir="${WORKINGDIR}" />
- <echo level="info">WORKINGDIR = ${WORKINGDIR}</echo>
-
- <condition property="COMMON_TOOLS" value="/home/hudson/static_build_env/jbds/tools" else="${WORKINGDIR}/../tools">
- <available file="/home/hudson/static_build_env/jbds" type="dir" />
- </condition>
- <mkdir dir="${COMMON_TOOLS}" />
- <echo level="info">COMMON_TOOLS = ${COMMON_TOOLS}</echo>
-
- <available file="${COMMON_TOOLS}/ant-contrib.jar" type="file" property="ant-contrib.jar.exists" />
- <antcall target="get.ant-contrib" />
- <taskdef resource="net/sf/antcontrib/antlib.xml">
- <classpath>
- <pathelement location="${COMMON_TOOLS}/ant-contrib.jar" />
- </classpath>
- </taskdef>
-
- </target>
-
- <!-- ***** The methods below are used in Hudson/Jenkins jobs to generate test results even when no tests were run. Prevents build from failing if tests are disabled. ***** -->
-
- <!--
- To run this after a maven build in Hudson, set these properties:
- basedir=${WORKSPACE}/sources
- WORKINGDIR=${WORKSPACE}/sources
- COMPONENT=.
- move.test.results=true
- -->
- <target name="collect.test.results.for.hudson" depends="init" if="isInHudson" description="collect test results after a pure maven build so Hudson has something to see">
- <property name="basedir" value="${WORKSPACE}/sources" />
- <property name="WORKINGDIR" value="${WORKSPACE}/sources" />
- <property name="COMPONENT" value="." />
- <property name="move.test.results" value="true" />
- <var name="tests.results.found" value="false" />
- <echo level="debug">basedir = ${basedir}
-WORKINGDIR = ${WORKINGDIR}
-COMPONENT = ${COMPONENT}</echo>
- <delete dir="${basedir}/surefire-reports/NoTestsRun" includeemptydirs="true" />
- <for param="test.xml.files" delimiter=",
- ">
- <path>
- <fileset dir="${WORKINGDIR}" includes="**/target/surefire-reports/TEST-*.xml, **/**/target/surefire-reports/TEST-*.xml" excludes="**/TEST-*NoTestsRun.xml, **/**/TEST-*NoTestsRun.xml" />
- </path>
- <sequential>
- <var name="tests.results.found" value="true" />
- </sequential>
- </for>
- <if>
- <equals arg1="${tests.results.found}" arg2="true" />
- <then>
- <antcall target="collect.test.results">
- <param name="COMPONENT" value="." />
- </antcall>
- <antcall target="collect.all.test.results" />
- </then>
- <else>
- <antcall target="create.empty.test.results.file" />
- <property name="no.tests.run" value="true" />
- </else>
- </if>
- </target>
-
- <target name="create.empty.test.results.file">
- <!-- create fake test result file to avoid Hudson failure -->
- <delete dir="${basedir}/surefire-reports/NoTestsRun" includeemptydirs="true" />
- <mkdir dir="${basedir}/surefire-reports/NoTestsRun" />
- <echo file="${basedir}/surefire-reports/NoTestsRun/TEST-org.jboss.tools.NoTestsRun.xml"><?xml version="1.0" encoding="UTF-8" ?>
-<testsuite failures="0" time="0.001" errors="0" skipped="0" tests="1" name="org.jboss.tools.NoTestsRun">
-<testcase time="0.001" classname="org.jboss.tools.NoTestsRun" name="NoTestsRun"/>
-</testsuite>
-</echo>
- </target>
-
- <target name="collect.test.results">
- <delete dir="${basedir}/surefire-reports/NoTestsRun" includeemptydirs="true" />
- <property name="COMPONENT" value="" />
- <!-- collect test results by copying ${WORKINGDIR}/${COMPONENT}/**/target/surefire-reports/*.xml into ${basedir}/surefire-reports/${COMPONENT} -->
- <delete dir="${basedir}/surefire-reports/${COMPONENT}" includeemptydirs="true" />
- <mkdir dir="${basedir}/surefire-reports/${COMPONENT}" />
- <copy todir="${basedir}/surefire-reports/${COMPONENT}" flatten="true" preservelastmodified="true" overwrite="true">
- <fileset dir="${WORKINGDIR}/${COMPONENT}" includes="**/target/surefire-reports/TEST-*.xml" />
- </copy>
- <if>
- <isset property="move.test.results" />
- <then>
- <delete dir="${WORKINGDIR}/${COMPONENT}" includes="**/target/surefire-reports" />
- </then>
- </if>
- </target>
-
- <target name="collect.all.test.results" unless="no.tests.run">
- <var name="test.results.all" value="" />
- <var name="test.results.errors.failures.skipped" value="" />
-
- <!-- Parse this: <testsuite errors="0" skipped="0" tests="10" time="0.042" failures="0" name="org.jboss.tools.jmx.ui.JMXUIAllTests"> -->
- <for param="testresultfile" delimiter=",
- ">
- <path>
- <fileset dir="${basedir}/surefire-reports/" includes="**/TEST-*.xml" />
- </path>
- <sequential>
- <var name="testsuite.name" unset="true" />
- <var name="testsuite.tests" unset="true" />
- <var name="testsuite.time" unset="true" />
- <var name="testsuite.skipped" unset="true" />
- <var name="testsuite.errors" unset="true" />
- <var name="testsuite.failures" unset="true" />
- <xmlproperty file="@{testresultfile}" keepRoot="true" collapseAttributes="true" />
- <for param="ts" list="testsuite.skipped, testsuite.errors, testsuite.failures" delimiter=", ">
- <sequential>
- <propertyregex override="true"
- property="ts.label"
- defaultvalue="@{ts}"
- input="@{ts}"
- regexp="testsuite\.(.+)"
- replace="\1"
- />
- <if>
- <isset property="@{ts}" />
- <then>
- <if>
- <equals arg1="${@{ts}}" arg2="0" />
- <then>
- <var name="@{ts}" value="" />
- </then>
- <else>
- <var name="@{ts}" value="; ${@{ts}} ${ts.label}" />
- </else>
- </if>
- </then>
- </if>
-
- </sequential>
- </for>
- <if>
- <or>
- <not>
- <equals arg1="${testsuite.skipped}" arg2="" />
- </not>
- <not>
- <equals arg1="${testsuite.errors}" arg2="" />
- </not>
- <not>
- <equals arg1="${testsuite.failures}" arg2="" />
- </not>
- </or>
- <then>
- <var name="test.results.errors.failures.skipped"
- value="${test.results.errors.failures.skipped}${testsuite.name} ran ${testsuite.tests} tests in ${testsuite.time}s${testsuite.skipped}${testsuite.errors}${testsuite.failures}${line.separator}"
- />
- </then>
- </if>
- <if>
- <isset property="testsuite.name" />
- <then>
- <var name="test.results.all"
- value="${test.results.all}${testsuite.name} ran ${testsuite.tests} tests in ${testsuite.time}s${testsuite.skipped}${testsuite.errors}${testsuite.failures}${line.separator}"
- />
- </then>
- </if>
- <var name="testsuite.name" unset="true" />
- <var name="testsuite.tests" unset="true" />
- <var name="testsuite.time" unset="true" />
- <var name="testsuite.skipped" unset="true" />
- <var name="testsuite.errors" unset="true" />
- <var name="testsuite.failures" unset="true" />
- </sequential>
- </for>
- <echo level="verbose">-------------------------------------------------------
- A L L T E S T R E S U L T S
--------------------------------------------------------
-${test.results.all}
--------------------------------------------------------
-
-</echo>
- <if>
- <and>
- <isset property="test.results.errors.failures.skipped" />
- <not>
- <equals arg1="${test.results.errors.failures.skipped}" arg2="" />
- </not>
- </and>
- <then>
- <echo level="error">-------------------------------------------------------
- T E S T R E S U L T S
--------------------------------------------------------
-${test.results.errors.failures.skipped}
--------------------------------------------------------
-
-</echo>
- </then>
- </if>
- </target>
-
-</project>
Added: trunk/build/results/index-template.html
===================================================================
--- trunk/build/results/index-template.html (rev 0)
+++ trunk/build/results/index-template.html 2012-06-12 18:56:39 UTC (rev 41898)
@@ -0,0 +1,175 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<title>JBoss Tools - Core - Nightly Build: ${qualifier}</title>
+<style>
+@import url("http://download.jboss.org/jbosstools/updates/web/site.css");
+</style>
+</head>
+<body marginheight="0" marginwidth="0" leftmargin="0" topmargin="0">
+<center>
+<table marginheight="0" marginwidth="0" leftmargin="0" topmargin="0"
+ cellspacing="0" cellpadding="0" width="920" class="bodyText">
+ <tr>
+ <td colspan="3"><img
+ src="https://www.jboss.org/dms/tools/images/tools-banner.png" />
+
+<table width="100%">
+ <tr>
+ <td><small>
+ <a href="http://www.redhat.com/jbds">JBDS</a> | <a href="http://tools.hibernate.org">Hibernate Tools</a> | <a href="http://www.jboss.com/index.html?module=bb&op=viewforum&f=201">User
+ Forum</a> | <a href="http://jboss.com/index.html?module=bb&op=viewforum&f=162">Developer
+ Forum</a> | <a href="http://jira.jboss.com/jira/secure/BrowseProject.jspa?id=10020">JIRA Issues</a> | #jbosstools on <a href="http://webchat.freenode.net/">irc.freenode.net</a></small>
+ </td>
+ <td align="right">
+ <a href="http://www.redhat.com"><img src="https://devstudio.jboss.com/images/redhat.gif" border="0" height="16" width="16"/></a>
+ <a href="http://www.jboss.org"><img src="https://devstudio.jboss.com/images/jboss.gif" border="0" height="16" width="16"/></a>
+ <a href="http://www.hibernate.org"><img src="https://devstudio.jboss.com/images/hibernate.gif" border="0" height="16" width="16"/></a>
+ <a href="http://www.eclipse.org"><img src="https://devstudio.jboss.com/images/eclipse.gif" border="0" height="16" width="16"/></a>
+ </td>
+ <td align="right"><small>
+ <a id="buildName" href="http://hudson.jboss.org/hudson/job/${JOB_NAME}/${BUILD_NUMBER_STRING}/">
+ <span style="font-size: x-small;">Build ${qualifier}</span>
+ </a>
+ </td>
+ </tr>
+ </table> </td>
+ </tr>
+ <tr>
+ <td>      </td>
+ <td>      </td>
+ <td>      </td>
+ </tr>
+ <tr>
+<td colspan="3">
+<div style="background-color:#eeeecc; width:880px;padding:10px;margin:0px;padding-top:0px;margin-top:0px;border:1px #aaaaaa solid;z-index:1;position:relative;float:left">
+<h2 class="prime">JBoss Tools - ${update.site.description_STRING}: ${qualifier}
+ </span></h2>
+
+ <ul>
+ <li><a href="all/repo/">Aggregate Update Site</a>, <a href="all/">Site Zip</a> & <a href="all/">Sources Zip</a></li>
+ <li><a href="components/">Component Update Site Zips</a></li>
+ <li><a href="logs/">Logs & metadata</a></li>
+ </ul>
+
+</div>
+<p style="clear:both"> </p>
+
+<hr/>
+
+ <h4>Logs</h4>
+ <p>
+ <small>
+ <i>Logs are for <b>
+ <a class="blue" href="http://hudson.qa.jboss.com/hudson/job/${JOB_NAME}/">${JOB_NAME}</a>.
+ </b>
+ </i>
+ </small>
+ </p>
+ <div align="right">
+ <a class="blue" style="align: right;" href="http://hudson.qa.jboss.com/hudson/job/${JOB_NAME}/${BUILD_NUMBER_STRING}/...">This Console</a>
+ </div>
+
+ <div align="right">
+ <a class="blue" style="align: right;" href="http://hudson.qa.jboss.com/hudson/job/${JOB_NAME}/lastBuild/console">Lastest Console</a> (!)
+ </div>
+
+ <h4>SVN Revisions</h4>
+ <p>
+ <small>
+ <i>SVN Revision is for upstream <b>
+ <a class="blue" href="http://hudson.qa.jboss.com/hudson/job/jbosstools-3.3${STREAM_SUFFIX}.aggr...">jbosstools-3.3${STREAM_SUFFIX}.aggregate</a>
+ </b>
+ <br />
+job. Results are live,
+not specific to this build.</i>
+ </small>
+ </p>
+ <div align="right">
+ <a class="blue" style="align: right;" href="http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.3${STREA...">SVN Revision</a> (!)
+ </div>
+
+ <h4>Target Platform: Indigo SR2 (incl. Eclipse 3.7.2 + Web Tools 3.3.2)</h4>
+ <p>
+ <small>
+ <i>Target Platforms are built upstream via these jobs: <br />
+ <b>
+ <a class="blue" href="http://hudson.qa.jboss.com/hudson/job/jbosstools-3.3${STREAM_SUFFIX}.targ...">jbosstools-3.3${STREAM_SUFFIX}.target-platform</a>
+ </b>
+ <br />
+ </i>
+ </small>
+ </p>
+
+ <div align="right">
+ <a class="blue" style="align: right;" href="http://download.jboss.org/jbosstools/updates/target-platform_3.3.indigo.SR2/">JBT Target Platform Update Site</a> (!)
+ </div>
+ <div align="right">
+ <a class="blue" style="align: right;" href="http://anonsvn.jboss.org/repos/jbosstools/trunk/build/target-platform/uni...">JBT Target Platform Definition File</a> (!)
+ </div>
+
+ <h4>Test Results</h4>
+ <p>
+ <small>
+ <i>Test results at <b style="font-weight:bold;font-size:12px">right</b> are for upstream <b>
+ <a class="blue" href="http://hudson.qa.jboss.com/hudson/job/jbosstools-3.3${STREAM_SUFFIX}.tests/">jbosstools-3.3${STREAM_SUFFIX}.tests</a>
+ </b>
+job. <br/>
+Test results <b style="font-weight:bold;font-size:12px">below</b> are cumulative across all jobs in the <a href="http://hudson.jboss.org/hudson/view/JBossTools/view/JBossTools_${STREAM_N...">DevStudio_${STREAM_NAME} view</a></i>.<br/>
+Results are live, not specific to this build.
+ </small>
+ </p>
+
+<p>
+ <div style="float:right">
+ <a class="blue" style="align: right" href="http://hudson.jboss.org/hudson/job/jbosstools-3.3${STREAM_SUFFIX}.tests/t..."><img src="http://hudson.jboss.org/hudson/job/jbosstools-3.3${STREAM_SUFFIX}.tests/t..." border="0"></a> (!)
+ <br/>
+ <a class="blue" style="align: right" href="http://hudson.jboss.org/hudson/job/jbosstools-3.3${STREAM_SUFFIX}.tests/t..."><img src="http://hudson.jboss.org/hudson/job/jbosstools-3.3${STREAM_SUFFIX}.tests/t..." border="0"></a> (!)
+ <br/>
+ <a class="blue" style="align: right;" href="http://hudson.qa.jboss.com/hudson/job/jbosstools-3.3${STREAM_SUFFIX}.test...">Unit test report</a> (!)
+ <br/>
+ <a class="blue" style="align: right;" href="http://hudson.jboss.org/hudson/job/jbosstools-3.3${STREAM_SUFFIX}.tests/w...">Unit test workspace logs</a> (!)
+ </div>
+
+ <img src="http://hudson.jboss.org/hudson/view/JBossTools/view/JBossTools_${STREAM_N..."/>
+ <br/>
+ <img src="http://hudson.jboss.org/hudson/view/JBossTools/view/JBossTools_${STREAM_N..."/>
+</p>
+
+ <h4>Test Coverage Results</h4>
+ <p>
+ <small>
+ <i>Test coverage is of upstream <b>
+ <a class="blue" href="http://hudson.qa.jboss.com/hudson/job/jbosstools-3.3${STREAM_SUFFIX}.tests/">jbosstools-3.3${STREAM_SUFFIX}.tests</a>
+ </b>
+ <br />
+job. Results are live,
+not specific to this build.</i>
+ </small>
+ </p>
+ <div align="right">
+ <a class="blue" style="align: right;" href="http://hudson.jboss.org/hudson/job/jbosstools-3.3${STREAM_SUFFIX}.tests/w...">Test
+coverage results</a> (!)
+ </div>
+ <div align="right">
+ <a class="blue" style="align: right;" href="http://hudson.jboss.org/hudson/job/jbosstools-3.3${STREAM_SUFFIX}.tests/w...">Coverage.es
+session files</a> (!)
+ </div>
+
+ <h4>WARNING</h4>
+
+ <p>${WARNING}</p>
+
+ <p>Any suggestions/issues should be posted on the relevant product forums and should clearly indicate that you are using a <b>${update.site.description_STRING}</b>. Please take care in making sure that your issue hasn't already been addressed when posting on forums or opening new JIRA issues.</p>
+
+ <small>
+ <i>Note: Links tagged with (!) are live and will change with subsequent builds to show the latest results. See also <a style="color:#FF9933" href="http://download.jboss.org/jbosstools/builds/cascade/trunk.html">Build Job Cascade & Results</a>
+ </i>
+ </small>
+<p> </p>
+<hr/>
+
+ </tr>
+</table>
+</body>
+</html>
Added: trunk/build/results/pom.xml
===================================================================
--- trunk/build/results/pom.xml (rev 0)
+++ trunk/build/results/pom.xml 2012-06-12 18:56:39 UTC (rev 41898)
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>parent</artifactId>
+ <version>3.4.0.M1-SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
+ </parent>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>org.jboss.tools.buildresults</artifactId>
+ <name>JBoss Tools Build Results</name>
+ <description>
+ Generates index.html linking to jars and zips, plus provides other metadata
+ </description>
+ <packaging>pom</packaging>
+
+ <!--
+ To build locally while generating installers/sources, must set a number of variables:
+ mvn install -DJOB_NAME=jbosstools-3.3_stable_branch.aggregate
+ To build locally against previously built installers/sources, must set more variables:
+ mvn install -DJOB_NAME=jbosstools-3.3_stable_branch.aggregate -DTIMESTAMP=20120608-1840 -Dupdate.site.description="Development Milestone"
+ -->
+
+ <properties>
+ <maven.build.timestamp.format>yyyyMMdd-HHmm</maven.build.timestamp.format>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <inherited>false</inherited>
+ <executions>
+ <execution>
+ <id>install</id>
+ <phase>install</phase>
+ <configuration>
+ <quiet>true</quiet>
+ <tasks>
+ <ant antfile="build.xml" target="build" dir="./">
+ <property name="update.site.description" value="${update.site.description}"/>
+ <property name="JOB_NAME" value="${JOB_NAME}" />
+ <property name="JBT_VERSION" value="${JBT_VERSION}"/>
+ <property name="TIMESTAMP" value="${TIMESTAMP}"/>
+ <property name="maven.build.timestamp" value="${maven.build.timestamp}"/>
+ <property name="BUILD_NUMBER" value="${BUILD_NUMBER}"/>
+ <property name="BUILD_ALIAS" value="${BUILD_ALIAS}"/>
+ </ant>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.8.2</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-net</groupId>
+ <artifactId>commons-net</artifactId>
+ <version>1.4.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.7.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ <version>1.7.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-trax</artifactId>
+ <version>1.7.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-commons-net</artifactId>
+ <version>1.7.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-apache-regexp</artifactId>
+ <version>1.7.1</version>
+ </dependency>
+ <dependency>
+ <groupId>ant-contrib</groupId>
+ <artifactId>ant-contrib</artifactId>
+ <version>1.0b3</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Deleted: trunk/build/results/surefire-reports/NoTestsRun/TEST-org.jboss.tools.NoTestsRun.xml
===================================================================
--- trunk/build/results/surefire-reports/NoTestsRun/TEST-org.jboss.tools.NoTestsRun.xml 2012-06-12 18:12:11 UTC (rev 41897)
+++ trunk/build/results/surefire-reports/NoTestsRun/TEST-org.jboss.tools.NoTestsRun.xml 2012-06-12 18:56:39 UTC (rev 41898)
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<testsuite failures="0" time="0.001" errors="0" skipped="0" tests="1" name="org.jboss.tools.NoTestsRun">
-<testcase time="0.001" classname="org.jboss.tools.NoTestsRun" name="NoTestsRun"/>
-</testsuite>
13 years, 10 months
- 1
- 0
JBoss Tools SVN: r41897 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-06-12 14:12:11 -0400 (Tue, 12 Jun 2012)
New Revision: 41897
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam23ProjectCreator.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamProjectCreator.java
Log:
https://issues.jboss.org/browse/JBIDE-12160 Seam 2 component.properties is not generated correctly
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam23ProjectCreator.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam23ProjectCreator.java 2012-06-12 18:11:57 UTC (rev 41896)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam23ProjectCreator.java 2012-06-12 18:12:11 UTC (rev 41897)
@@ -11,6 +11,9 @@
package org.jboss.tools.seam.internal.core.project.facet;
import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Properties;
import org.apache.tools.ant.types.FilterSet;
import org.apache.tools.ant.types.FilterSetCollection;
@@ -18,6 +21,7 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
+import org.jboss.tools.seam.core.SeamCorePlugin;
/**
* @author Alexey Kazakov
@@ -67,4 +71,25 @@
Seam23FacetInstallDelegate.copyDBDriverToProject(earProject, model, destFolder);
}
}
+
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.seam.internal.core.project.facet.SeamProjectCreator#createComponentsProperties()
+ */
+ @Override
+ protected void createComponentsProperties() {
+ File seamGenResFolder = new File(ejbProjectFolder, "ejbModule");
+// jndiPattern=java:app/app1-ejb/\#{ejbName}
+ String jndiPattern = "java:app/" + ejbProjectName + "/#{ejbName}";
+ Properties components = new Properties();
+ components.put("jndiPattern", jndiPattern); //$NON-NLS-1$
+ components.put("embeddedEjb", "false"); //$NON-NLS-1$ $NON-NLS-2$
+ File componentsProps = new File(seamGenResFolder, "components.properties"); //$NON-NLS-1$
+ try {
+ componentsProps.createNewFile();
+ components.store(new FileOutputStream(componentsProps), ""); //$NON-NLS-1$
+ } catch (IOException e) {
+ SeamCorePlugin.getPluginLog().logError(e);
+ }
+ }
}
\ No newline at end of file
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamProjectCreator.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamProjectCreator.java 2012-06-12 18:11:57 UTC (rev 41896)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamProjectCreator.java 2012-06-12 18:12:11 UTC (rev 41897)
@@ -126,7 +126,7 @@
private String jbossSeamPath;
private static final Map<String,String> COMPILER_LEVEL_TO_EXEC_ENV = new HashMap<String,String>();
-
+
static
{
COMPILER_LEVEL_TO_EXEC_ENV.put( JavaCore.VERSION_1_3, "J2SE-1.3" ); //$NON-NLS-1$
@@ -150,7 +150,7 @@
earProjectName = model.getStringProperty(ISeamFacetDataModelProperties.SEAM_EAR_PROJECT);
ejbProjectName = model.getStringProperty(ISeamFacetDataModelProperties.SEAM_EJB_PROJECT);
testProjectName = model.getStringProperty(ISeamFacetDataModelProperties.SEAM_TEST_PROJECT);
-
+
seamRuntime = SeamRuntimeManager.getInstance().findRuntimeByName(model.getProperty(ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME).toString());
if(seamRuntime==null) {
throw new RuntimeException("Can't get seam runtime " + model.getProperty(ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME).toString());
@@ -163,7 +163,7 @@
filtersFilterSet = SeamFacetFilterSetFactory.createFiltersFilterSet(model);
seamGenResFolder = new File(seamGenHomeFolder, "resources"); //$NON-NLS-1$
persistenceFile = new File(seamGenResFolder, "META-INF/persistence-" + (SeamFacetAbstractInstallDelegate.isWarConfiguration(model) ? DEV_WAR_PROFILE : DEV_EAR_PROFILE) + ".xml"); //$NON-NLS-1$ //$NON-NLS-2$
-
+
try {
hibernateConsoleLaunchFile = new File(SeamFacetInstallDataModelProvider.getTemplatesFolder(), "hibernatetools/hibernate-console.launch");
} catch (IOException e) {
@@ -274,7 +274,7 @@
});
StringBuffer earJarsStrWar = new StringBuffer();
StringBuffer earJarsStrEjb = new StringBuffer();
-
+
if(earJars != null){
for (File file : earJars) {
earJarsStrWar.append(" ").append(file.getName()).append(" \n");
@@ -293,7 +293,7 @@
FilterSet manifestFilterWar = new FilterSet();
manifestFilterWar.addFilter("earLibs", earJarsStrWar.toString()); //$NON-NLS-1$
manifestFilterColWar.addFilterSet(manifestFilterWar);
-
+
if(shouldCopyLibrariesAndTemplates(model))
AntCopyUtils.copyFileToFolder(new File(SeamFacetInstallDataModelProvider.getTemplatesFolder(), "war/META-INF/MANIFEST.MF"), webMetaInf, manifestFilterColWar, true); //$NON-NLS-1$
@@ -301,7 +301,7 @@
FilterSet manifestFilterEjb = new FilterSet();
manifestFilterEjb.addFilter("earClasspath", earJarsStrEjb.toString()); //$NON-NLS-1$
manifestFilterColEjb.addFilterSet(manifestFilterEjb);
-
+
if(shouldCopyLibrariesAndTemplates(model))
AntCopyUtils.copyFileToFolder(new File(SeamFacetInstallDataModelProvider.getTemplatesFolder(), "ejb/ejbModule/META-INF/MANIFEST.MF"), ejbMetaInf, manifestFilterColEjb, true); //$NON-NLS-1$
} catch (IOException e) {
@@ -559,7 +559,7 @@
protected void createEjbProject() {
if(!shouldCopyLibrariesAndTemplates(model))
return;
-
+
ejbProjectFolder.mkdir();
AntCopyUtils.copyFilesAndFolders(
@@ -579,7 +579,7 @@
new File(ejbProjectFolder, "ejbModule/META-INF/persistence.xml"), //$NON-NLS-1$
viewFilterSetCollection, true);
- SeamFacetAbstractInstallDelegate.createComponentsProperties(new File(ejbProjectFolder, "ejbModule"), earProjectName, false); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ createComponentsProperties();
AntCopyUtils.FileSet ejbSrcResourcesSet = new AntCopyUtils.FileSet(SeamFacetAbstractInstallDelegate.JBOOS_EJB_WEB_INF_CLASSES_SET).dir(seamGenResFolder);
AntCopyUtils.copyFilesAndFolders(
@@ -603,7 +603,6 @@
ejbFilterSet.addFilter("connectionProfile", model.getStringProperty(ISeamFacetDataModelProperties.SEAM_CONNECTION_PROFILE));//$NON-NLS-1$
-
AntCopyUtils.copyFileToFile(
hibernateConsoleLaunchFile,
new File(ejbProjectFolder, getLaunchCfgName(ejbProjectFolder.getName()) + ".launch"), //$NON-NLS-1$
@@ -614,7 +613,11 @@
ejbProjectFolder,
hibernateDialectFilterSet, true);
}
-
+
+ protected void createComponentsProperties() {
+ SeamFacetAbstractInstallDelegate.createComponentsProperties(new File(ejbProjectFolder, "ejbModule"), earProjectName, false); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ }
+
protected String getLaunchCfgName(String baseName){
ILaunchManager lm = DebugPlugin.getDefault().getLaunchManager();
return lm.generateUniqueLaunchConfigurationNameFrom(baseName);
@@ -636,7 +639,7 @@
protected void createEarProject() {
if(!shouldCopyLibrariesAndTemplates(model))
return;
-
+
earProjectFolder.mkdir();
File earContentsFolder = new File(earProjectFolder, "EarContent"); //$NON-NLS-1$
@@ -652,7 +655,7 @@
} catch (IOException e) {
SeamCorePlugin.getPluginLog().logError(e);
}
-
+
// Fill ear contents
AntCopyUtils.copyFiles(seamHomeFolder, earContentsFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(getJbossEarContent()).dir(seamHomeFolder)));
if (!SeamCorePlugin.getDefault().hasM2Facet(seamWebProject) && shouldCopyLibraries(model)) {
@@ -712,11 +715,11 @@
SeamCorePlugin.getPluginLog().logError(e);
}
}
-
+
protected void configureJBossAppXml() {
// Do nothing special for Seam 1.2
}
-
+
protected boolean shouldCopyLibrariesAndTemplates(IDataModel model){
return model.getBooleanProperty(ISeamFacetDataModelProperties.SEAM_TEMPLATES_AND_LIBRARIES_COPYING);
}
13 years, 10 months
- 1
- 0
JBoss Tools SVN: r41896 - branches/jbosstools-3.3.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-06-12 14:11:57 -0400 (Tue, 12 Jun 2012)
New Revision: 41896
Modified:
branches/jbosstools-3.3.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam23ProjectCreator.java
branches/jbosstools-3.3.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamProjectCreator.java
Log:
https://issues.jboss.org/browse/JBIDE-12160 Seam 2 component.properties is not generated correctly
Modified: branches/jbosstools-3.3.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam23ProjectCreator.java
===================================================================
--- branches/jbosstools-3.3.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam23ProjectCreator.java 2012-06-12 18:09:56 UTC (rev 41895)
+++ branches/jbosstools-3.3.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam23ProjectCreator.java 2012-06-12 18:11:57 UTC (rev 41896)
@@ -11,6 +11,9 @@
package org.jboss.tools.seam.internal.core.project.facet;
import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Properties;
import org.apache.tools.ant.types.FilterSet;
import org.apache.tools.ant.types.FilterSetCollection;
@@ -18,6 +21,7 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
+import org.jboss.tools.seam.core.SeamCorePlugin;
/**
* @author Alexey Kazakov
@@ -67,4 +71,25 @@
Seam23FacetInstallDelegate.copyDBDriverToProject(earProject, model, destFolder);
}
}
+
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.seam.internal.core.project.facet.SeamProjectCreator#createComponentsProperties()
+ */
+ @Override
+ protected void createComponentsProperties() {
+ File seamGenResFolder = new File(ejbProjectFolder, "ejbModule");
+// jndiPattern=java:app/app1-ejb/\#{ejbName}
+ String jndiPattern = "java:app/" + ejbProjectName + "/#{ejbName}";
+ Properties components = new Properties();
+ components.put("jndiPattern", jndiPattern); //$NON-NLS-1$
+ components.put("embeddedEjb", "false"); //$NON-NLS-1$ $NON-NLS-2$
+ File componentsProps = new File(seamGenResFolder, "components.properties"); //$NON-NLS-1$
+ try {
+ componentsProps.createNewFile();
+ components.store(new FileOutputStream(componentsProps), ""); //$NON-NLS-1$
+ } catch (IOException e) {
+ SeamCorePlugin.getPluginLog().logError(e);
+ }
+ }
}
\ No newline at end of file
Modified: branches/jbosstools-3.3.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamProjectCreator.java
===================================================================
--- branches/jbosstools-3.3.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamProjectCreator.java 2012-06-12 18:09:56 UTC (rev 41895)
+++ branches/jbosstools-3.3.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamProjectCreator.java 2012-06-12 18:11:57 UTC (rev 41896)
@@ -126,7 +126,7 @@
private String jbossSeamPath;
private static final Map<String,String> COMPILER_LEVEL_TO_EXEC_ENV = new HashMap<String,String>();
-
+
static
{
COMPILER_LEVEL_TO_EXEC_ENV.put( JavaCore.VERSION_1_3, "J2SE-1.3" ); //$NON-NLS-1$
@@ -150,7 +150,7 @@
earProjectName = model.getStringProperty(ISeamFacetDataModelProperties.SEAM_EAR_PROJECT);
ejbProjectName = model.getStringProperty(ISeamFacetDataModelProperties.SEAM_EJB_PROJECT);
testProjectName = model.getStringProperty(ISeamFacetDataModelProperties.SEAM_TEST_PROJECT);
-
+
seamRuntime = SeamRuntimeManager.getInstance().findRuntimeByName(model.getProperty(ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME).toString());
if(seamRuntime==null) {
throw new RuntimeException("Can't get seam runtime " + model.getProperty(ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME).toString());
@@ -163,7 +163,7 @@
filtersFilterSet = SeamFacetFilterSetFactory.createFiltersFilterSet(model);
seamGenResFolder = new File(seamGenHomeFolder, "resources"); //$NON-NLS-1$
persistenceFile = new File(seamGenResFolder, "META-INF/persistence-" + (SeamFacetAbstractInstallDelegate.isWarConfiguration(model) ? DEV_WAR_PROFILE : DEV_EAR_PROFILE) + ".xml"); //$NON-NLS-1$ //$NON-NLS-2$
-
+
try {
hibernateConsoleLaunchFile = new File(SeamFacetInstallDataModelProvider.getTemplatesFolder(), "hibernatetools/hibernate-console.launch");
} catch (IOException e) {
@@ -274,7 +274,7 @@
});
StringBuffer earJarsStrWar = new StringBuffer();
StringBuffer earJarsStrEjb = new StringBuffer();
-
+
if(earJars != null){
for (File file : earJars) {
earJarsStrWar.append(" ").append(file.getName()).append(" \n");
@@ -293,7 +293,7 @@
FilterSet manifestFilterWar = new FilterSet();
manifestFilterWar.addFilter("earLibs", earJarsStrWar.toString()); //$NON-NLS-1$
manifestFilterColWar.addFilterSet(manifestFilterWar);
-
+
if(shouldCopyLibrariesAndTemplates(model))
AntCopyUtils.copyFileToFolder(new File(SeamFacetInstallDataModelProvider.getTemplatesFolder(), "war/META-INF/MANIFEST.MF"), webMetaInf, manifestFilterColWar, true); //$NON-NLS-1$
@@ -301,7 +301,7 @@
FilterSet manifestFilterEjb = new FilterSet();
manifestFilterEjb.addFilter("earClasspath", earJarsStrEjb.toString()); //$NON-NLS-1$
manifestFilterColEjb.addFilterSet(manifestFilterEjb);
-
+
if(shouldCopyLibrariesAndTemplates(model))
AntCopyUtils.copyFileToFolder(new File(SeamFacetInstallDataModelProvider.getTemplatesFolder(), "ejb/ejbModule/META-INF/MANIFEST.MF"), ejbMetaInf, manifestFilterColEjb, true); //$NON-NLS-1$
} catch (IOException e) {
@@ -559,7 +559,7 @@
protected void createEjbProject() {
if(!shouldCopyLibrariesAndTemplates(model))
return;
-
+
ejbProjectFolder.mkdir();
AntCopyUtils.copyFilesAndFolders(
@@ -579,7 +579,7 @@
new File(ejbProjectFolder, "ejbModule/META-INF/persistence.xml"), //$NON-NLS-1$
viewFilterSetCollection, true);
- SeamFacetAbstractInstallDelegate.createComponentsProperties(new File(ejbProjectFolder, "ejbModule"), earProjectName, false); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ createComponentsProperties();
AntCopyUtils.FileSet ejbSrcResourcesSet = new AntCopyUtils.FileSet(SeamFacetAbstractInstallDelegate.JBOOS_EJB_WEB_INF_CLASSES_SET).dir(seamGenResFolder);
AntCopyUtils.copyFilesAndFolders(
@@ -603,7 +603,6 @@
ejbFilterSet.addFilter("connectionProfile", model.getStringProperty(ISeamFacetDataModelProperties.SEAM_CONNECTION_PROFILE));//$NON-NLS-1$
-
AntCopyUtils.copyFileToFile(
hibernateConsoleLaunchFile,
new File(ejbProjectFolder, getLaunchCfgName(ejbProjectFolder.getName()) + ".launch"), //$NON-NLS-1$
@@ -614,7 +613,11 @@
ejbProjectFolder,
hibernateDialectFilterSet, true);
}
-
+
+ protected void createComponentsProperties() {
+ SeamFacetAbstractInstallDelegate.createComponentsProperties(new File(ejbProjectFolder, "ejbModule"), earProjectName, false); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ }
+
protected String getLaunchCfgName(String baseName){
ILaunchManager lm = DebugPlugin.getDefault().getLaunchManager();
return lm.generateUniqueLaunchConfigurationNameFrom(baseName);
@@ -636,7 +639,7 @@
protected void createEarProject() {
if(!shouldCopyLibrariesAndTemplates(model))
return;
-
+
earProjectFolder.mkdir();
File earContentsFolder = new File(earProjectFolder, "EarContent"); //$NON-NLS-1$
@@ -652,7 +655,7 @@
} catch (IOException e) {
SeamCorePlugin.getPluginLog().logError(e);
}
-
+
// Fill ear contents
AntCopyUtils.copyFiles(seamHomeFolder, earContentsFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(getJbossEarContent()).dir(seamHomeFolder)));
if (!SeamCorePlugin.getDefault().hasM2Facet(seamWebProject) && shouldCopyLibraries(model)) {
@@ -712,11 +715,11 @@
SeamCorePlugin.getPluginLog().logError(e);
}
}
-
+
protected void configureJBossAppXml() {
// Do nothing special for Seam 1.2
}
-
+
protected boolean shouldCopyLibrariesAndTemplates(IDataModel model){
return model.getBooleanProperty(ISeamFacetDataModelProperties.SEAM_TEMPLATES_AND_LIBRARIES_COPYING);
}
13 years, 10 months
- 1
- 0
JBoss Tools SVN: r41895 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-06-12 14:09:56 -0400 (Tue, 12 Jun 2012)
New Revision: 41895
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam23FacetInstallDelegate.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java
Log:
https://issues.jboss.org/browse/JBIDE-12154 Seam 2 war project creation generate old context parameter in web.xml
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam23FacetInstallDelegate.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam23FacetInstallDelegate.java 2012-06-12 18:08:33 UTC (rev 41894)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam23FacetInstallDelegate.java 2012-06-12 18:09:56 UTC (rev 41895)
@@ -39,6 +39,8 @@
*/
public class Seam23FacetInstallDelegate extends Seam2FacetInstallDelegate {
+ private static String RICHFACES_SKIN = "org.richfaces.skin"; //$NON-NLS-1$
+
public static AntCopyUtils.FileSet JBOOS_WAR_WEBINF_SET = new AntCopyUtils.FileSet()
.include("WEB-INF") //$NON-NLS-1$
.include("WEB-INF/pages\\.xml") //$NON-NLS-1$
@@ -167,6 +169,15 @@
return fileSet;
}
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.seam.internal.core.project.facet.Seam2FacetInstallDelegate#getSkinParamName()
+ */
+ @Override
+ protected String getSkinParamName() {
+ return RICHFACES_SKIN;
+ }
+
private static SeamRuntime getSeamRuntime(IDataModel model) {
Object runtimeName = model.getProperty(ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME);
SeamRuntime runtime = SeamRuntimeManager.getInstance().findRuntimeByName(runtimeName.toString());
@@ -202,7 +213,7 @@
} catch (CoreException e) {
SeamCorePlugin.getDefault().logError(e);
}
-
+
IServer server = getServer(model);
if (serverSupportsSingleFileModule(server)) {
ChainedJob dsJob = new ResourceDeployer(project, server, resource.getFullPath().removeFirstSegments(1));
@@ -214,7 +225,7 @@
}
}
}
-
+
private static boolean serverSupportsSingleFileModule(IServer s) {
IRuntimeType rt = s.getServerType().getRuntimeType();
if (ServerUtil.isSupportedModule(rt.getModuleTypes(),
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java 2012-06-12 18:08:33 UTC (rev 41894)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java 2012-06-12 18:09:56 UTC (rev 41895)
@@ -155,7 +155,7 @@
IDataModel model, IProgressMonitor monitor) throws CoreException {
if(!shouldCopyLibrariesAndTemplates(model))
return;
-
+
super.copyFilesToWarProject(project, fv, model, monitor);
final File droolsLibFolder = new File(seamHomePath, DROOLS_LIB_SEAM_RELATED_PATH);
if(isWarConfiguration(model)) {
@@ -186,7 +186,7 @@
protected void fillEarContents(IProject project, IDataModel model) {
if(!shouldCopyLibrariesAndTemplates(model))
return;
-
+
if (!SeamCorePlugin.getDefault().hasM2Facet(project)) {
final File droolsLibFolder = new File(seamHomePath, DROOLS_LIB_SEAM_RELATED_PATH);
AntCopyUtils.copyFiles(seamHomeFolder, earContentsFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_EAR_CONTENT).dir(seamHomeFolder)), false);
@@ -289,6 +289,10 @@
}
}
+ protected String getSkinParamName() {
+ return ORG_RICHFACES_SKIN;
+ }
+
/*
* (non-Javadoc)
* @see org.jboss.tools.seam.internal.core.project.facet.SeamFacetAbstractInstallDelegate#configure(org.eclipse.jst.javaee.web.WebApp)
@@ -296,13 +300,13 @@
@Override
protected void configure(WebApp webApp, IProject project) {
JSFVersion jsfVersion = JSFVersion.valueOfProject(project);
-
+
if (JSFVersion.V2_0.compareTo(jsfVersion) > 0) {
createOrUpdateContextParam(webApp, ORG_JBOSS_JBOSSFACES_JSF_CONFIG_NAME,
MOJARRA_1_2);
}
// Ajax4jsf
- createOrUpdateContextParam(webApp, ORG_RICHFACES_SKIN,
+ createOrUpdateContextParam(webApp, getSkinParamName(),
ORG_RICHFACES_SKIN_VALUE);
// Seam
createOrUpdateListener(webApp,
13 years, 10 months
- 1
- 0
JBoss Tools SVN: r41894 - branches/jbosstools-3.3.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-06-12 14:08:33 -0400 (Tue, 12 Jun 2012)
New Revision: 41894
Modified:
branches/jbosstools-3.3.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam23FacetInstallDelegate.java
branches/jbosstools-3.3.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java
Log:
https://issues.jboss.org/browse/JBIDE-12154 Seam 2 war project creation generate old context parameter in web.xml
Modified: branches/jbosstools-3.3.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam23FacetInstallDelegate.java
===================================================================
--- branches/jbosstools-3.3.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam23FacetInstallDelegate.java 2012-06-12 15:51:43 UTC (rev 41893)
+++ branches/jbosstools-3.3.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam23FacetInstallDelegate.java 2012-06-12 18:08:33 UTC (rev 41894)
@@ -39,6 +39,8 @@
*/
public class Seam23FacetInstallDelegate extends Seam2FacetInstallDelegate {
+ private static String RICHFACES_SKIN = "org.richfaces.skin"; //$NON-NLS-1$
+
public static AntCopyUtils.FileSet JBOOS_WAR_WEBINF_SET = new AntCopyUtils.FileSet()
.include("WEB-INF") //$NON-NLS-1$
.include("WEB-INF/pages\\.xml") //$NON-NLS-1$
@@ -167,6 +169,15 @@
return fileSet;
}
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.seam.internal.core.project.facet.Seam2FacetInstallDelegate#getSkinParamName()
+ */
+ @Override
+ protected String getSkinParamName() {
+ return RICHFACES_SKIN;
+ }
+
private static SeamRuntime getSeamRuntime(IDataModel model) {
Object runtimeName = model.getProperty(ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME);
SeamRuntime runtime = SeamRuntimeManager.getInstance().findRuntimeByName(runtimeName.toString());
@@ -202,7 +213,7 @@
} catch (CoreException e) {
SeamCorePlugin.getDefault().logError(e);
}
-
+
IServer server = getServer(model);
if (serverSupportsSingleFileModule(server)) {
ChainedJob dsJob = new ResourceDeployer(project, server, resource.getFullPath().removeFirstSegments(1));
@@ -214,7 +225,7 @@
}
}
}
-
+
private static boolean serverSupportsSingleFileModule(IServer s) {
IRuntimeType rt = s.getServerType().getRuntimeType();
if (ServerUtil.isSupportedModule(rt.getModuleTypes(),
Modified: branches/jbosstools-3.3.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java
===================================================================
--- branches/jbosstools-3.3.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java 2012-06-12 15:51:43 UTC (rev 41893)
+++ branches/jbosstools-3.3.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java 2012-06-12 18:08:33 UTC (rev 41894)
@@ -155,7 +155,7 @@
IDataModel model, IProgressMonitor monitor) throws CoreException {
if(!shouldCopyLibrariesAndTemplates(model))
return;
-
+
super.copyFilesToWarProject(project, fv, model, monitor);
final File droolsLibFolder = new File(seamHomePath, DROOLS_LIB_SEAM_RELATED_PATH);
if(isWarConfiguration(model)) {
@@ -186,7 +186,7 @@
protected void fillEarContents(IProject project, IDataModel model) {
if(!shouldCopyLibrariesAndTemplates(model))
return;
-
+
if (!SeamCorePlugin.getDefault().hasM2Facet(project)) {
final File droolsLibFolder = new File(seamHomePath, DROOLS_LIB_SEAM_RELATED_PATH);
AntCopyUtils.copyFiles(seamHomeFolder, earContentsFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_EAR_CONTENT).dir(seamHomeFolder)), false);
@@ -289,6 +289,10 @@
}
}
+ protected String getSkinParamName() {
+ return ORG_RICHFACES_SKIN;
+ }
+
/*
* (non-Javadoc)
* @see org.jboss.tools.seam.internal.core.project.facet.SeamFacetAbstractInstallDelegate#configure(org.eclipse.jst.javaee.web.WebApp)
@@ -296,13 +300,13 @@
@Override
protected void configure(WebApp webApp, IProject project) {
JSFVersion jsfVersion = JSFVersion.valueOfProject(project);
-
+
if (JSFVersion.V2_0.compareTo(jsfVersion) > 0) {
createOrUpdateContextParam(webApp, ORG_JBOSS_JBOSSFACES_JSF_CONFIG_NAME,
MOJARRA_1_2);
}
// Ajax4jsf
- createOrUpdateContextParam(webApp, ORG_RICHFACES_SKIN,
+ createOrUpdateContextParam(webApp, getSkinParamName(),
ORG_RICHFACES_SKIN_VALUE);
// Seam
createOrUpdateListener(webApp,
13 years, 10 months
- 1
- 0
JBoss Tools SVN: r41893 - trunk/requirements/jbeap-6.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-06-12 11:51:43 -0400 (Tue, 12 Jun 2012)
New Revision: 41893
Modified:
trunk/requirements/jbeap-6/build.properties
Log:
use JBEAP-6.0.0 instead of JBEAP-6.0.0-CR1; MD5SUM is the same
Modified: trunk/requirements/jbeap-6/build.properties
===================================================================
--- trunk/requirements/jbeap-6/build.properties 2012-06-12 15:48:46 UTC (rev 41892)
+++ trunk/requirements/jbeap-6/build.properties 2012-06-12 15:51:43 UTC (rev 41893)
@@ -1,9 +1,10 @@
-# see also ../seamfp/build.properties; use latest noauth zip here
+# KEEP THIS FILE IN SYNCH WITH EQUIVALENT FILE IN devstudio SVN TREE
# This property used to override URI outside the build
# It is usefull to make build work on build server vithout VPN access
-jbeap60.build.uri=http://download.devel.redhat.com/devel/candidates/JBEAP/JBEAP-6.0.0-CR1/
+jbeap60.build.uri=http://download.devel.redhat.com/devel/candidates/JBEAP/JBEAP-6.0.0/
build.uri=${jbeap60.build.uri}
-build.archive=jboss-eap-6.0.0.CR1.zip
+jbeap60.build.archive=jboss-eap-6.0.0.zip
+build.archive=${jbeap60.build.archive}
md5=ca0e20c5523281233888c296689b7172
13 years, 10 months
- 1
- 0