JBoss Tools SVN: r40982 - trunk/build.
by jbosstools-commits@lists.jboss.org
Author: mickael_istria
Date: 2012-05-14 05:02:11 -0400 (Mon, 14 May 2012)
New Revision: 40982
Modified:
trunk/build/publish.sh
Log:
JBIDE-11627 reverted for JBDS
Modified: trunk/build/publish.sh
===================================================================
--- trunk/build/publish.sh 2012-05-14 09:00:25 UTC (rev 40981)
+++ trunk/build/publish.sh 2012-05-14 09:02:11 UTC (rev 40982)
@@ -27,6 +27,8 @@
# define target update zip filename
SNAPNAME="${JOB_NAME}-Update-${ZIPSUFFIX}.zip"
+# define target sources zip filename
+SRCSNAME="${JOB_NAME}-Sources-${ZIPSUFFIX}.zip"
# define suffix to use for additional update sites
SUFFNAME="-Update-${ZIPSUFFIX}.zip"
@@ -159,6 +161,20 @@
done
fi
+# create sources zip
+pushd ${WORKSPACE}/sources
+mkdir -p ${STAGINGDIR}/all
+if [[ ${JOB_NAME/.aggregate} != ${JOB_NAME} ]] && [[ -d ${WORKSPACE}/sources/aggregate/site/zips ]]; then
+ srczipname=${SRCSNAME/-Sources-/-Additional-Sources-}
+else
+ srczipname=${SRCSNAME}
+fi
+zip ${STAGINGDIR}/all/${srczipname} -q -r * -x hudson_workspace\* -x documentation\* -x download.jboss.org\* -x requirements\* \
+ -x workingset\* -x labs\* -x build\* -x \*test\* -x \*target\* -x \*.class -x \*.svn\* -x \*classes\* -x \*bin\* -x \*.zip \
+ -x \*docs\* -x \*reference\* -x \*releng\* -x \*.git\* -x \*/lib/\*.jar
+popd
+z=${STAGINGDIR}/all/${srczipname}; for m in $(md5sum ${z}); do if [[ $m != ${z} ]]; then echo $m > ${z}.MD5; fi; done
+
mkdir -p ${STAGINGDIR}/logs
# collect component zips from upstream aggregated build jobs
@@ -170,16 +186,41 @@
mv $z ${z}.MD5 ${STAGINGDIR}/components
done
+ # TODO :: JBIDE-9870 When we have a -Update-Sources- zip, this can be removed
+ mkdir -p ${STAGINGDIR}/all/sources
+ # unpack component source zips like jbosstools-pi4soa-3.1_trunk-Sources-SNAPSHOT.zip or jbosstools-3.2_trunk.component--ws-Sources-SNAPSHOT.zip
+ for z in $(find ${WORKSPACE}/sources/aggregate/site/zips -name "*Sources*.zip"); do
+ zn=${z%*-Sources*.zip}; zn=${zn#*--}; zn=${zn##*/}; zn=${zn#jbosstools-};
+ # zn=${zn%_trunk}; zn=${zn%_stable_branch};
+ mkdir -p ${STAGINGDIR}/all/sources/${zn}/
+ unzip -qq -o -d ${STAGINGDIR}/all/sources/${zn}/ $z
+ done
+ # add component sources into sources zip
+ pushd ${STAGINGDIR}/all/sources
+ zip ${STAGINGDIR}/all/${SRCSNAME} -q -r * -x hudson_workspace\* -x documentation\* -x download.jboss.org\* -x requirements\* \
+ -x workingset\* -x labs\* -x build\* -x \*test\* -x \*target\* -x \*.class -x \*.svn\* -x \*classes\* -x \*bin\* -x \*.zip \
+ -x \*docs\* -x \*reference\* -x \*releng\* -x \*.git\* -x \*/lib/\*.jar
+ popd
+ rm -fr ${STAGINGDIR}/all/sources
+ z=${STAGINGDIR}/all/${SRCSNAME}; for m in $(md5sum ${z}); do if [[ $m != ${z} ]]; then echo $m > ${z}.MD5; fi; done
+
# JBIDE-7444 get aggregate metadata xml properties file
if [[ -f ${WORKSPACE}/sources/aggregate/site/zips/build.properties.all.xml ]]; then
rsync -aq ${WORKSPACE}/sources/aggregate/site/zips/build.properties.all.xml ${STAGINGDIR}/logs/
fi
fi
+# JBIDE-9870 check if there's a sources update site and rename it if found (note, bottests-site/site/sources won't work; use bottests-site/souces)
+for z in $(find ${WORKSPACE}/sources/aggregate/*/sources/target/ -name "repository.zip" -o -name "site_assembly.zip"); do
+ echo "Collect sources from update site in $z"
+ mv $z ${STAGINGDIR}/all/${SRCSNAME/-Sources-/-Update-Sources-}
+ for m in $(md5sum ${z}); do if [[ $m != ${z} ]]; then echo $m > ${z}.MD5; fi; done
+done
+
# generate list of zips in this job
METAFILE=zip.list.txt
echo "ALL_ZIPS = \\" >> ${STAGINGDIR}/logs/${METAFILE}
-for z in $(find ${STAGINGDIR} -name "*Update*.zip"); do
+for z in $(find ${STAGINGDIR} -name "*Update*.zip") $(find ${STAGINGDIR} -name "*Sources*.zip"); do
# list zips in staging dir
echo "${z##${STAGINGDIR}/},\\" >> ${STAGINGDIR}/logs/${METAFILE}
done
@@ -189,8 +230,12 @@
md5sumsFile=${STAGINGDIR}/logs/md5sums.txt
echo "# Update Site Zips" > ${md5sumsFile}
echo "# ----------------" >> ${md5sumsFile}
-md5sum $(find . -name "*Update*.zip" | egrep -v "nightly-Update") >> ${md5sumsFile}
+md5sum $(find . -name "*Update*.zip" | egrep -v "aggregate-Sources|nightly-Update") >> ${md5sumsFile}
echo " " >> ${md5sumsFile}
+echo "# Source Zips" >> ${md5sumsFile}
+echo "# -----------" >> ${md5sumsFile}
+md5sum $(find . -name "*Source*.zip" | egrep -v "aggregate-Sources|nightly-Update") >> ${md5sumsFile}
+echo " " >> ${md5sumsFile}
mkdir -p ${STAGINGDIR}/logs
12 years, 8 months
JBoss Tools SVN: r40981 - in workspace/mistria/install-tests: features and 14 other directories.
by jbosstools-commits@lists.jboss.org
Author: mickael_istria
Date: 2012-05-14 05:00:25 -0400 (Mon, 14 May 2012)
New Revision: 40981
Added:
workspace/mistria/install-tests/.project
workspace/mistria/install-tests/features/
workspace/mistria/install-tests/features/org.jboss.tools.qa.install.tests.feature/
workspace/mistria/install-tests/features/org.jboss.tools.qa.install.tests.feature/.project
workspace/mistria/install-tests/features/org.jboss.tools.qa.install.tests.feature/build.properties
workspace/mistria/install-tests/features/org.jboss.tools.qa.install.tests.feature/feature.xml
workspace/mistria/install-tests/features/org.jboss.tools.qa.install.tests.feature/pom.xml
workspace/mistria/install-tests/plugins/
workspace/mistria/install-tests/plugins/org.jboss.tools.qa.install.tests/
workspace/mistria/install-tests/plugins/org.jboss.tools.qa.install.tests/.classpath
workspace/mistria/install-tests/plugins/org.jboss.tools.qa.install.tests/.project
workspace/mistria/install-tests/plugins/org.jboss.tools.qa.install.tests/.settings/
workspace/mistria/install-tests/plugins/org.jboss.tools.qa.install.tests/.settings/org.eclipse.jdt.core.prefs
workspace/mistria/install-tests/plugins/org.jboss.tools.qa.install.tests/META-INF/
workspace/mistria/install-tests/plugins/org.jboss.tools.qa.install.tests/META-INF/MANIFEST.MF
workspace/mistria/install-tests/plugins/org.jboss.tools.qa.install.tests/build.properties
workspace/mistria/install-tests/plugins/org.jboss.tools.qa.install.tests/pom.xml
workspace/mistria/install-tests/plugins/org.jboss.tools.qa.install.tests/src/
workspace/mistria/install-tests/plugins/org.jboss.tools.qa.install.tests/src/org/
workspace/mistria/install-tests/plugins/org.jboss.tools.qa.install.tests/src/org/jboss/
workspace/mistria/install-tests/plugins/org.jboss.tools.qa.install.tests/src/org/jboss/tools/
workspace/mistria/install-tests/plugins/org.jboss.tools.qa.install.tests/src/org/jboss/tools/qa/
workspace/mistria/install-tests/plugins/org.jboss.tools.qa.install.tests/src/org/jboss/tools/qa/install/
workspace/mistria/install-tests/plugins/org.jboss.tools.qa.install.tests/src/org/jboss/tools/qa/install/tests/
workspace/mistria/install-tests/plugins/org.jboss.tools.qa.install.tests/src/org/jboss/tools/qa/install/tests/InstallTest.java
workspace/mistria/install-tests/pom.xml
workspace/mistria/install-tests/repository/
workspace/mistria/install-tests/repository/.project
workspace/mistria/install-tests/repository/category.xml
workspace/mistria/install-tests/repository/pom.xml
workspace/mistria/install-tests/scripts/
workspace/mistria/install-tests/scripts/assembly.xml
workspace/mistria/install-tests/scripts/pom.xml
workspace/mistria/install-tests/scripts/sites
workspace/mistria/install-tests/scripts/testInstall.sh
Log:
TEst installation and updates
Added: workspace/mistria/install-tests/.project
===================================================================
--- workspace/mistria/install-tests/.project (rev 0)
+++ workspace/mistria/install-tests/.project 2012-05-14 09:00:25 UTC (rev 40981)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>install-tests</name>
+</projectDescription>
Property changes on: workspace/mistria/install-tests/.project
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: workspace/mistria/install-tests/features/org.jboss.tools.qa.install.tests.feature/.project
===================================================================
--- workspace/mistria/install-tests/features/org.jboss.tools.qa.install.tests.feature/.project (rev 0)
+++ workspace/mistria/install-tests/features/org.jboss.tools.qa.install.tests.feature/.project 2012-05-14 09:00:25 UTC (rev 40981)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.jboss.tools.qa.install.tests.feature</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.pde.FeatureBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.FeatureNature</nature>
+ </natures>
+</projectDescription>
Property changes on: workspace/mistria/install-tests/features/org.jboss.tools.qa.install.tests.feature/.project
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: workspace/mistria/install-tests/features/org.jboss.tools.qa.install.tests.feature/build.properties
===================================================================
--- workspace/mistria/install-tests/features/org.jboss.tools.qa.install.tests.feature/build.properties (rev 0)
+++ workspace/mistria/install-tests/features/org.jboss.tools.qa.install.tests.feature/build.properties 2012-05-14 09:00:25 UTC (rev 40981)
@@ -0,0 +1 @@
+bin.includes = feature.xml
Property changes on: workspace/mistria/install-tests/features/org.jboss.tools.qa.install.tests.feature/build.properties
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: workspace/mistria/install-tests/features/org.jboss.tools.qa.install.tests.feature/feature.xml
===================================================================
--- workspace/mistria/install-tests/features/org.jboss.tools.qa.install.tests.feature/feature.xml (rev 0)
+++ workspace/mistria/install-tests/features/org.jboss.tools.qa.install.tests.feature/feature.xml 2012-05-14 09:00:25 UTC (rev 40981)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.jboss.tools.qa.install.tests.feature"
+ label="Stuff to test installation and updates with p2"
+ version="1.0.0.qualifier"
+ provider-name="JBoss, by Red Hat">
+
+ <description url="http://www.example.com/description">
+ [Enter Feature Description here.]
+ </description>
+
+ <copyright url="http://www.example.com/copyright">
+ [Enter Copyright Description here.]
+ </copyright>
+
+ <license url="http://www.example.com/license">
+ [Enter License Description here.]
+ </license>
+
+ <plugin
+ id="org.jboss.tools.qa.install.tests"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <requires>
+ <import feature="org.eclipse.swtbot.eclipse"/>
+ <import feature="org.eclipse.swtbot.eclipse.test.junit4"/>
+ </requires>
+
+</feature>
Property changes on: workspace/mistria/install-tests/features/org.jboss.tools.qa.install.tests.feature/feature.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: workspace/mistria/install-tests/features/org.jboss.tools.qa.install.tests.feature/pom.xml
===================================================================
--- workspace/mistria/install-tests/features/org.jboss.tools.qa.install.tests.feature/pom.xml (rev 0)
+++ workspace/mistria/install-tests/features/org.jboss.tools.qa.install.tests.feature/pom.xml 2012-05-14 09:00:25 UTC (rev 40981)
@@ -0,0 +1,18 @@
+<?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>
+ <groupId>org.jboss.tools.install-tests</groupId>
+ <artifactId>org.jboss.tools.qa.install.tests.feature</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+
+ <parent>
+ <groupId>org.jboss.tools.install-tests</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../..</relativePath>
+ </parent>
+
+</project>
+
\ No newline at end of file
Property changes on: workspace/mistria/install-tests/features/org.jboss.tools.qa.install.tests.feature/pom.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: workspace/mistria/install-tests/plugins/org.jboss.tools.qa.install.tests/.classpath
===================================================================
--- workspace/mistria/install-tests/plugins/org.jboss.tools.qa.install.tests/.classpath (rev 0)
+++ workspace/mistria/install-tests/plugins/org.jboss.tools.qa.install.tests/.classpath 2012-05-14 09:00:25 UTC (rev 40981)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Property changes on: workspace/mistria/install-tests/plugins/org.jboss.tools.qa.install.tests/.classpath
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: workspace/mistria/install-tests/plugins/org.jboss.tools.qa.install.tests/.project
===================================================================
--- workspace/mistria/install-tests/plugins/org.jboss.tools.qa.install.tests/.project (rev 0)
+++ workspace/mistria/install-tests/plugins/org.jboss.tools.qa.install.tests/.project 2012-05-14 09:00:25 UTC (rev 40981)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.jboss.tools.qa.install.tests</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Property changes on: workspace/mistria/install-tests/plugins/org.jboss.tools.qa.install.tests/.project
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: workspace/mistria/install-tests/plugins/org.jboss.tools.qa.install.tests/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- workspace/mistria/install-tests/plugins/org.jboss.tools.qa.install.tests/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ workspace/mistria/install-tests/plugins/org.jboss.tools.qa.install.tests/.settings/org.eclipse.jdt.core.prefs 2012-05-14 09:00:25 UTC (rev 40981)
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
Property changes on: workspace/mistria/install-tests/plugins/org.jboss.tools.qa.install.tests/.settings/org.eclipse.jdt.core.prefs
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: workspace/mistria/install-tests/plugins/org.jboss.tools.qa.install.tests/META-INF/MANIFEST.MF
===================================================================
--- workspace/mistria/install-tests/plugins/org.jboss.tools.qa.install.tests/META-INF/MANIFEST.MF (rev 0)
+++ workspace/mistria/install-tests/plugins/org.jboss.tools.qa.install.tests/META-INF/MANIFEST.MF 2012-05-14 09:00:25 UTC (rev 40981)
@@ -0,0 +1,14 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Tests for Installation and Updates
+Bundle-SymbolicName: org.jboss.tools.qa.install.tests
+Bundle-Version: 1.0.0.qualifier
+Bundle-Vendor: JBoss, by Red Hat
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Require-Bundle: org.junit;bundle-version="4.0.0",
+ org.eclipse.swtbot.eclipse.core;bundle-version="2.0.5",
+ org.eclipse.swtbot.eclipse.finder;bundle-version="2.0.5",
+ org.eclipse.swtbot.swt.finder;bundle-version="2.0.5",
+ org.eclipse.equinox.p2.ui.sdk;bundle-version="1.0.0",
+ org.eclipse.ui;bundle-version="3.7.0",
+ org.eclipse.swtbot.junit4_x;bundle-version="2.0.5"
Property changes on: workspace/mistria/install-tests/plugins/org.jboss.tools.qa.install.tests/META-INF/MANIFEST.MF
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: workspace/mistria/install-tests/plugins/org.jboss.tools.qa.install.tests/build.properties
===================================================================
--- workspace/mistria/install-tests/plugins/org.jboss.tools.qa.install.tests/build.properties (rev 0)
+++ workspace/mistria/install-tests/plugins/org.jboss.tools.qa.install.tests/build.properties 2012-05-14 09:00:25 UTC (rev 40981)
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .
Property changes on: workspace/mistria/install-tests/plugins/org.jboss.tools.qa.install.tests/build.properties
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: workspace/mistria/install-tests/plugins/org.jboss.tools.qa.install.tests/pom.xml
===================================================================
--- workspace/mistria/install-tests/plugins/org.jboss.tools.qa.install.tests/pom.xml (rev 0)
+++ workspace/mistria/install-tests/plugins/org.jboss.tools.qa.install.tests/pom.xml 2012-05-14 09:00:25 UTC (rev 40981)
@@ -0,0 +1,18 @@
+<?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>
+ <groupId>org.jboss.tools.install-tests</groupId>
+ <artifactId>org.jboss.tools.qa.install.tests</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>eclipse-plugin</packaging>
+
+ <parent>
+ <groupId>org.jboss.tools.install-tests</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../..</relativePath>
+ </parent>
+
+</project>
+
\ No newline at end of file
Property changes on: workspace/mistria/install-tests/plugins/org.jboss.tools.qa.install.tests/pom.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: workspace/mistria/install-tests/plugins/org.jboss.tools.qa.install.tests/src/org/jboss/tools/qa/install/tests/InstallTest.java
===================================================================
--- workspace/mistria/install-tests/plugins/org.jboss.tools.qa.install.tests/src/org/jboss/tools/qa/install/tests/InstallTest.java (rev 0)
+++ workspace/mistria/install-tests/plugins/org.jboss.tools.qa.install.tests/src/org/jboss/tools/qa/install/tests/InstallTest.java 2012-05-14 09:00:25 UTC (rev 40981)
@@ -0,0 +1,113 @@
+package org.jboss.tools.qa.install.tests;
+
+import junit.framework.Assert;
+
+import org.eclipse.swtbot.eclipse.finder.SWTBotEclipseTestCase;
+import org.eclipse.swtbot.swt.finder.SWTBot;
+import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
+import org.eclipse.swtbot.swt.finder.junit.SWTBotJunit4ClassRunner;
+import org.eclipse.swtbot.swt.finder.waits.ICondition;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+(a)RunWith(SWTBotJunit4ClassRunner.class)
+public class InstallTest extends SWTBotEclipseTestCase {
+
+ @Test
+ public void testInstall() {
+ String site = System.getProperty("UPDATE_SITE");
+ Assert.assertNotNull("No site specified, set UPDATE_SITE system property first", site);
+
+ this.bot.menu("Help").menu("Install New Software...").click();
+ this.bot.shell("Install").bot().button("Add...").click();
+ this.bot.shell("Add Repository").activate().setFocus();
+ this.bot.text(1).setText(site);
+ this.bot.button("OK").click();
+ this.bot.shell("Install").activate().setFocus();
+ this.bot.waitUntil(new ICondition() {
+
+ @Override
+ public boolean test() throws Exception {
+ return bot.tree().getAllItems().length > 2;
+ }
+
+ @Override
+ public void init(SWTBot bot) {
+ }
+
+ @Override
+ public String getFailureMessage() {
+ return "Could not see categories in tree";
+ }
+ });
+ this.bot.button("Select All").click();
+ this.bot.button("Next >").click();
+ this.bot.waitUntil(new ICondition() {
+ @Override
+ public boolean test() throws Exception {
+ return bot.button("Cancel").isEnabled();
+ }
+
+ @Override
+ public void init(SWTBot bot) {
+ }
+
+ @Override
+ public String getFailureMessage() {
+ return "Blocking while calculating deps";
+ }
+ }, 10 * 60000); // 5 minutes timeout
+ this.bot.button("Next >").click();
+ this.bot.radio(0).click();
+ this.bot.button("Finish").click();
+ // wait for Security pop-up, or install finished.
+ final SWTBotShell shell = this.bot.shell("Installing Software");
+ this.bot.waitWhile(new ICondition() {
+
+ @Override
+ public boolean test() throws Exception {
+ return shell.isActive();
+ }
+
+ @Override
+ public void init(SWTBot bot) {
+ }
+
+ @Override
+ public String getFailureMessage() {
+ return null;
+ }
+ }, 20 * 60000); // 20 minutes_tino
+ if (this.bot.activeShell().getText().equals("Security Warning")) {
+ this.bot.button("OK").click();
+ System.err.println("OK clicked");
+ this.bot.waitUntil(new ICondition() {
+ @Override
+ public boolean test() throws Exception {
+ try {
+ boolean stillOpen = bot.shell("Installing Software").isOpen();
+ System.err.println("still open? " + stillOpen);
+ return !stillOpen;
+ } catch (WidgetNotFoundException ex) {
+ System.err.println("no shell");
+ // Shell already closed
+ return true;
+ }
+ }
+
+ @Override
+ public void init(SWTBot bot) {
+ }
+
+ @Override
+ public String getFailureMessage() {
+ return null;
+ }
+ }, 15 * 60000); // 15 more minutes
+ }
+ this.bot.shell("Software Updates").bot().button("Not Now").click(); // Don't restart in test, test executor will do it.
+ }
+
+
+}
Property changes on: workspace/mistria/install-tests/plugins/org.jboss.tools.qa.install.tests/src/org/jboss/tools/qa/install/tests/InstallTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: workspace/mistria/install-tests/pom.xml
===================================================================
--- workspace/mistria/install-tests/pom.xml (rev 0)
+++ workspace/mistria/install-tests/pom.xml 2012-05-14 09:00:25 UTC (rev 40981)
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (C) 2011, Chris Aniszczyk <caniszczyk(a)gmail.com>
+
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+which accompanies this distribution, and is available at
+http://www.eclipse.org/legal/epl-v10.html
+-->
+
+<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/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <prerequisites>
+ <maven>3.0</maven>
+ </prerequisites>
+
+ <groupId>org.jboss.tools.install-tests</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+
+ <properties>
+ <tychoVersion>0.15.0-SNAPSHOT</tychoVersion>
+ <tychoExtrasVersion>0.14.0</tychoExtrasVersion>
+ </properties>
+
+ <modules>
+ <module>plugins/org.jboss.tools.qa.install.tests</module>
+ <module>features/org.jboss.tools.qa.install.tests.feature</module>
+ <module>repository</module>
+ <module>scripts</module>
+ </modules>
+
+ <repositories>
+ <repository>
+ <id>indigo</id>
+ <layout>p2</layout>
+ <url>http://download.eclipse.org/releases/indigo</url>
+ </repository>
+ <repository>
+ <id>swtbot</id>
+ <layout>p2</layout>
+ <url>http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site/</url>
+ </repository>
+ </repositories>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-maven-plugin</artifactId>
+ <version>${tychoVersion}</version>
+ <extensions>true</extensions>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>${tychoVersion}</version>
+ <configuration>
+ <resolver>p2</resolver>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Property changes on: workspace/mistria/install-tests/pom.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: workspace/mistria/install-tests/repository/.project
===================================================================
--- workspace/mistria/install-tests/repository/.project (rev 0)
+++ workspace/mistria/install-tests/repository/.project 2012-05-14 09:00:25 UTC (rev 40981)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>install-tests-repository</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ </buildSpec>
+ <natures>
+ </natures>
+</projectDescription>
Property changes on: workspace/mistria/install-tests/repository/.project
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: workspace/mistria/install-tests/repository/category.xml
===================================================================
--- workspace/mistria/install-tests/repository/category.xml (rev 0)
+++ workspace/mistria/install-tests/repository/category.xml 2012-05-14 09:00:25 UTC (rev 40981)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+ <feature url="features/org.jboss.tools.qa.install.tests.feature_1.0.0.qualifier.jar" id="org.jboss.tools.qa.install.tests.feature" version="1.0.0.qualifier">
+ <category name="Installation Tests"/>
+ </feature>
+ <category-def name="Installation Tests" label="Installation Tests"/>
+</site>
Property changes on: workspace/mistria/install-tests/repository/category.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: workspace/mistria/install-tests/repository/pom.xml
===================================================================
--- workspace/mistria/install-tests/repository/pom.xml (rev 0)
+++ workspace/mistria/install-tests/repository/pom.xml 2012-05-14 09:00:25 UTC (rev 40981)
@@ -0,0 +1,18 @@
+<?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>
+ <groupId>org.jboss.tools.install-tests</groupId>
+ <artifactId>repository</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>eclipse-repository</packaging>
+
+ <parent>
+ <groupId>org.jboss.tools.install-tests</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>..</relativePath>
+ </parent>
+
+</project>
+
\ No newline at end of file
Property changes on: workspace/mistria/install-tests/repository/pom.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: workspace/mistria/install-tests/scripts/assembly.xml
===================================================================
--- workspace/mistria/install-tests/scripts/assembly.xml (rev 0)
+++ workspace/mistria/install-tests/scripts/assembly.xml 2012-05-14 09:00:25 UTC (rev 40981)
@@ -0,0 +1,24 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+ <id>delivery</id>
+ <formats>
+ <format>zip</format>
+ <format>dir</format>
+ </formats>
+ <baseDirectory>/</baseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>${project.basedir}</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>*.sh</include>
+ </includes>
+ <fileMode>777</fileMode>
+ </fileSet>
+ </fileSets>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>/repository</outputDirectory>
+ <unpack>true</unpack>
+ </dependencySet>
+ </dependencySets>
+</assembly>
\ No newline at end of file
Property changes on: workspace/mistria/install-tests/scripts/assembly.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: workspace/mistria/install-tests/scripts/pom.xml
===================================================================
--- workspace/mistria/install-tests/scripts/pom.xml (rev 0)
+++ workspace/mistria/install-tests/scripts/pom.xml 2012-05-14 09:00:25 UTC (rev 40981)
@@ -0,0 +1,51 @@
+<?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>
+ <groupId>org.jboss.tools.install-tests</groupId>
+ <artifactId>scripts</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <parent>
+ <groupId>org.jboss.tools.install-tests</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>..</relativePath>
+ </parent>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.3</version>
+ <executions>
+ <execution>
+ <id>make-assembly</id> <!-- this is used for inheritance merges -->
+ <phase>package</phase> <!-- bind to the packaging phase -->
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <descriptors>
+ <descriptor>assembly.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.tools.install-tests</groupId>
+ <artifactId>repository</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <type>zip</type>
+ </dependency>
+ </dependencies>
+
+</project>
+
\ No newline at end of file
Property changes on: workspace/mistria/install-tests/scripts/pom.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: workspace/mistria/install-tests/scripts/sites
===================================================================
--- workspace/mistria/install-tests/scripts/sites (rev 0)
+++ workspace/mistria/install-tests/scripts/sites 2012-05-14 09:00:25 UTC (rev 40981)
@@ -0,0 +1,2 @@
+http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta2.core/
+http://download.jboss.org/jbosstools/updates/nightly/core/trunk/
Added: workspace/mistria/install-tests/scripts/testInstall.sh
===================================================================
--- workspace/mistria/install-tests/scripts/testInstall.sh (rev 0)
+++ workspace/mistria/install-tests/scripts/testInstall.sh 2012-05-14 09:00:25 UTC (rev 40981)
@@ -0,0 +1,63 @@
+#!/bin/bash
+
+eclipse_home=$1
+site_list=$2
+
+usage() {
+ echo "Script to test installation"
+ echo "usage: <dir>/testInstalls.sh <eclipse_home> <file_containing_list_of_sites>"
+ echo " <eclipse_home>: an eclipse installation will be performed on"
+ echo " <file_containing_list_of_sites> a file containing a list of p2-friendly URLs of repositories"
+ echo " separated by spaces or line breaks
+}
+
+if [ ! -d "$eclipse_home" -o ! -f "$eclipse_home/eclipse" ]; then
+ usage
+ exit 2
+fi
+if [ ! -f "$site_list" ]; then
+ usage
+ exit 2
+fi
+
+echo "$(dirname $0)"
+if [ ! -d "$(dirname $0)/repository" ]; then
+ echo "Missing companion repository"
+ echo "Cannot perform tests"
+ exit 3
+fi
+
+echo "Preparing tests, installing framework"
+#install test framework
+pushd $eclipse_home
+java -jar plugins/org.eclipse.equinox.launcher_*.jar \
+ -application org.eclipse.equinox.p2.director \
+ -repository http://download.eclipse.org/technology/swtbot/helios/dev-build/update-sit... \
+ -installIU org.jboss.tools.qa.install.tests.feature.feature.group \
+ -consoleLog
+
+for site in $(cat "$site_list"); do
+ echo "Installing content from " $site
+ report=TEST-install-$(date +%Y%m%d%H%M).xml
+ #Invoke tests
+ output=$(java \
+ -DUPDATE_SITE=$site \
+ -Dusage_reporting_enabled=false \
+ -jar plugins/org.eclipse.equinox.launcher_*.jar \
+ -application org.eclipse.swtbot.eclipse.junit4.headless.swtbottestapplication \
+ -testApplication org.eclipse.ui.ide.workbench \
+ -product org.eclipse.sdk.ide \
+ -data workspace/ \
+ formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,$report \
+ formatter=org.apache.tools.ant.taskdefs.optional.junit.PlainJUnitResultFormatter \
+ -testPluginName org.jboss.tools.qa.install.tests \
+ -className org.jboss.tools.qa.install.tests.InstallTest \
+ -consoleLog -debug)
+ if [[ ! "$output" == *"Failures: 0, Errors: 0"* ]]; then
+ echo "Error while installing from " $site ". Read $report for details and see screenshots/"
+ popd
+ exit 1
+ fi
+done
+popd
+exit 0
\ No newline at end of file
Property changes on: workspace/mistria/install-tests/scripts/testInstall.sh
___________________________________________________________________
Added: svn:executable
+ *
12 years, 8 months
JBoss Tools SVN: r40979 - trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-05-14 04:40:05 -0400 (Mon, 14 May 2012)
New Revision: 40979
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JBoss70ConnectionProvider.java
trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JBoss71ServerConnection.java
Log:
JBIDE-11826 cosmetic
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JBoss70ConnectionProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JBoss70ConnectionProvider.java 2012-05-14 08:24:36 UTC (rev 40978)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JBoss70ConnectionProvider.java 2012-05-14 08:40:05 UTC (rev 40979)
@@ -98,10 +98,12 @@
else
disconnect();
} catch( IOException ioe) {
+ Status s = null;
if( started )
- JBossServerCorePlugin.log(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, "Error connecting to this server's JMX service: " + event.getServer().getName(), ioe));
+ s = (new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, "Unable to reach JBoss instance. Please ensure your server is up and exposes its management ports via the -Djboss.bind.address.management=yourwebsite.com system property."));
else
- JBossServerCorePlugin.log(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, "Error disconnecting from this server's JMX service: " + event.getServer().getName(), ioe));
+ s = (new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, "Error disconnecting from this server's JMX service: " + event.getServer().getName(), ioe));
+ JBossServerCorePlugin.log(s);
}
}
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JBoss71ServerConnection.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JBoss71ServerConnection.java 2012-05-14 08:24:36 UTC (rev 40978)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JBoss71ServerConnection.java 2012-05-14 08:40:05 UTC (rev 40979)
@@ -72,7 +72,7 @@
return null;
} catch( RuntimeException re) {
IStatus stat = new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID,
- "Runtime Exception contacting JBoss instance. Please ensure your server is up and exposes its management ports via the -Djboss.bind.address.management=yourwebsite.com system property", re);
+ "Unable to reach JBoss instance. Please ensure your server is up and exposes its management ports via the -Djboss.bind.address.management=yourwebsite.com system property", re);
throw new JMXException(stat);
}
}
12 years, 8 months
JBoss Tools SVN: r40978 - in workspace/fred/repositories/snapshot/org/richfaces/archetypes: richfaces-archetype-kitchensink and 1 other directories.
by jbosstools-commits@lists.jboss.org
Author: fbricon
Date: 2012-05-14 04:24:36 -0400 (Mon, 14 May 2012)
New Revision: 40978
Added:
workspace/fred/repositories/snapshot/org/richfaces/archetypes/richfaces-archetype-kitchensink/
workspace/fred/repositories/snapshot/org/richfaces/archetypes/richfaces-archetype-kitchensink/4.2.2.Final-JBT/
workspace/fred/repositories/snapshot/org/richfaces/archetypes/richfaces-archetype-kitchensink/4.2.2.Final-JBT/richfaces-archetype-kitchensink-4.2.2.Final-JBT.jar
workspace/fred/repositories/snapshot/org/richfaces/archetypes/richfaces-archetype-kitchensink/4.2.2.Final-JBT/richfaces-archetype-kitchensink-4.2.2.Final-JBT.pom
Log:
Add richfaces archetype compatible with EAP ER6 / WFK ER5 repos
Added: workspace/fred/repositories/snapshot/org/richfaces/archetypes/richfaces-archetype-kitchensink/4.2.2.Final-JBT/richfaces-archetype-kitchensink-4.2.2.Final-JBT.jar
===================================================================
(Binary files differ)
Property changes on: workspace/fred/repositories/snapshot/org/richfaces/archetypes/richfaces-archetype-kitchensink/4.2.2.Final-JBT/richfaces-archetype-kitchensink-4.2.2.Final-JBT.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/fred/repositories/snapshot/org/richfaces/archetypes/richfaces-archetype-kitchensink/4.2.2.Final-JBT/richfaces-archetype-kitchensink-4.2.2.Final-JBT.pom
===================================================================
--- workspace/fred/repositories/snapshot/org/richfaces/archetypes/richfaces-archetype-kitchensink/4.2.2.Final-JBT/richfaces-archetype-kitchensink-4.2.2.Final-JBT.pom (rev 0)
+++ workspace/fred/repositories/snapshot/org/richfaces/archetypes/richfaces-archetype-kitchensink/4.2.2.Final-JBT/richfaces-archetype-kitchensink-4.2.2.Final-JBT.pom 2012-05-14 08:24:36 UTC (rev 40978)
@@ -0,0 +1,61 @@
+<?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.richfaces</groupId>
+ <artifactId>richfaces-root-parent</artifactId>
+ <version>4.2.1.Final</version>
+ <relativePath>../../build/parent/pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.richfaces.archetypes</groupId>
+ <artifactId>richfaces-archetype-kitchensink</artifactId>
+ <packaging>maven-archetype</packaging>
+ <version>4.2.2.Final-JBT</version>
+
+ <name>RichFaces Archetypes Kitchen Sink Application</name>
+
+ <properties>
+ <richfaces-default-version>4.2.1.Final</richfaces-default-version>
+ </properties>
+
+ <dependencyManagement>
+ <dependencies>
+ <!-- RichFaces BOM Import -->
+ <dependency>
+ <groupId>org.richfaces</groupId>
+ <artifactId>richfaces-bom</artifactId>
+ <version>${richfaces-default-version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <build>
+ <extensions>
+ <extension>
+ <groupId>org.apache.maven.archetype</groupId>
+ <artifactId>archetype-packaging</artifactId>
+ <version>2.0</version>
+ </extension>
+ </extensions>
+
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-archetype-plugin</artifactId>
+ <version>2.0</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <scm>
+ <connection>scm:git:git://github.com/richfaces/archetypes.git</connection>
+ <developerConnection>scm:git:git@github.com:richfaces/archetypes.git</developerConnection>
+ <url>https://github.com/richfaces/archetypes</url>
+ </scm>
+</project>
12 years, 8 months
JBoss Tools SVN: r40977 - trunk/build/aggregate/soatests-site/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke.
by jbosstools-commits@lists.jboss.org
Author: jgargula
Date: 2012-05-14 04:23:35 -0400 (Mon, 14 May 2012)
New Revision: 40977
Modified:
trunk/build/aggregate/soatests-site/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/DroolsViewsTest.java
Log:
Improved waiting for debugging.
Modified: trunk/build/aggregate/soatests-site/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/DroolsViewsTest.java
===================================================================
--- trunk/build/aggregate/soatests-site/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/DroolsViewsTest.java 2012-05-14 07:04:57 UTC (rev 40976)
+++ trunk/build/aggregate/soatests-site/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/DroolsViewsTest.java 2012-05-14 08:23:35 UTC (rev 40977)
@@ -67,6 +67,8 @@
}
}
+ bot.waitForNumberOfShells(1);
+
// waits for running debugging
while (!eclipse.isDebugging()) {
bot.sleep(Timing.time500MS());
12 years, 8 months
JBoss Tools SVN: r40976 - in trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core: util/internal and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-05-14 03:04:57 -0400 (Mon, 14 May 2012)
New Revision: 40976
Modified:
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ArchiveBuildDelegate.java
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/ModelTruezipBridge.java
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/TrueZipUtil.java
Log:
JBIDE-7333 to trunk / cr1
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ArchiveBuildDelegate.java
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ArchiveBuildDelegate.java 2012-05-14 02:09:47 UTC (rev 40975)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ArchiveBuildDelegate.java 2012-05-14 07:04:57 UTC (rev 40976)
@@ -343,7 +343,7 @@
}
IStatus[] errors2 = ModelTruezipBridge.copyFiles(matchingFilesets[j],
matchingFilesets[j].getMatches(globalPath),
- new NullProgressMonitor(), true);
+ new NullProgressMonitor(), true, true);
errors.addAll(Arrays.asList(errors2));
}
EventManager.fileUpdated(path, matchingFilesets);
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/ModelTruezipBridge.java
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/ModelTruezipBridge.java 2012-05-14 02:09:47 UTC (rev 40975)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/ModelTruezipBridge.java 2012-05-14 07:04:57 UTC (rev 40976)
@@ -60,7 +60,7 @@
}
public static FileWrapperStatusPair fullFilesetBuild(final IArchiveFileSet fileset, IProgressMonitor monitor, boolean sync) {
FileWrapper[] files = fileset.findMatchingPaths();
- IStatus[] s = copyFiles(fileset, files, monitor, false);
+ IStatus[] s = copyFiles(fileset, files, monitor, false, false);
if( sync )
TrueZipUtil.sync();
return new FileWrapperStatusPair( files, s );
@@ -130,14 +130,14 @@
return new FileWrapperStatusPair( files2, errorsArr);
}
- public static IStatus[] copyFiles(IArchiveFileSet fileset, final FileWrapper[] files, IProgressMonitor monitor, boolean sync) {
+ public static IStatus[] copyFiles(IArchiveFileSet fileset, final FileWrapper[] files, IProgressMonitor monitor, boolean updateTimestamps, boolean sync) {
monitor.beginTask(ArchivesCore.bind(ArchivesCoreMessages.CopyingCountFiles,
new Integer(files.length).toString()), files.length * 100);
boolean b = true;
ArrayList<IStatus> list = new ArrayList<IStatus>();
final File[] destFiles = getFiles(files, fileset);
for( int i = 0; i < files.length; i++ ) {
- b = TrueZipUtil.copyFile(files[i].getAbsolutePath(), destFiles[i]);
+ b = TrueZipUtil.copyFile(files[i].getAbsolutePath(), destFiles[i], updateTimestamps);
if( b == false ) {
list.add(new Status(IStatus.ERROR, ArchivesCore.PLUGIN_ID,
ArchivesCore.bind(ArchivesCoreMessages.FileCopyFailed,
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/TrueZipUtil.java
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/TrueZipUtil.java 2012-05-14 02:09:47 UTC (rev 40975)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/TrueZipUtil.java 2012-05-14 07:04:57 UTC (rev 40976)
@@ -52,13 +52,13 @@
public static boolean copyFile(String source, IPath dest) throws IOException {
- return copyFile(source, getFile(dest));
+ return copyFile(source, getFile(dest), true);
}
- public static boolean copyFile(String source, de.schlichtherle.io.File file) {
+ public static boolean copyFile(String source, de.schlichtherle.io.File file, boolean updateTimestamps) {
file.getParentFile().mkdirs();
boolean b = new de.schlichtherle.io.File(source, ArchiveDetector.NULL).archiveCopyAllTo(file);
- return b && updateParentTimestamps(file);
+ return b && (updateTimestamps ? updateParentTimestamps(file) : true);
}
public static boolean touchFile(IPath path) {
12 years, 8 months
JBoss Tools SVN: r40975 - trunk/ws/docs/soap_reference/en-US.
by jbosstools-commits@lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2012-05-13 22:09:47 -0400 (Sun, 13 May 2012)
New Revision: 40975
Modified:
trunk/ws/docs/soap_reference/en-US/Book_Info.xml
Log:
updated for brew
Modified: trunk/ws/docs/soap_reference/en-US/Book_Info.xml
===================================================================
--- trunk/ws/docs/soap_reference/en-US/Book_Info.xml 2012-05-14 02:03:04 UTC (rev 40974)
+++ trunk/ws/docs/soap_reference/en-US/Book_Info.xml 2012-05-14 02:09:47 UTC (rev 40975)
@@ -7,7 +7,7 @@
<productname>JBoss Developer Studio</productname>
<productnumber>5.0</productnumber>
<edition>5.0.0</edition>
- <pubsnumber>5</pubsnumber>
+ <pubsnumber>6</pubsnumber>
<abstract>
<para>The JBoss SOAP Web Services User Guide explains how to use the JBoss Web Services module to implement SOAP web services in Java.</para>
</abstract>
12 years, 8 months
JBoss Tools SVN: r40974 - in trunk/ws/docs/soap_reference/en-US: images and 3 other directories.
by jbosstools-commits@lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2012-05-13 22:03:04 -0400 (Sun, 13 May 2012)
New Revision: 40974
Modified:
trunk/ws/docs/soap_reference/en-US/Book_Info.xml
trunk/ws/docs/soap_reference/en-US/images/client/jbossws_client_1.png
trunk/ws/docs/soap_reference/en-US/images/image-jbt-generate_a_simple_web_service_01.png
trunk/ws/docs/soap_reference/en-US/images/image-jbt-generate_a_simple_web_service_02.png
trunk/ws/docs/soap_reference/en-US/images/preference/Jbossws_preference_new.png
trunk/ws/docs/soap_reference/en-US/images/preference/jbossws_server_runtime.png
trunk/ws/docs/soap_reference/en-US/images/topdown/jbossws_bottomup_3.png
trunk/ws/docs/soap_reference/en-US/images/topdown/jbossws_bottomup_6.png
trunk/ws/docs/soap_reference/en-US/images/topdown/jbossws_facet.png
trunk/ws/docs/soap_reference/en-US/images/topdown/jbossws_facet_0.png
trunk/ws/docs/soap_reference/en-US/images/topdown/jbossws_newruntime.png
trunk/ws/docs/soap_reference/en-US/images/topdown/jbossws_webproject_2.png
trunk/ws/docs/soap_reference/en-US/images/topdown/jbossws_ws_creation1.png
trunk/ws/docs/soap_reference/en-US/images/topdown/jbossws_ws_creation1_1.png
trunk/ws/docs/soap_reference/en-US/images/topdown/jbossws_ws_creation2.png
Log:
updated with new images from QE (Len)
Modified: trunk/ws/docs/soap_reference/en-US/Book_Info.xml
===================================================================
--- trunk/ws/docs/soap_reference/en-US/Book_Info.xml 2012-05-14 00:03:04 UTC (rev 40973)
+++ trunk/ws/docs/soap_reference/en-US/Book_Info.xml 2012-05-14 02:03:04 UTC (rev 40974)
@@ -7,7 +7,7 @@
<productname>JBoss Developer Studio</productname>
<productnumber>5.0</productnumber>
<edition>5.0.0</edition>
- <pubsnumber>4</pubsnumber>
+ <pubsnumber>5</pubsnumber>
<abstract>
<para>The JBoss SOAP Web Services User Guide explains how to use the JBoss Web Services module to implement SOAP web services in Java.</para>
</abstract>
Modified: trunk/ws/docs/soap_reference/en-US/images/client/jbossws_client_1.png
===================================================================
(Binary files differ)
Modified: trunk/ws/docs/soap_reference/en-US/images/image-jbt-generate_a_simple_web_service_01.png
===================================================================
(Binary files differ)
Modified: trunk/ws/docs/soap_reference/en-US/images/image-jbt-generate_a_simple_web_service_02.png
===================================================================
(Binary files differ)
Modified: trunk/ws/docs/soap_reference/en-US/images/preference/Jbossws_preference_new.png
===================================================================
(Binary files differ)
Modified: trunk/ws/docs/soap_reference/en-US/images/preference/jbossws_server_runtime.png
===================================================================
(Binary files differ)
Modified: trunk/ws/docs/soap_reference/en-US/images/topdown/jbossws_bottomup_3.png
===================================================================
(Binary files differ)
Modified: trunk/ws/docs/soap_reference/en-US/images/topdown/jbossws_bottomup_6.png
===================================================================
(Binary files differ)
Modified: trunk/ws/docs/soap_reference/en-US/images/topdown/jbossws_facet.png
===================================================================
(Binary files differ)
Modified: trunk/ws/docs/soap_reference/en-US/images/topdown/jbossws_facet_0.png
===================================================================
(Binary files differ)
Modified: trunk/ws/docs/soap_reference/en-US/images/topdown/jbossws_newruntime.png
===================================================================
(Binary files differ)
Modified: trunk/ws/docs/soap_reference/en-US/images/topdown/jbossws_webproject_2.png
===================================================================
(Binary files differ)
Modified: trunk/ws/docs/soap_reference/en-US/images/topdown/jbossws_ws_creation1.png
===================================================================
(Binary files differ)
Modified: trunk/ws/docs/soap_reference/en-US/images/topdown/jbossws_ws_creation1_1.png
===================================================================
(Binary files differ)
Modified: trunk/ws/docs/soap_reference/en-US/images/topdown/jbossws_ws_creation2.png
===================================================================
(Binary files differ)
12 years, 8 months
JBoss Tools SVN: r40973 - trunk/openshift/docs/reference/en-US.
by jbosstools-commits@lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2012-05-13 20:03:04 -0400 (Sun, 13 May 2012)
New Revision: 40973
Modified:
trunk/openshift/docs/reference/en-US/Book_Info.xml
Log:
updated for brew
Modified: trunk/openshift/docs/reference/en-US/Book_Info.xml
===================================================================
--- trunk/openshift/docs/reference/en-US/Book_Info.xml 2012-05-13 23:14:48 UTC (rev 40972)
+++ trunk/openshift/docs/reference/en-US/Book_Info.xml 2012-05-14 00:03:04 UTC (rev 40973)
@@ -13,7 +13,7 @@
<edition>5.0.0</edition>
- <pubsnumber>8</pubsnumber>
+ <pubsnumber>9</pubsnumber>
<abstract>
<para>
12 years, 8 months