JBoss Tools SVN: r41022 - trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2012-05-15 07:47:40 -0400 (Tue, 15 May 2012)
New Revision: 41022
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/
Log:
BrowserSim - removed unnecessary dir
Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim
___________________________________________________________________
Modified: svn:ignore
- bin
target
+ bin
target
org.jboss.tools.vpe.browsersim
12 years, 8 months
JBoss Tools SVN: r41021 - workspace/mistria/install-tests/scripts.
by jbosstools-commits＠lists.jboss.org
Author: mickael_istria
Date: 2012-05-15 07:33:30 -0400 (Tue, 15 May 2012)
New Revision: 41021
Modified:
workspace/mistria/install-tests/scripts/testInstall.sh
Log:
Fix script
Modified: workspace/mistria/install-tests/scripts/testInstall.sh
===================================================================
--- workspace/mistria/install-tests/scripts/testInstall.sh 2012-05-15 11:13:13 UTC (rev 41020)
+++ workspace/mistria/install-tests/scripts/testInstall.sh 2012-05-15 11:33:30 UTC (rev 41021)
@@ -30,13 +30,13 @@
echo "Preparing tests, installing framework"
+pushd $eclipse_home
iniFile=$(ls -1 *.ini)
productLineNumber=$(cat $iniFile | grep -n \\-product | cut -f 1 -d :)
let "productLineNumber = $productLineNumber + 1"
productName=$(sed -n ${productLineNumber}p $iniFile)
#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... \
12 years, 8 months
JBoss Tools SVN: r41020 - workspace/mistria/install-tests/scripts.
by jbosstools-commits＠lists.jboss.org
Author: mickael_istria
Date: 2012-05-15 07:13:13 -0400 (Tue, 15 May 2012)
New Revision: 41020
Modified:
workspace/mistria/install-tests/scripts/testInstall.sh
Log:
Fix for productName
Modified: workspace/mistria/install-tests/scripts/testInstall.sh
===================================================================
--- workspace/mistria/install-tests/scripts/testInstall.sh 2012-05-15 11:04:32 UTC (rev 41019)
+++ workspace/mistria/install-tests/scripts/testInstall.sh 2012-05-15 11:13:13 UTC (rev 41020)
@@ -27,7 +27,14 @@
exit 3
fi
+
+
echo "Preparing tests, installing framework"
+iniFile=$(ls -1 *.ini)
+productLineNumber=$(cat $iniFile | grep -n \\-product | cut -f 1 -d :)
+let "productLineNumber = $productLineNumber + 1"
+productName=$(sed -n ${productLineNumber}p $iniFile)
+
#install test framework
pushd $eclipse_home
java -jar plugins/org.eclipse.equinox.launcher_*.jar \
@@ -46,7 +53,7 @@
-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 \
+ -product $productName \
-data workspace/ \
formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,$report \
formatter=org.apache.tools.ant.taskdefs.optional.junit.PlainJUnitResultFormatter \
12 years, 8 months
JBoss Tools SVN: r41018 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/bean.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2012-05-15 06:04:16 -0400 (Tue, 15 May 2012)
New Revision: 41018
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/bean/JBossServerType.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/bean/ServerBeanLoader.java
Log:
JBIDE-11822 - Found SOA-P runtime does not show version
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/bean/JBossServerType.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/bean/JBossServerType.java 2012-05-15 10:00:18 UTC (rev 41017)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/bean/JBossServerType.java 2012-05-15 10:04:16 UTC (rev 41018)
@@ -391,7 +391,7 @@
}
public String getFullVersion(File location, File systemFile) {
- String fullVersion = ServerBeanLoader.getFullServerVersionFromZip(location);
+ String fullVersion = ServerBeanLoader.getFullServerVersionFromZip(systemFile);
if (fullVersion != null && fullVersion.startsWith("5.1.1")) { //$NON-NLS-1$
// SOA-P 5.2
String runJar = JBossServerType.JBOSS_AS_PATH + File.separatorChar +
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/bean/ServerBeanLoader.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/bean/ServerBeanLoader.java 2012-05-15 10:00:18 UTC (rev 41017)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/bean/ServerBeanLoader.java 2012-05-15 10:04:16 UTC (rev 41018)
@@ -111,6 +111,9 @@
return version;
}
version = (String)props.get("Specification-Version");//$NON-NLS-1$
+ if (version == null || version.trim().length() == 0 || !(version.charAt(0) >= '0' && version.charAt(0) <= '9')) {
+ version = (String)props.get("Implementation-Version");//$NON-NLS-1$
+ }
} catch (IOException e) {
// It's already null, and would fall through to return null,
// but hudson doesn't like empty catch blocks.
12 years, 8 months
JBoss Tools SVN: r41017 - workspace/mistria/install-tests/scripts.
by jbosstools-commits＠lists.jboss.org
Author: mickael_istria
Date: 2012-05-15 06:00:18 -0400 (Tue, 15 May 2012)
New Revision: 41017
Modified:
workspace/mistria/install-tests/scripts/testInstall.sh
Log:
Fix script
Modified: workspace/mistria/install-tests/scripts/testInstall.sh
===================================================================
--- workspace/mistria/install-tests/scripts/testInstall.sh 2012-05-15 09:04:27 UTC (rev 41016)
+++ workspace/mistria/install-tests/scripts/testInstall.sh 2012-05-15 10:00:18 UTC (rev 41017)
@@ -20,8 +20,8 @@
exit 2
fi
-echo "$(dirname $0)"
-if [ ! -d "$(dirname $0)/repository" ]; then
+repo="$(dirname $0)/repository"
+if [ ! -d "$repo" ]; then
echo "Missing companion repository"
echo "Cannot perform tests"
exit 3
@@ -32,7 +32,7 @@
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... \
+ -repository http://download.eclipse.org/technology/swtbot/helios/dev-build/update-sit... \
-installIU org.jboss.tools.qa.install.tests.feature.feature.group \
-consoleLog
12 years, 8 months
JBoss Tools SVN: r41016 - in workspace/mistria/install-tests/scripts: scenarios and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: mickael_istria
Date: 2012-05-15 05:04:27 -0400 (Tue, 15 May 2012)
New Revision: 41016
Added:
workspace/mistria/install-tests/scripts/scenarios/
workspace/mistria/install-tests/scripts/scenarios/update_ko
workspace/mistria/install-tests/scripts/scenarios/update_ok
Removed:
workspace/mistria/install-tests/scripts/sites
Modified:
workspace/mistria/install-tests/scripts/assembly.xml
Log:
clean
Modified: workspace/mistria/install-tests/scripts/assembly.xml
===================================================================
--- workspace/mistria/install-tests/scripts/assembly.xml 2012-05-15 08:56:48 UTC (rev 41015)
+++ workspace/mistria/install-tests/scripts/assembly.xml 2012-05-15 09:04:27 UTC (rev 41016)
@@ -14,6 +14,14 @@
</includes>
<fileMode>777</fileMode>
</fileSet>
+ <fileSet>
+ <directory>${project.basedir}/scenarios</directory>
+ <outputDirectory>scenarios</outputDirectory>
+ <includes>
+ <include>*</include>
+ </includes>
+ <fileMode>777</fileMode>
+ </fileSet>
</fileSets>
<dependencySets>
<dependencySet>
Added: workspace/mistria/install-tests/scripts/scenarios/update_ko
===================================================================
--- workspace/mistria/install-tests/scripts/scenarios/update_ko (rev 0)
+++ workspace/mistria/install-tests/scripts/scenarios/update_ko 2012-05-15 09:04:27 UTC (rev 41016)
@@ -0,0 +1,2 @@
+http://download.jboss.org/jbosstools/updates/nightly/core/trunk/
+http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta2.core/
Copied: workspace/mistria/install-tests/scripts/scenarios/update_ok (from rev 40981, workspace/mistria/install-tests/scripts/sites)
===================================================================
--- workspace/mistria/install-tests/scripts/scenarios/update_ok (rev 0)
+++ workspace/mistria/install-tests/scripts/scenarios/update_ok 2012-05-15 09:04:27 UTC (rev 41016)
@@ -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/
Deleted: workspace/mistria/install-tests/scripts/sites
===================================================================
--- workspace/mistria/install-tests/scripts/sites 2012-05-15 08:56:48 UTC (rev 41015)
+++ workspace/mistria/install-tests/scripts/sites 2012-05-15 09:04:27 UTC (rev 41016)
@@ -1,2 +0,0 @@
-http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta2.core/
-http://download.jboss.org/jbosstools/updates/nightly/core/trunk/
12 years, 8 months
JBoss Tools SVN: r41015 - trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/dialogs.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2012-05-15 04:56:48 -0400 (Tue, 15 May 2012)
New Revision: 41015
Modified:
trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/dialogs/SearchRuntimePathDialog.java
Log:
JBIDE-11829 - Different result of Seam runtime detection based on JBoss AS detector presence
Modified: trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/dialogs/SearchRuntimePathDialog.java
===================================================================
--- trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/dialogs/SearchRuntimePathDialog.java 2012-05-15 08:48:38 UTC (rev 41014)
+++ trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/dialogs/SearchRuntimePathDialog.java 2012-05-15 08:56:48 UTC (rev 41015)
@@ -337,28 +337,51 @@
} else {
serverDefinitions.clear();
}
+ List<RuntimeDefinition> allDefinitions = getAllDefinitions();
for (RuntimePath runtimePath : runtimePaths) {
- for (RuntimeDefinition serverDefinition : runtimePath
- .getServerDefinitions()) {
+ List<RuntimeDefinition> pathDefinitions = getAllDefinitions(runtimePath);
+ for (RuntimeDefinition serverDefinition : pathDefinitions) {
if (!RuntimeUIActivator.runtimeCreated(serverDefinition)) {
- List<RuntimeDefinition> allServerDefinitions = RuntimeUIActivator.getDefault().getServerDefinitions();
+
String name = serverDefinition.getName();
int i = 2;
- while (serverDefinitionsExists(serverDefinition, allServerDefinitions)) {
+ while (serverDefinitionsExists(serverDefinition, allDefinitions)) {
serverDefinition.setName(name + " (" + i++ + ")");
}
}
+ }
+
+ }
+ for (RuntimePath runtimePath : runtimePaths) {
+ for (RuntimeDefinition serverDefinition : runtimePath.getServerDefinitions()) {
if (!hideCreatedRuntimes) {
serverDefinitions.add(serverDefinition);
} else if (!RuntimeUIActivator.runtimeCreated(serverDefinition)) {
serverDefinitions.add(serverDefinition);
}
}
-
}
return serverDefinitions;
}
+ protected List<RuntimeDefinition> getAllDefinitions(RuntimePath runtimePath) {
+ List<RuntimeDefinition> allDefinitions = new ArrayList<RuntimeDefinition>();
+ allDefinitions.addAll(runtimePath.getServerDefinitions());
+ for (RuntimeDefinition serverDefinition : runtimePath.getServerDefinitions()) {
+ allDefinitions.addAll(serverDefinition.getIncludedServerDefinitions());
+ }
+ return allDefinitions;
+ }
+
+ private List<RuntimeDefinition> getAllDefinitions() {
+ List<RuntimeDefinition> allServerDefinitions = new ArrayList<RuntimeDefinition>();
+ allServerDefinitions.addAll(RuntimeUIActivator.getDefault().getServerDefinitions());
+ for (RuntimeDefinition d:RuntimeUIActivator.getDefault().getServerDefinitions()) {
+ allServerDefinitions.addAll(d.getIncludedServerDefinitions());
+ }
+ return allServerDefinitions;
+ }
+
private boolean serverDefinitionsExists(RuntimeDefinition serverDefinition,
List<RuntimeDefinition> allServerDefinitions) {
String name = serverDefinition.getName();
12 years, 8 months
JBoss Tools SVN: r41014 - in workspace/mistria/install-tests: scripts and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: mickael_istria
Date: 2012-05-15 04:48:38 -0400 (Tue, 15 May 2012)
New Revision: 41014
Modified:
workspace/mistria/install-tests/pom.xml
workspace/mistria/install-tests/scripts/testInstall.sh
Log:
Fix tycho version + typo in script
Modified: workspace/mistria/install-tests/pom.xml
===================================================================
--- workspace/mistria/install-tests/pom.xml 2012-05-15 03:15:41 UTC (rev 41013)
+++ workspace/mistria/install-tests/pom.xml 2012-05-15 08:48:38 UTC (rev 41014)
@@ -24,7 +24,7 @@
<properties>
- <tychoVersion>0.15.0-SNAPSHOT</tychoVersion>
+ <tychoVersion>0.14.1</tychoVersion>
<tychoExtrasVersion>0.14.0</tychoExtrasVersion>
</properties>
Modified: workspace/mistria/install-tests/scripts/testInstall.sh
===================================================================
--- workspace/mistria/install-tests/scripts/testInstall.sh 2012-05-15 03:15:41 UTC (rev 41013)
+++ workspace/mistria/install-tests/scripts/testInstall.sh 2012-05-15 08:48:38 UTC (rev 41014)
@@ -8,7 +8,7 @@
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
+ echo " separated by spaces or line breaks"
}
if [ ! -d "$eclipse_home" -o ! -f "$eclipse_home/eclipse" ]; then
@@ -60,4 +60,4 @@
fi
done
popd
-exit 0
\ No newline at end of file
+exit 0
12 years, 8 months
JBoss Tools SVN: r41013 - trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples.
by jbosstools-commits＠lists.jboss.org
Author: ldimaggio
Date: 2012-05-14 23:15:41 -0400 (Mon, 14 May 2012)
New Revision: 41013
Modified:
trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/ESBExampleTest.java
trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorld.java
trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksXML2XMLSimple.java
trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/WebServiceConsumer1.java
Log:
/* Close the open, but empty "Quick Fix" dialog if it is open.
* Temporary fix to workaround https://issues.jboss.org/browse/JBIDE-11781 */
Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/ESBExampleTest.java
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/ESBExampleTest.java 2012-05-15 00:32:15 UTC (rev 41012)
+++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/ESBExampleTest.java 2012-05-15 03:15:41 UTC (rev 41013)
@@ -47,7 +47,17 @@
fixExampleLibs();
if (getExampleClientProjectName()!=null) {
fixExampleClientLibs();
+ }
+
+ /* Close the open, but empty "Quick Fix" dialog if it is open.
+ * Temporary fix to workaround https://issues.jboss.org/browse/JBIDE-11781 */
+ try {
+ SWTTestExt.bot.shell("Quick Fix").close();
}
+ catch (Exception E) {
+ log.error("Condition from https://issues.jboss.org/browse/JBIDE-11781 not found " + E.getMessage());
+ }
+
openESBConfig();
/* Temporary fix to workaround JBDS-2011 */
@@ -104,7 +114,7 @@
//console.switchConsole(configuredState.getServer().name);
//String text2 = console.getConsoleText(TIME_5S, TIME_20S, false);
- String text2 = console.getConsoleText(TIME_5S, TIME_60S, false); /* https://issues.jboss.org/browse/JBQA-5838 - ldimaggi */
+ String text2 = console.getConsoleText(TIME_5S, TIME_30S, false); /* https://issues.jboss.org/browse/JBQA-5838 - ldimaggi */
log.info("text2 = " + text2);
//console.clearConsole();
@@ -177,9 +187,6 @@
protected void assertProblemsView() {
//bot.sleep(60000l);
SWTBotTreeItem errors = ProblemsView.getErrorsNode(bot);
-
-
-
assertNull("Project still contain problems :"+SWTEclipseExt.getFormattedTreeNode(errors),errors);
}
protected void fixLibrary(String project, String lib) {
Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorld.java
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorld.java 2012-05-15 00:32:15 UTC (rev 41012)
+++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/HelloWorld.java 2012-05-15 03:15:41 UTC (rev 41013)
@@ -38,6 +38,5 @@
assertTrue("Calling ESB Send message failed, unexpected server output :"+text,text.contains("hello world esb"));
SWTTestExt.servers.removeAllProjectsFromServer();
-
}
}
Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksXML2XMLSimple.java
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksXML2XMLSimple.java 2012-05-15 00:32:15 UTC (rev 41012)
+++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/SmooksXML2XMLSimple.java 2012-05-15 03:15:41 UTC (rev 41013)
@@ -1,5 +1,6 @@
package org.jboss.tools.esb.ui.bot.tests.examples;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
import org.jboss.tools.ui.bot.ext.SWTTestExt;
import org.jboss.tools.ui.bot.ext.Timing;
import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
@@ -25,6 +26,16 @@
assertFalse ("Test fails due to ESB deployment error: NNNN", text.contains("ERROR [org.apache.juddi.v3.client.transport.wrapper.RequestHandler]"));
assertNotNull("Calling Send message failed, nothing appened to server log",text);
assertTrue("Calling Send message failed, unexpected server output :"+text,text.contains("<Order"));
- SWTTestExt.servers.removeAllProjectsFromServer();
+
+ SWTTestExt.servers.removeAllProjectsFromServer();
+
+ /* Close the open, but empty "Quick Fix" dialog - https://issues.jboss.org/browse/JBIDE-11781 */
+ try {
+ SWTTestExt.bot.shell("Quick Fix").close();
+ }
+ catch (Exception E) {
+ System.out.println("Condition from https://issues.jboss.org/browse/JBIDE-11781 not found " + E.getMessage());
+ }
+ //SWTTestExt.bot.closeAllShells(); // https://issues.jboss.org/browse/JBIDE-11781
}
}
Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/WebServiceConsumer1.java
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/WebServiceConsumer1.java 2012-05-15 00:32:15 UTC (rev 41012)
+++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/examples/WebServiceConsumer1.java 2012-05-15 03:15:41 UTC (rev 41013)
@@ -25,6 +25,14 @@
text = executeClientGetServerOutput(getExampleClientProjectName(),"src","org.jboss.soa.esb.samples.quickstart.webservice_consumer1.test","SendEsbMessage.java");
assertNotNull("Calling ESB Send message failed, nothing appened to server log",text);
assertTrue("Calling ESB Send message failed, unexpected server output :"+text,text.contains("Hello World Greeting for"));
- SWTTestExt.servers.removeAllProjectsFromServer();
+ SWTTestExt.servers.removeAllProjectsFromServer();
+
+ /* Close the open, but empty "Quick Fix" dialog - https://issues.jboss.org/browse/JBIDE-11781 */
+ try {
+ SWTTestExt.bot.shell("Quick Fix").close();
+ }
+ catch (Exception E) {
+ System.out.println("Condition from https://issues.jboss.org/browse/JBIDE-11781 not found " + E.getMessage());
+ }
}
}
12 years, 8 months