JBoss Tools SVN: r24789 - branches/jbosstools-3.2.0.M2/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-09-07 23:10:58 -0400 (Tue, 07 Sep 2010)
New Revision: 24789
Modified:
branches/jbosstools-3.2.0.M2/build/publish.sh
Log:
https://jira.jboss.org/browse/JBIDE-6956 replace jbosstools-3.2.0.M2 with 3.2.0.M2 for dgolovin
Modified: branches/jbosstools-3.2.0.M2/build/publish.sh
===================================================================
--- branches/jbosstools-3.2.0.M2/build/publish.sh 2010-09-08 03:10:50 UTC (rev 24788)
+++ branches/jbosstools-3.2.0.M2/build/publish.sh 2010-09-08 03:10:58 UTC (rev 24789)
@@ -104,7 +104,7 @@
popd
# collect component zips from upstream aggregated build jobs
-if [[ ${JOBNAMEREDUX} != ${JOB_NAME} ]] && [[ -d ${WORKSPACE}/sources/aggregate/site/zips ]]; then
+if [[ ${JOB_NAME/.aggregate} != ${JOB_NAME} ]] && [[ -d ${WORKSPACE}/sources/aggregate/site/zips ]]; then
mkdir -p ${STAGINGDIR}/components
for z in $(find ${WORKSPACE}/sources/aggregate/site/zips -name "*Update*.zip") $(find ${WORKSPACE}/sources/aggregate/site/zips -name "*Sources*.zip"); do
mv $z ${STAGINGDIR}/components
@@ -125,7 +125,7 @@
if [[ ${RELEASE} == "Yes" ]]; then
mkdir -p ${STAGINGDIR}/logs
ANT_PARAMS="-v -DZIPSUFFIX=${ZIPSUFFIX} -DJOB_NAME=${JOB_NAME} -Dinput.dir=${STAGINGDIR} -Doutput.dir=${STAGINGDIR}/logs -DWORKSPACE=${WORKSPACE}"
- if [[ ${JOBNAMEREDUX} != ${JOB_NAME} ]]; then # reuse snippet from upstream build
+ if [[ ${JOB_NAME/.aggregate} != ${JOB_NAME} ]]; then # reuse snippet from upstream build
ANT_PARAMS="${ANT_PARAMS} -Dtemplate.file=http://download.jboss.org/jbosstools/builds/nightly/3.2.helios/${JOB_NAME/.aggregate/.continuous}/logs/download-snippet.txt"
fi
for buildxml in ${WORKSPACE}/build/results/build.xml ${WORKSPACE}/sources/build/results/build.xml ${WORKSPACE}/sources/results/build.xml; do
@@ -168,7 +168,7 @@
if [[ -d ${STAGINGDIR} ]]; then
# if an aggregate build, put output elsewhere on disk
- if [[ ${JOBNAMEREDUX} != ${JOB_NAME} ]]; then
+ if [[ ${JOB_NAME/.aggregate} != ${JOB_NAME} ]]; then
echo "<meta http-equiv=\"refresh\" content=\"0;url=${BUILD_ID}-H${BUILD_NUMBER}/\">" > /tmp/latestBuild.html
if [[ $1 == "trunk" ]]; then
date; rsync -arzq --delete ${STAGINGDIR}/* $DESTINATION/builds/nightly/trunk/${BUILD_ID}-H${BUILD_NUMBER}/
@@ -190,7 +190,7 @@
fi
# extra publish step for aggregate update sites ONLY
- if [[ ${JOBNAMEREDUX} != ${JOB_NAME} ]]; then
+ if [[ ${JOB_NAME/.aggregate} != ${JOB_NAME} ]]; then
if [[ $1 == "trunk" ]]; then
date; rsync -arzq --delete ${STAGINGDIR}/all/repo/* $DESTINATION/updates/nightly/trunk/
else
15 years, 7 months
JBoss Tools SVN: r24788 - trunk/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-09-07 23:10:50 -0400 (Tue, 07 Sep 2010)
New Revision: 24788
Modified:
trunk/build/publish.sh
Log:
https://jira.jboss.org/browse/JBIDE-6956 replace jbosstools-3.2.0.M2 with 3.2.0.M2 for dgolovin
Modified: trunk/build/publish.sh
===================================================================
--- trunk/build/publish.sh 2010-09-08 03:09:28 UTC (rev 24787)
+++ trunk/build/publish.sh 2010-09-08 03:10:50 UTC (rev 24788)
@@ -104,7 +104,7 @@
popd
# collect component zips from upstream aggregated build jobs
-if [[ ${JOBNAMEREDUX} != ${JOB_NAME} ]] && [[ -d ${WORKSPACE}/sources/aggregate/site/zips ]]; then
+if [[ ${JOB_NAME/.aggregate} != ${JOB_NAME} ]] && [[ -d ${WORKSPACE}/sources/aggregate/site/zips ]]; then
mkdir -p ${STAGINGDIR}/components
for z in $(find ${WORKSPACE}/sources/aggregate/site/zips -name "*Update*.zip") $(find ${WORKSPACE}/sources/aggregate/site/zips -name "*Sources*.zip"); do
mv $z ${STAGINGDIR}/components
@@ -125,7 +125,7 @@
if [[ ${RELEASE} == "Yes" ]]; then
mkdir -p ${STAGINGDIR}/logs
ANT_PARAMS="-v -DZIPSUFFIX=${ZIPSUFFIX} -DJOB_NAME=${JOB_NAME} -Dinput.dir=${STAGINGDIR} -Doutput.dir=${STAGINGDIR}/logs -DWORKSPACE=${WORKSPACE}"
- if [[ ${JOBNAMEREDUX} != ${JOB_NAME} ]]; then # reuse snippet from upstream build
+ if [[ ${JOB_NAME/.aggregate} != ${JOB_NAME} ]]; then # reuse snippet from upstream build
ANT_PARAMS="${ANT_PARAMS} -Dtemplate.file=http://download.jboss.org/jbosstools/builds/nightly/3.2.helios/${JOB_NAME/.aggregate/.continuous}/logs/download-snippet.txt"
fi
for buildxml in ${WORKSPACE}/build/results/build.xml ${WORKSPACE}/sources/build/results/build.xml ${WORKSPACE}/sources/results/build.xml; do
@@ -168,7 +168,7 @@
if [[ -d ${STAGINGDIR} ]]; then
# if an aggregate build, put output elsewhere on disk
- if [[ ${JOBNAMEREDUX} != ${JOB_NAME} ]]; then
+ if [[ ${JOB_NAME/.aggregate} != ${JOB_NAME} ]]; then
echo "<meta http-equiv=\"refresh\" content=\"0;url=${BUILD_ID}-H${BUILD_NUMBER}/\">" > /tmp/latestBuild.html
if [[ $1 == "trunk" ]]; then
date; rsync -arzq --delete ${STAGINGDIR}/* $DESTINATION/builds/nightly/trunk/${BUILD_ID}-H${BUILD_NUMBER}/
@@ -190,7 +190,7 @@
fi
# extra publish step for aggregate update sites ONLY
- if [[ ${JOBNAMEREDUX} != ${JOB_NAME} ]]; then
+ if [[ ${JOB_NAME/.aggregate} != ${JOB_NAME} ]]; then
if [[ $1 == "trunk" ]]; then
date; rsync -arzq --delete ${STAGINGDIR}/all/repo/* $DESTINATION/updates/nightly/trunk/
else
15 years, 7 months
JBoss Tools SVN: r24787 - trunk/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-09-07 23:09:28 -0400 (Tue, 07 Sep 2010)
New Revision: 24787
Modified:
trunk/build/publish.sh
Log:
https://jira.jboss.org/browse/JBIDE-6956 replace jbosstools-3.2.0.M2 with 3.2.0.M2 for dgolovin
Modified: trunk/build/publish.sh
===================================================================
--- trunk/build/publish.sh 2010-09-08 03:09:21 UTC (rev 24786)
+++ trunk/build/publish.sh 2010-09-08 03:09:28 UTC (rev 24787)
@@ -8,6 +8,9 @@
# where to create the stuff to publish
STAGINGDIR=${WORKSPACE}/results/${JOB_NAME}
+# https://jira.jboss.org/browse/JBIDE-6956 "jbosstools-3.2.0.M2" is too verbose, use "3.2.0.M2" instead
+JOBNAMEREDUX=${JOB_NAME/.aggregate}; JOBNAMEREDUX=${JOBNAMEREDUX/jbosstools-}
+
# releases get named differently than snapshots
if [[ ${RELEASE} == "Yes" ]]; then
ZIPSUFFIX="${BUILD_ID}-H${BUILD_NUMBER}"
@@ -101,7 +104,7 @@
popd
# collect component zips from upstream aggregated build jobs
-if [[ ${JOB_NAME/.aggregate} != ${JOB_NAME} ]] && [[ -d ${WORKSPACE}/sources/aggregate/site/zips ]]; then
+if [[ ${JOBNAMEREDUX} != ${JOB_NAME} ]] && [[ -d ${WORKSPACE}/sources/aggregate/site/zips ]]; then
mkdir -p ${STAGINGDIR}/components
for z in $(find ${WORKSPACE}/sources/aggregate/site/zips -name "*Update*.zip") $(find ${WORKSPACE}/sources/aggregate/site/zips -name "*Sources*.zip"); do
mv $z ${STAGINGDIR}/components
@@ -122,7 +125,7 @@
if [[ ${RELEASE} == "Yes" ]]; then
mkdir -p ${STAGINGDIR}/logs
ANT_PARAMS="-v -DZIPSUFFIX=${ZIPSUFFIX} -DJOB_NAME=${JOB_NAME} -Dinput.dir=${STAGINGDIR} -Doutput.dir=${STAGINGDIR}/logs -DWORKSPACE=${WORKSPACE}"
- if [[ ${JOB_NAME/.aggregate} != ${JOB_NAME} ]]; then # reuse snippet from upstream build
+ if [[ ${JOBNAMEREDUX} != ${JOB_NAME} ]]; then # reuse snippet from upstream build
ANT_PARAMS="${ANT_PARAMS} -Dtemplate.file=http://download.jboss.org/jbosstools/builds/nightly/3.2.helios/${JOB_NAME/.aggregate/.continuous}/logs/download-snippet.txt"
fi
for buildxml in ${WORKSPACE}/build/results/build.xml ${WORKSPACE}/sources/build/results/build.xml ${WORKSPACE}/sources/results/build.xml; do
@@ -165,14 +168,14 @@
if [[ -d ${STAGINGDIR} ]]; then
# if an aggregate build, put output elsewhere on disk
- if [[ ${JOB_NAME/.aggregate} != ${JOB_NAME} ]]; then
+ if [[ ${JOBNAMEREDUX} != ${JOB_NAME} ]]; then
echo "<meta http-equiv=\"refresh\" content=\"0;url=${BUILD_ID}-H${BUILD_NUMBER}/\">" > /tmp/latestBuild.html
if [[ $1 == "trunk" ]]; then
date; rsync -arzq --delete ${STAGINGDIR}/* $DESTINATION/builds/nightly/trunk/${BUILD_ID}-H${BUILD_NUMBER}/
date; rsync -arzq --delete /tmp/latestBuild.html $DESTINATION/builds/nightly/trunk/
else
- date; rsync -arzq --delete /tmp/latestBuild.html $DESTINATION/builds/nightly/${JOB_NAME/.aggregate}/
- date; rsync -arzq --delete ${STAGINGDIR}/* $DESTINATION/builds/nightly/${JOB_NAME/.aggregate}/${BUILD_ID}-H${BUILD_NUMBER}/
+ date; rsync -arzq --delete /tmp/latestBuild.html $DESTINATION/builds/nightly/${JOBNAMEREDUX}/
+ date; rsync -arzq --delete ${STAGINGDIR}/* $DESTINATION/builds/nightly/${JOBNAMEREDUX}/${BUILD_ID}-H${BUILD_NUMBER}/
fi
rm -f /tmp/latestBuild.html
else
@@ -187,11 +190,11 @@
fi
# extra publish step for aggregate update sites ONLY
- if [[ ${JOB_NAME/.aggregate} != ${JOB_NAME} ]]; then
+ if [[ ${JOBNAMEREDUX} != ${JOB_NAME} ]]; then
if [[ $1 == "trunk" ]]; then
date; rsync -arzq --delete ${STAGINGDIR}/all/repo/* $DESTINATION/updates/nightly/trunk/
else
- date; rsync -arzq --delete ${STAGINGDIR}/all/repo/* $DESTINATION/updates/nightly/${JOB_NAME/.aggregate}/
+ date; rsync -arzq --delete ${STAGINGDIR}/all/repo/* $DESTINATION/updates/nightly/${JOBNAMEREDUX}/
fi
fi
fi
15 years, 7 months
JBoss Tools SVN: r24786 - branches/jbosstools-3.2.0.M2/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-09-07 23:09:21 -0400 (Tue, 07 Sep 2010)
New Revision: 24786
Modified:
branches/jbosstools-3.2.0.M2/build/publish.sh
Log:
https://jira.jboss.org/browse/JBIDE-6956 replace jbosstools-3.2.0.M2 with 3.2.0.M2 for dgolovin
Modified: branches/jbosstools-3.2.0.M2/build/publish.sh
===================================================================
--- branches/jbosstools-3.2.0.M2/build/publish.sh 2010-09-08 02:28:57 UTC (rev 24785)
+++ branches/jbosstools-3.2.0.M2/build/publish.sh 2010-09-08 03:09:21 UTC (rev 24786)
@@ -8,6 +8,9 @@
# where to create the stuff to publish
STAGINGDIR=${WORKSPACE}/results/${JOB_NAME}
+# https://jira.jboss.org/browse/JBIDE-6956 "jbosstools-3.2.0.M2" is too verbose, use "3.2.0.M2" instead
+JOBNAMEREDUX=${JOB_NAME/.aggregate}; JOBNAMEREDUX=${JOBNAMEREDUX/jbosstools-}
+
# releases get named differently than snapshots
if [[ ${RELEASE} == "Yes" ]]; then
ZIPSUFFIX="${BUILD_ID}-H${BUILD_NUMBER}"
@@ -101,7 +104,7 @@
popd
# collect component zips from upstream aggregated build jobs
-if [[ ${JOB_NAME/.aggregate} != ${JOB_NAME} ]] && [[ -d ${WORKSPACE}/sources/aggregate/site/zips ]]; then
+if [[ ${JOBNAMEREDUX} != ${JOB_NAME} ]] && [[ -d ${WORKSPACE}/sources/aggregate/site/zips ]]; then
mkdir -p ${STAGINGDIR}/components
for z in $(find ${WORKSPACE}/sources/aggregate/site/zips -name "*Update*.zip") $(find ${WORKSPACE}/sources/aggregate/site/zips -name "*Sources*.zip"); do
mv $z ${STAGINGDIR}/components
@@ -122,7 +125,7 @@
if [[ ${RELEASE} == "Yes" ]]; then
mkdir -p ${STAGINGDIR}/logs
ANT_PARAMS="-v -DZIPSUFFIX=${ZIPSUFFIX} -DJOB_NAME=${JOB_NAME} -Dinput.dir=${STAGINGDIR} -Doutput.dir=${STAGINGDIR}/logs -DWORKSPACE=${WORKSPACE}"
- if [[ ${JOB_NAME/.aggregate} != ${JOB_NAME} ]]; then # reuse snippet from upstream build
+ if [[ ${JOBNAMEREDUX} != ${JOB_NAME} ]]; then # reuse snippet from upstream build
ANT_PARAMS="${ANT_PARAMS} -Dtemplate.file=http://download.jboss.org/jbosstools/builds/nightly/3.2.helios/${JOB_NAME/.aggregate/.continuous}/logs/download-snippet.txt"
fi
for buildxml in ${WORKSPACE}/build/results/build.xml ${WORKSPACE}/sources/build/results/build.xml ${WORKSPACE}/sources/results/build.xml; do
@@ -165,14 +168,14 @@
if [[ -d ${STAGINGDIR} ]]; then
# if an aggregate build, put output elsewhere on disk
- if [[ ${JOB_NAME/.aggregate} != ${JOB_NAME} ]]; then
+ if [[ ${JOBNAMEREDUX} != ${JOB_NAME} ]]; then
echo "<meta http-equiv=\"refresh\" content=\"0;url=${BUILD_ID}-H${BUILD_NUMBER}/\">" > /tmp/latestBuild.html
if [[ $1 == "trunk" ]]; then
date; rsync -arzq --delete ${STAGINGDIR}/* $DESTINATION/builds/nightly/trunk/${BUILD_ID}-H${BUILD_NUMBER}/
date; rsync -arzq --delete /tmp/latestBuild.html $DESTINATION/builds/nightly/trunk/
else
- date; rsync -arzq --delete /tmp/latestBuild.html $DESTINATION/builds/nightly/${JOB_NAME/.aggregate}/
- date; rsync -arzq --delete ${STAGINGDIR}/* $DESTINATION/builds/nightly/${JOB_NAME/.aggregate}/${BUILD_ID}-H${BUILD_NUMBER}/
+ date; rsync -arzq --delete /tmp/latestBuild.html $DESTINATION/builds/nightly/${JOBNAMEREDUX}/
+ date; rsync -arzq --delete ${STAGINGDIR}/* $DESTINATION/builds/nightly/${JOBNAMEREDUX}/${BUILD_ID}-H${BUILD_NUMBER}/
fi
rm -f /tmp/latestBuild.html
else
@@ -187,11 +190,11 @@
fi
# extra publish step for aggregate update sites ONLY
- if [[ ${JOB_NAME/.aggregate} != ${JOB_NAME} ]]; then
+ if [[ ${JOBNAMEREDUX} != ${JOB_NAME} ]]; then
if [[ $1 == "trunk" ]]; then
date; rsync -arzq --delete ${STAGINGDIR}/all/repo/* $DESTINATION/updates/nightly/trunk/
else
- date; rsync -arzq --delete ${STAGINGDIR}/all/repo/* $DESTINATION/updates/nightly/${JOB_NAME/.aggregate}/
+ date; rsync -arzq --delete ${STAGINGDIR}/all/repo/* $DESTINATION/updates/nightly/${JOBNAMEREDUX}/
fi
fi
fi
15 years, 7 months
JBoss Tools SVN: r24785 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-09-07 22:28:57 -0400 (Tue, 07 Sep 2010)
New Revision: 24785
Modified:
trunk/build/target-platform/e36-wtp32.target
Log:
reversion xulrunner and xpcom features in target platform
Modified: trunk/build/target-platform/e36-wtp32.target
===================================================================
--- trunk/build/target-platform/e36-wtp32.target 2010-09-08 00:48:33 UTC (rev 24784)
+++ trunk/build/target-platform/e36-wtp32.target 2010-09-08 02:28:57 UTC (rev 24785)
@@ -35,8 +35,8 @@
<repository location="http://download.jboss.org/jbosstools/updates/requirements/xulrunner-1.9.2/"/>
</location> -->
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<unit id="org.mozilla.xulrunner.feature.feature.group" version="1.9.1.2"/>
-<unit id="org.mozilla.xpcom.feature.feature.group" version="1.9.1.2a"/>
+<unit id="org.mozilla.xulrunner.feature.feature.group" version="1.9.12"/>
+<unit id="org.mozilla.xpcom.feature.feature.group" version="1.9.12"/>
<repository location="http://download.jboss.org/jbosstools/updates/requirements/xulrunner-1.9.1.2/"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
@@ -176,6 +176,8 @@
<feature id="org.drools.eclipse.feature" />
<feature id="org.drools.eclipse.task.feature" />
<feature id="org.guvnor.tools.feature" />
+<feature id="org.mozilla.xulrunner.feature" />
+<feature id="org.mozilla.xpcom.feature" />
</includeBundles>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
</target>
15 years, 7 months
JBoss Tools SVN: r24784 - workspace/dgolovin/presentations.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2010-09-07 20:48:33 -0400 (Tue, 07 Sep 2010)
New Revision: 24784
Added:
workspace/dgolovin/presentations/tycho-build.odp
Log:
tycho build presentation (haven't finished yet)
Added: workspace/dgolovin/presentations/tycho-build.odp
===================================================================
(Binary files differ)
Property changes on: workspace/dgolovin/presentations/tycho-build.odp
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
15 years, 7 months
JBoss Tools SVN: r24782 - branches/jbosstools-3.2.0.M2/tests/features/org.jboss.tools.test.sdk.feature.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2010-09-07 19:59:51 -0400 (Tue, 07 Sep 2010)
New Revision: 24782
Modified:
branches/jbosstools-3.2.0.M2/tests/features/org.jboss.tools.test.sdk.feature/feature.xml
Log:
remove drools tests from feature tests/features/org.jboss.tools.test.sdk.feature to fix compilation 4.0.0.M2 build error
http://hudson.qa.jboss.com/hudson/view/DevStudio/job/devstudio-nightly-4....
[java] generateScript:
[java] [eclipse.buildScript] Some inter-plug-in dependencies have not been satisfied.
[java] [eclipse.buildScript] Bundle org.maven.ide.eclipse.tests.common:
[java] [eclipse.buildScript] Another singleton version selected: org.maven.ide.eclipse.tests.common_0.10.2.20100623-1649
[java] [eclipse.buildScript] Bundle org.eclipse.cdt.mylyn.ui:
[java] [eclipse.buildScript] Missing required plug-in org.eclipse.cdt.core_5.0.0.
[java] [eclipse.buildScript] Missing required plug-in org.eclipse.cdt.ui_5.0.0.
[java] [eclipse.buildScript] Bundle org.maven.ide.eclipse.subclipse:
[java] [eclipse.buildScript] Missing required plug-in org.tigris.subversion.subclipse.core_0.0.0.
[java] [eclipse.buildScript] Missing required plug-in org.tigris.subversion.subclipse.ui_0.0.0.
[java] [eclipse.buildScript] Bundle org.eclipse.swtbot.eclipse.junit4.headless:
[java] [eclipse.buildScript] Another singleton version selected: org.eclipse.swtbot.eclipse.junit4.headless_2.0.0.595-dev-e36
[java]
[java] init:
[java]
[java] generateScript:
[java] [eclipse.buildScript] Some inter-plug-in dependencies have not been satisfied.
[java] [eclipse.buildScript] Bundle org.maven.ide.eclipse.tests.common:
[java] [eclipse.buildScript] Another singleton version selected: org.maven.ide.eclipse.tests.common_0.10.2.20100623-1649
[java] [eclipse.buildScript] Bundle org.eclipse.cdt.mylyn.ui:
[java] [eclipse.buildScript] Missing required plug-in org.eclipse.cdt.core_5.0.0.
[java] [eclipse.buildScript] Missing required plug-in org.eclipse.cdt.ui_5.0.0.
[java] [eclipse.buildScript] Bundle org.maven.ide.eclipse.subclipse:
[java] [eclipse.buildScript] Missing required plug-in org.tigris.subversion.subclipse.core_0.0.0.
[java] [eclipse.buildScript] Missing required plug-in org.tigris.subversion.subclipse.ui_0.0.0.
[java] [eclipse.buildScript] Bundle org.eclipse.swtbot.eclipse.junit4.headless:
[java] [eclipse.buildScript] Another singleton version selected: org.eclipse.swtbot.eclipse.junit4.headless_2.0.0.595-dev-e36
[echo] error-code=${error-code}
[mkdir] Created dir: /qa/hudson_ws/workspace/devstudio-nightly-4.0.0.M2/jbds-build/4.0.0.M2/201009071722/tests/test-results
[echo] Building jbdevstudio with build type 'update-site'
update-site:
stable:
build.site:
[mkdir] Created dir: /qa/hudson_ws/workspace/devstudio-nightly-4.0.0.M2/jbds-build/site/eclipse
BUILD FAILED
/qa/hudson_ws/workspace/devstudio-nightly-4.0.0.M2/org.jboss.ide.eclipse.releng/builders/buildRelease.xml:29: The following error occurred while executing this line:
/qa/hudson_ws/workspace/devstudio-nightly-4.0.0.M2/org.jboss.ide.eclipse.releng/builders/build.xml:88: The following error occurred while executing this line:
/qa/hudson_ws/workspace/devstudio-nightly-4.0.0.M2/org.jboss.ide.eclipse.releng/builders/build.xml:27: The following error occurred while executing this line:
/qa/hudson_ws/workspace/devstudio-nightly-4.0.0.M2/org.jboss.ide.eclipse.releng/builders/build.xml:39: The following error occurred while executing this line:
/qa/hudson_ws/workspace/devstudio-nightly-4.0.0.M2/org.jboss.ide.eclipse.releng/builders/product/productBuild.xml:106: The following error occurred while executing this line:
/qa/hudson_ws/workspace/devstudio-nightly-4.0.0.M2/org.jboss.ide.eclipse.releng/builders/product/productBuild.xml:169: The following error occurred while executing this line:
/qa/hudson_ws/workspace/devstudio-nightly-4.0.0.M2/org.jboss.ide.eclipse.releng/builders/product/buildSite.xml:26: The following error occurred while executing this line:
/qa/hudson_ws/workspace/devstudio-nightly-4.0.0.M2/org.jboss.ide.eclipse.releng/builders/product/buildSite.xml:100: /qa/hudson_ws/workspace/devstudio-nightly-4.0.0.M2/jbds-build/4.0.0.M2/201009071722/all not found.
Modified: branches/jbosstools-3.2.0.M2/tests/features/org.jboss.tools.test.sdk.feature/feature.xml
===================================================================
--- branches/jbosstools-3.2.0.M2/tests/features/org.jboss.tools.test.sdk.feature/feature.xml 2010-09-07 23:12:44 UTC (rev 24781)
+++ branches/jbosstools-3.2.0.M2/tests/features/org.jboss.tools.test.sdk.feature/feature.xml 2010-09-07 23:59:51 UTC (rev 24782)
@@ -338,10 +338,4 @@
install-size="0"
version="0.0.0"/>
- <plugin
- id="org.jboss.tools.drools.ui.bot.test"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
</feature>
15 years, 7 months
JBoss Tools SVN: r24781 - in trunk/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime: bean and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2010-09-07 19:12:44 -0400 (Tue, 07 Sep 2010)
New Revision: 24781
Added:
trunk/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/preferences/RuntimeDialog.java
Modified:
trunk/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/JBossRuntimeLocator.java
trunk/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/ServerDefinition.java
trunk/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/bean/ServerType.java
trunk/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/preferences/RuntimePreferencePage.java
Log:
https://jira.jboss.org/browse/JBIDE-6913 Jboss Runtime recognition - improvements
Modified: trunk/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/JBossRuntimeLocator.java
===================================================================
--- trunk/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/JBossRuntimeLocator.java 2010-09-07 18:26:44 UTC (rev 24780)
+++ trunk/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/JBossRuntimeLocator.java 2010-09-07 23:12:44 UTC (rev 24781)
@@ -26,7 +26,7 @@
import org.jboss.tools.runtime.bean.ServerBeanLoader;
import org.jboss.tools.runtime.bean.ServerType;
-public class JBossRuntimeLocator extends RuntimeLocatorDelegate {
+public class JBossRuntimeLocator {
public static final String JBPM3 = "jBPM3";
@@ -36,24 +36,26 @@
public JBossRuntimeLocator() {
}
+
+ public List<ServerDefinition> searchForRuntimes(String path, IProgressMonitor monitor) {
+ return searchForRuntimes(new Path(path), monitor);
+ }
- @Override
- public void searchForRuntimes(IPath path, IRuntimeSearchListener listener,
- IProgressMonitor monitor) {
+ public List<ServerDefinition> searchForRuntimes(IPath path, IProgressMonitor monitor) {
ServerBeanLoader loader = new ServerBeanLoader();
List<ServerDefinition> serverDefinitions = new ArrayList<ServerDefinition>();
- searchForRuntimes(serverDefinitions, path, loader, 4, monitor);
- JBossRuntimeStartup runtimeStartup = new JBossRuntimeStartup();
- runtimeStartup.initializeRuntimes(serverDefinitions);
+ return searchForRuntimes(serverDefinitions, path, loader, 4, monitor);
}
- public void searchForRuntimes(String path, IProgressMonitor monitor) {
- searchForRuntimes(new Path(path), null, monitor);
- }
-
- private void searchForRuntimes(List<ServerDefinition> serverDefinitions, IPath path, ServerBeanLoader loader, int depth, IProgressMonitor monitor) {
+ private List<ServerDefinition> searchForRuntimes(List<ServerDefinition> serverDefinitions, IPath path, ServerBeanLoader loader, int depth, IProgressMonitor monitor) {
+ if (monitor.isCanceled()) {
+ return serverDefinitions;
+ }
File[] children = null;
if (path != null) {
+ monitor.setTaskName("Searching " + path.toOSString());
+ }
+ if (path != null) {
File root = path.toFile();
ServerBean serverBean = loader.loadFromLocation(root);
@@ -106,17 +108,16 @@
children = File.listRoots();
}
if (depth == 0) {
- return;
+ return serverDefinitions;
}
if( children != null ) {
- monitor.beginTask("Searching for JBoss runtime...", children.length); //$NON-NLS-1$
for( int i = 0; i < children.length; i++ ) {
if( children[i].isDirectory()) {
searchForRuntimes(serverDefinitions, new Path(children[i].getAbsolutePath()), loader, --depth, monitor);
}
}
}
- monitor.done();
+ return serverDefinitions;
}
/**
Modified: trunk/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/ServerDefinition.java
===================================================================
--- trunk/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/ServerDefinition.java 2010-09-07 18:26:44 UTC (rev 24780)
+++ trunk/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/ServerDefinition.java 2010-09-07 23:12:44 UTC (rev 24781)
@@ -24,6 +24,7 @@
private String version;
private String type;
private File location;
+ private boolean enabled = true;
public ServerDefinition(String name, String version, String type,
File location) {
@@ -118,5 +119,13 @@
return "ServerDefinition [name=" + name + ", version=" + version
+ ", type=" + type + ", location=" + location + "]";
}
+
+ public boolean isEnabled() {
+ return enabled;
+ }
+
+ public void setEnabled(boolean enabled) {
+ this.enabled = enabled;
+ }
}
Modified: trunk/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/bean/ServerType.java
===================================================================
--- trunk/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/bean/ServerType.java 2010-09-07 18:26:44 UTC (rev 24780)
+++ trunk/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/bean/ServerType.java 2010-09-07 23:12:44 UTC (rev 24781)
@@ -51,7 +51,7 @@
"EAP",
"Enterprise Application Platform",
JBOSS_AS_PATH + File.separatorChar + BIN_PATH+ File.separatorChar + TWIDDLE_JAR_NAME,
- new String[]{"4.2","4.3","5.0"}, new EAPServerTypeCondition());
+ new String[]{"4.2","4.3","5.0","5.1"}, new EAPServerTypeCondition());
public static final ServerType SOAP = new ServerType(
"SOA-P",
Added: trunk/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/preferences/RuntimeDialog.java
===================================================================
--- trunk/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/preferences/RuntimeDialog.java (rev 0)
+++ trunk/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/preferences/RuntimeDialog.java 2010-09-07 23:12:44 UTC (rev 24781)
@@ -0,0 +1,153 @@
+package org.jboss.tools.runtime.preferences;
+
+import java.io.File;
+import java.util.List;
+
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.viewers.CheckStateChangedEvent;
+import org.eclipse.jface.viewers.CheckboxTableViewer;
+import org.eclipse.jface.viewers.ICheckStateListener;
+import org.eclipse.jface.viewers.IStructuredContentProvider;
+import org.eclipse.jface.viewers.ITableLabelProvider;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableColumn;
+import org.jboss.tools.runtime.ServerDefinition;
+import org.omg.CORBA.DefinitionKind;
+
+public class RuntimeDialog extends Dialog {
+
+ private List<ServerDefinition> serverDefinitions;
+ private String path;
+ private CheckboxTableViewer tableViewer;
+
+ public RuntimeDialog(Shell parentShell, List<ServerDefinition> serverDefinitions , String path) {
+ super(parentShell);
+ setShellStyle(SWT.CLOSE | SWT.MAX | SWT.TITLE | SWT.BORDER
+ | SWT.MODELESS | SWT.RESIZE | getDefaultOrientation());
+ this.serverDefinitions = serverDefinitions;
+ this.path = path;
+
+ }
+
+ @Override
+ protected Control createDialogArea(Composite parent) {
+ Composite area = (Composite) super.createDialogArea(parent);
+ Composite contents = new Composite(area, SWT.NONE);
+ GridData gd = new GridData(GridData.FILL_BOTH);
+ gd.heightHint = 400;
+ gd.widthHint = 500;
+ contents.setLayoutData(gd);
+ contents.setLayout(new GridLayout());
+ getShell().setText("JBoss Runtimes");
+ applyDialogFont(contents);
+ initializeDialogUnits(area);
+
+ Label label = new Label(contents, SWT.NULL);
+ String runtime = (serverDefinitions.size() == 1) ? "runtime" : "runtimes";
+ label.setText("The search found " + serverDefinitions.size() + " " + runtime + " while searching " + path + ".");
+ tableViewer = CheckboxTableViewer.newCheckList(contents, SWT.V_SCROLL
+ | SWT.BORDER | SWT.FULL_SELECTION | SWT.SINGLE);
+ Table table = tableViewer.getTable();
+ gd = new GridData(GridData.FILL_BOTH);
+ gd.heightHint = 100;
+ table.setLayoutData(gd);
+ table.setHeaderVisible(true);
+ table.setLinesVisible(true);
+
+ String[] columnNames = new String[] { "Name", "Version", "Type", "Location"};
+ int[] columnWidths = new int[] { 140, 50, 50, 245};
+
+ for (int i = 0; i < columnNames.length; i++) {
+ TableColumn tc = new TableColumn(table, SWT.LEFT);
+ tc.setText(columnNames[i]);
+ tc.setWidth(columnWidths[i]);
+ }
+
+ tableViewer.setLabelProvider(new RuntimeLabelProvider());
+ tableViewer.setContentProvider(new RuntimeContentProvider(serverDefinitions));
+ tableViewer.setInput(serverDefinitions);
+ for (ServerDefinition definition:serverDefinitions) {
+ tableViewer.setChecked(definition, definition.isEnabled());
+ }
+ tableViewer.addCheckStateListener(new ICheckStateListener() {
+
+ public void checkStateChanged(CheckStateChangedEvent event) {
+ ServerDefinition definition = (ServerDefinition) event.getElement();
+ definition.setEnabled(!definition.isEnabled());
+ boolean enableOk = false;
+ for (ServerDefinition serverDefinition:serverDefinitions) {
+ if (serverDefinition.isEnabled()) {
+ enableOk = true;
+ }
+ }
+ getButton(IDialogConstants.OK_ID).setEnabled(enableOk);
+ }
+ });
+ return area;
+ }
+
+ private class RuntimeLabelProvider extends LabelProvider implements
+ ITableLabelProvider {
+
+ public Image getColumnImage(Object element, int columnIndex) {
+ return null;
+ }
+
+ public String getColumnText(Object element, int columnIndex) {
+ if (element instanceof ServerDefinition) {
+ ServerDefinition definition = (ServerDefinition) element;
+ if (columnIndex == 0) {
+ return definition.getName();
+ }
+ if (columnIndex == 1) {
+ return definition.getVersion();
+ }
+ if (columnIndex == 2) {
+ return definition.getType();
+ }
+ if (columnIndex == 3) {
+ File location = definition.getLocation();
+ if (location != null) {
+ return definition.getLocation().getAbsolutePath();
+ }
+ }
+ }
+ return null;
+ }
+ }
+
+ private class RuntimeContentProvider implements IStructuredContentProvider {
+
+ private List<ServerDefinition> serverDefinitions;
+
+ public RuntimeContentProvider(List<ServerDefinition> serverDefinitions) {
+ this.serverDefinitions = serverDefinitions;
+ }
+
+ public Object[] getElements(Object inputElement) {
+ return serverDefinitions.toArray();
+ }
+
+ public void dispose() {
+
+ }
+
+ public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+ serverDefinitions = (List<ServerDefinition>) newInput;
+ }
+
+ }
+
+}
Modified: trunk/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/preferences/RuntimePreferencePage.java
===================================================================
--- trunk/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/preferences/RuntimePreferencePage.java 2010-09-07 18:26:44 UTC (rev 24780)
+++ trunk/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/preferences/RuntimePreferencePage.java 2010-09-07 23:12:44 UTC (rev 24781)
@@ -14,19 +14,23 @@
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
+import java.lang.reflect.InvocationTargetException;
import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
import java.util.Map;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.IDialogSettings;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
import org.eclipse.jface.layout.PixelConverter;
-import org.eclipse.jface.preference.PreferenceDialog;
+import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.jface.preference.PreferencePage;
import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.jface.viewers.StructuredSelection;
@@ -59,6 +63,8 @@
import org.jboss.tools.jbpm.preferences.PreferencesManager;
import org.jboss.tools.runtime.Activator;
import org.jboss.tools.runtime.JBossRuntimeLocator;
+import org.jboss.tools.runtime.JBossRuntimeStartup;
+import org.jboss.tools.runtime.ServerDefinition;
/**
* @author Snjeza
@@ -77,6 +83,8 @@
protected Map<String, Object> map = new HashMap<String, Object>();
+ private List<ServerDefinition> serverDefinitions;
+
/*
* (non-Javadoc)
*
@@ -286,10 +294,7 @@
link.setText(text);
link.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
- PreferenceDialog dialog = PreferencesUtil.createPreferenceDialogOn(getShell(),preferencesId, new String[] {preferencesId},null);
- if (dialog != null) {
- dialog.open();
- }
+ PreferencesUtil.createPreferenceDialogOn(getShell(),preferencesId, null, null);
}
});
}
@@ -306,13 +311,51 @@
DirectoryDialog dialog = new DirectoryDialog(getShell());
dialog.setMessage("Search for JBoss Runtimes");
dialog.setFilterPath(lastUsedPath);
- String path = dialog.open();
+ final String path = dialog.open();
if (path == null) {
return;
}
dialogSettings.put(LASTPATH, path);
- JBossRuntimeLocator locator = new JBossRuntimeLocator();
- locator.searchForRuntimes(path, new NullProgressMonitor());
+
+ IRunnableWithProgress op = new IRunnableWithProgress() {
+
+ public void run(IProgressMonitor monitor) {
+ JBossRuntimeLocator locator = new JBossRuntimeLocator();
+ serverDefinitions = locator.searchForRuntimes(path, monitor);
+
+ }
+ };
+
+ try {
+ serverDefinitions = null;
+ new ProgressMonitorDialog(getShell()).run(true, true, op);
+ } catch (InvocationTargetException e) {
+ Activator.log(e);
+ } catch (InterruptedException e) {
+ // ignore
+ }
+
+ if (serverDefinitions == null || serverDefinitions.size() == 0) {
+ MessageDialog.openInformation(null, "Search for JBoss Runtimes",
+ "The search found 0 runtimes while searching "
+ + path + ".");
+ } else {
+ RuntimeDialog runtimeDialog = new RuntimeDialog(getShell(),
+ serverDefinitions, path);
+ int ok = runtimeDialog.open();
+ if (ok == Window.OK) {
+ Iterator<ServerDefinition> iterator = serverDefinitions.iterator();
+ while (iterator.hasNext()) {
+ ServerDefinition definition = iterator.next();
+ if (!definition.isEnabled()) {
+ iterator.remove();
+ }
+ }
+ JBossRuntimeStartup runtimeStartup = new JBossRuntimeStartup();
+ runtimeStartup.initializeRuntimes(serverDefinitions);
+ }
+ }
+
}
/**
15 years, 7 months
JBoss Tools SVN: r24780 - workspace.
by jbosstools-commits＠lists.jboss.org
Author: elvisisking
Date: 2010-09-07 14:26:44 -0400 (Tue, 07 Sep 2010)
New Revision: 24780
Added:
workspace/dflorian/
Log:
15 years, 7 months