March 2012 - jbosstools-commits - Jboss List Archives

JBoss Tools SVN: r39338 - in trunk/documentation/whatsnew/usage: images and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2012-03-07 09:57:52 -0500 (Wed, 07 Mar 2012) New Revision: 39338 Added: trunk/documentation/whatsnew/usage/images/ trunk/documentation/whatsnew/usage/images/central-detected.png trunk/documentation/whatsnew/usage/usage-news-3.3.0.Beta1.html Log: [JBIDE-11012] created N&N for usage Added: trunk/documentation/whatsnew/usage/images/central-detected.png =================================================================== (Binary files differ) Property changes on: trunk/documentation/whatsnew/usage/images/central-detected.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/documentation/whatsnew/usage/usage-news-3.3.0.Beta1.html =================================================================== --- trunk/documentation/whatsnew/usage/usage-news-3.3.0.Beta1.html (rev 0) +++ trunk/documentation/whatsnew/usage/usage-news-3.3.0.Beta1.html 2012-03-07 14:57:52 UTC (rev 39338) @@ -0,0 +1,59 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<meta http-equiv="Content-Language" content="en-us" /> +<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> +<link rel="stylesheet" href="../whatsnew.css" /> +<title>What's New Usage Reporting 3.3.0.Beta1</title> +<script type="text/javascript"> + + var _gaq = _gaq || []; + _gaq.push(['_setAccount', 'UA-17645367-5']); + _gaq.push(['_trackPageview']); + + (function() { + var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; + ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; + var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); + })(); + +</script></head> +<body> +<h1>What's New Usage Reporting 3.3.0.Beta1</h1> + +<p align="right"> + <a href="../index.html">< Main Index</a> <a href="../as/as-news-3.3.0.Beta1.html">AS Tools</a> +</p> +<table border="0" cellpadding="10" cellspacing="0" width="100%"> + <tr> + <td colspan="2"> + <hr/> + <h3>Reporting</h3> + <hr/> + </td> + </tr> + <tr> + <td valign="top" align="left"><a name="itemname3" id="itemname3"></a><b>Mint</b></td> + <td valign="top"> + Usage reporting now detects and reports the Mint Linux distribution. + <p><small><a href="https://issues.jboss.org/browse/JBIDE-10577">Related Jira</a></small></p> + </td> + </tr> + <tr><td colspan="2"><hr></hr></td></tr> + <tr> + <td valign="top" align="left"><a name="itemname3" id="itemname3"></a><b>Central</b></td> + <td valign="top"> + Usage reporting now checks and reports if the user has JBoss Central enabled. + <p> + <image src="images/central-detected.png"/> + </p> + <p><small><a href="https://issues.jboss.org/browse/JBIDE-10653">Related Jira</a></small></p> + </td> + </tr> + + + </tr> +</table> +</body> +</html> Property changes on: trunk/documentation/whatsnew/usage/usage-news-3.3.0.Beta1.html ___________________________________________________________________ Added: svn:mime-type + text/plain

13 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r39337 - trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/util.

by jbosstools-commits＠lists.jboss.org

Author: sbunciak Date: 2012-03-07 08:54:58 -0500 (Wed, 07 Mar 2012) New Revision: 39337 Added: trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/util/DomainDestroyer.java trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/util/OpenShiftUI.java trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/util/TestProperties.java Log: Bot tests for JBoss Tools 3.3.0.Beta1 OpenShift UI Added: trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/util/DomainDestroyer.java =================================================================== --- trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/util/DomainDestroyer.java (rev 0) +++ trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/util/DomainDestroyer.java 2012-03-07 13:54:58 UTC (rev 39337) @@ -0,0 +1,56 @@ +package org.jboss.tools.openshift.ui.bot.util; + +import org.apache.commons.httpclient.HttpClient; +import org.apache.commons.httpclient.methods.PostMethod; + +/** + * + * @author sbunciak + * + * Utility class to destroy domain on OpenShift + */ +public class DomainDestroyer { + + /** + * + * Destroys registered domain on OpenShift Express + * + * @param domain + * @param login + * @param password + * @return HTTP Response code or 0 if some Exception was caught + */ + public static int destroyDomain(String domain, String login, String password) { + + int resp_code = 0; + String input = "{\"namespace\": \"" + domain + "\", \"rhlogin\": \"" + + login + "\", \"delete\": true }"; + + HttpClient client = new HttpClient(); + PostMethod method = new PostMethod( + "https://openshift.redhat.com/broker/domain"); + + method.addParameter("json_data", input); + method.addParameter("password", password); + + try { + resp_code = client.executeMethod(method); + } catch (Exception e) { + System.out.println(e); + } finally { + method.releaseConnection(); + } + return resp_code; + } + + /** + * @param args + */ + public static void main(String[] args) { + if (destroyDomain("rhtest", "sbunciak", "rhtest123") == 200) { + System.out.println("Domain destroyed."); + } else { + System.out.println("Domain was not destroyed."); + } + } +} Added: trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/util/OpenShiftUI.java =================================================================== --- trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/util/OpenShiftUI.java (rev 0) +++ trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/util/OpenShiftUI.java 2012-03-07 13:54:58 UTC (rev 39337) @@ -0,0 +1,95 @@ +package org.jboss.tools.openshift.ui.bot.util; + +import java.util.List; +import java.util.Vector; + +import org.jboss.tools.ui.bot.ext.gen.INewObject; +import org.jboss.tools.ui.bot.ext.gen.IView; + +/** + * + * Wrapper class for OpenShift UI tooling. + * + * @author sbunciak + * + */ +public class OpenShiftUI { + + /** + * + * Class representing OpenShift Console View + * + */ + public static class Console { + + public static final IView iView = new IView() { + @Override + public String getName() { + return "OpenShift Express Console"; + } + + @Override + public List<String> getGroupPath() { + List<String> l = new Vector<String>(); + l.add("JBoss Tools"); + return l; + } + }; + } + + /** + * + * Class representing "navigation" to new OpenShift Express Application + * + */ + public static class NewApplication { + public static final INewObject iNewObject = new INewObject() { + @Override + public String getName() { + return "OpenShift Application"; + } + + @Override + public List<String> getGroupPath() { + List<String> l = new Vector<String>(); + l.add("OpenShift"); + return l; + } + }; + } + + /** + * List of available application type labels + * + * @author sbunciak + * + */ + public static class AppType { + + public static final String JBOSS = "jbossas-7"; + public static final String JENKINS = "jenkins-1.4"; + public static final String PERL = "perl-5.10"; + public static final String PHP = "php-5.3"; + public static final String PYTHON = "python-2.6"; + public static final String RAW = "raw-0.1"; + public static final String RUBY = "ruby-1.8"; + } + + /** + * List of available cartridge labels + * + * @author sbunciak + * + */ + public static class Cartridge { + + public static final String MONGODB = "mongodb-2.0"; + public static final String JENKINS = "jenkins-1.4"; + public static final String CRON = "cron-1.4"; + public static final String MYSQL = "mysql-5.1"; + public static final String POSTGRESQL = "postgresql-8.4"; + public static final String PHPMYADMIN = "phpmyadmin-3.4"; + public static final String METRICS = "metrics-0.1"; + public static final String ROCKMONGO = "rockmongo-1.1"; + } +} Property changes on: trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/util/OpenShiftUI.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/util/TestProperties.java =================================================================== --- trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/util/TestProperties.java (rev 0) +++ trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/util/TestProperties.java 2012-03-07 13:54:58 UTC (rev 39337) @@ -0,0 +1,47 @@ +package org.jboss.tools.openshift.ui.bot.util; + +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.util.Properties; + +import org.apache.commons.codec.binary.Base64; +import org.apache.log4j.Logger; + +/** + * Just static properties holder + * + * @author sbunciak + * + */ +public class TestProperties { + + public static Properties props = new Properties(); + + static { + + try { + props.load(new FileInputStream( + "resources/openshift.ui.bot.test.properties")); + + } catch (FileNotFoundException e) { + Logger.getLogger(TestProperties.class).error( + "Property file not found !", e); + } catch (IOException e) { + Logger.getLogger(TestProperties.class).error( + "IO Exception !", e); + } + + } + + public static String getProperty(String key) { + return props.getProperty(key); + } + + public static String getPassphrase() { + String passphrase = new String(new Base64().decode(TestProperties.getProperty( + "openshift.ssh.passphrase").getBytes())); + return passphrase; + } + +}

13 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r39336 - trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/util.

by jbosstools-commits＠lists.jboss.org

Author: sbunciak Date: 2012-03-07 08:54:51 -0500 (Wed, 07 Mar 2012) New Revision: 39336 Removed: trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/util/DomainDestroyer.java trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/util/OpenShiftUI.java trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/util/TestProperties.java Log: Bot tests for JBoss Tools 3.3.0.Beta1 OpenShift UI Deleted: trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/util/DomainDestroyer.java =================================================================== --- trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/util/DomainDestroyer.java 2012-03-07 13:50:56 UTC (rev 39335) +++ trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/util/DomainDestroyer.java 2012-03-07 13:54:51 UTC (rev 39336) @@ -1,56 +0,0 @@ -package org.jboss.tools.openshift.ui.bot.util; - -import org.apache.commons.httpclient.HttpClient; -import org.apache.commons.httpclient.methods.PostMethod; - -/** - * - * @author sbunciak - * - * Utility class to destroy domain on OpenShift - */ -public class DomainDestroyer { - - /** - * - * Destroys registered domain on OpenShift Express - * - * @param domain - * @param login - * @param password - * @return HTTP Response code or 0 if some Exception was caught - */ - public static int destroyDomain(String domain, String login, String password) { - - int resp_code = 0; - String input = "{\"namespace\": \"" + domain + "\", \"rhlogin\": \"" - + login + "\", \"delete\": true }"; - - HttpClient client = new HttpClient(); - PostMethod method = new PostMethod( - "https://openshift.redhat.com/broker/domain"); - - method.addParameter("json_data", input); - method.addParameter("password", password); - - try { - resp_code = client.executeMethod(method); - } catch (Exception e) { - System.out.println(e); - } finally { - method.releaseConnection(); - } - return resp_code; - } - - /** - * @param args - */ - public static void main(String[] args) { - if (destroyDomain("rhtest", "sbunciak", "rhtest123") == 200) { - System.out.println("Domain destroyed."); - } else { - System.out.println("Domain was not destroyed."); - } - } -} Deleted: trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/util/OpenShiftUI.java =================================================================== --- trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/util/OpenShiftUI.java 2012-03-07 13:50:56 UTC (rev 39335) +++ trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/util/OpenShiftUI.java 2012-03-07 13:54:51 UTC (rev 39336) @@ -1,95 +0,0 @@ -package org.jboss.tools.openshift.ui.bot.util; - -import java.util.List; -import java.util.Vector; - -import org.jboss.tools.ui.bot.ext.gen.INewObject; -import org.jboss.tools.ui.bot.ext.gen.IView; - -/** - * - * Wrapper class for OpenShift UI tooling. - * - * @author sbunciak - * - */ -public class OpenShiftUI { - - /** - * - * Class representing OpenShift Console View - * - */ - public static class Console { - - public static final IView iView = new IView() { - @Override - public String getName() { - return "OpenShift Express Console"; - } - - @Override - public List<String> getGroupPath() { - List<String> l = new Vector<String>(); - l.add("JBoss Tools"); - return l; - } - }; - } - - /** - * - * Class representing "navigation" to new OpenShift Express Application - * - */ - public static class NewApplication { - public static final INewObject iNewObject = new INewObject() { - @Override - public String getName() { - return "OpenShift Application"; - } - - @Override - public List<String> getGroupPath() { - List<String> l = new Vector<String>(); - l.add("OpenShift"); - return l; - } - }; - } - - /** - * List of available application type labels - * - * @author sbunciak - * - */ - public static class AppType { - - public static final String JBOSS = "jbossas-7"; - public static final String JENKINS = "jenkins-1.4"; - public static final String PERL = "perl-5.10"; - public static final String PHP = "php-5.3"; - public static final String PYTHON = "python-2.6"; - public static final String RAW = "raw-0.1"; - public static final String RUBY = "ruby-1.8"; - } - - /** - * List of available cartridge labels - * - * @author sbunciak - * - */ - public static class Cartridge { - - public static final String MONGODB = "mongodb-2.0"; - public static final String JENKINS = "jenkins-1.4"; - public static final String CRON = "cron-1.4"; - public static final String MYSQL = "mysql-5.1"; - public static final String POSTGRESQL = "postgresql-8.4"; - public static final String PHPMYADMIN = "phpmyadmin-3.4"; - public static final String METRICS = "metrics-0.1"; - public static final String ROCKMONGO = "rockmongo-1.1"; - } -} Deleted: trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/util/TestProperties.java =================================================================== --- trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/util/TestProperties.java 2012-03-07 13:50:56 UTC (rev 39335) +++ trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/util/TestProperties.java 2012-03-07 13:54:51 UTC (rev 39336) @@ -1,47 +0,0 @@ -package org.jboss.tools.openshift.ui.bot.util; - -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.util.Properties; - -import org.apache.commons.codec.binary.Base64; -import org.apache.log4j.Logger; - -/** - * Just static properties holder - * - * @author sbunciak - * - */ -public class TestProperties { - - public static Properties props = new Properties(); - - static { - - try { - props.load(new FileInputStream( - "resources/openshift.ui.bot.test.properties")); - - } catch (FileNotFoundException e) { - Logger.getLogger(TestProperties.class).error( - "Property file not found !", e); - } catch (IOException e) { - Logger.getLogger(TestProperties.class).error( - "IO Exception !", e); - } - - } - - public static String getProperty(String key) { - return props.getProperty(key); - } - - public static String getPassphrase() { - String passphrase = new String(new Base64().decode(TestProperties.getProperty( - "openshift.ssh.passphrase").getBytes())); - return passphrase; - } - -}

13 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r39335 - in trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test: src/org/jboss/tools/openshift/ui/bot/test and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: sbunciak Date: 2012-03-07 08:50:56 -0500 (Wed, 07 Mar 2012) New Revision: 39335 Added: trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/RepublishAppASS7.java trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/SSHKeyManagement.java trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/ValidateCredentials.java trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/util/OpenShiftUI.java Removed: trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/ImportRepublishAppASS7.java trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/SSHKeysManagment.java Modified: trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/resources/openshift.ui.bot.test.properties trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/CreateAppAS7.java trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/CreateDomain.java trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/DeleteAppAS7.java trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/DestroyDomain.java trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/EmbeddCartrides.java trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/OpenShiftAllBotTests.java trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/RenameDomain.java trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/util/DomainDestroyer.java trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/util/TestProperties.java Log: Bot tests for JBoss Tools 3.3.0.Beta1 OpenShift UI Modified: trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/resources/openshift.ui.bot.test.properties =================================================================== --- trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/resources/openshift.ui.bot.test.properties 2012-03-07 13:36:34 UTC (rev 39334) +++ trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/resources/openshift.ui.bot.test.properties 2012-03-07 13:50:56 UTC (rev 39335) @@ -1,9 +1,8 @@ openshift.user.name=sbunciak openshift.user.pwd=rhtest123 openshift.jbossapp.name=jbossapp -openshift.jbossapp.cartridges=mysql-5.1;jenkins-client-1.4 +openshift.jbossapp.cartridges=mysql;cron openshift.user.wrongpwd=rhtest openshift.domain=rhtestdomain openshift.domain.new=rhtest -openshift.ssh.passphrase=uvegel4ROV? -createDomain=true +openshift.ssh.passphrase=dXZlZ2VsNFJPVj8\= Modified: trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/CreateAppAS7.java =================================================================== --- trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/CreateAppAS7.java 2012-03-07 13:36:34 UTC (rev 39334) +++ trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/CreateAppAS7.java 2012-03-07 13:50:56 UTC (rev 39335) @@ -1,7 +1,9 @@ package org.jboss.tools.openshift.ui.bot.test; import org.eclipse.swtbot.swt.finder.waits.Conditions; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotCombo; import org.eclipse.swtbot.swt.finder.widgets.SWTBotText; +import org.jboss.tools.openshift.ui.bot.util.OpenShiftUI; import org.jboss.tools.openshift.ui.bot.util.TestProperties; import org.jboss.tools.ui.bot.ext.SWTTestExt; import org.jboss.tools.ui.bot.ext.types.IDELabel; @@ -9,26 +11,37 @@ public class CreateAppAS7 extends SWTTestExt { - @Test - public void createApplication() { - bot.button(IDELabel.Menu.NEW).click(); + @Test + public void canCreateApplication() { - SWTBotText appNameText = bot.text(0); + SWTBotText appNameText = bot.textInGroup("New application", 0); + bot.waitUntil(Conditions.widgetIsEnabled(appNameText)); + + assertTrue("App name should be empty!", appNameText.getText() + .equals("")); - assertTrue("App name should be empty!", appNameText.getText() - .equals("")); + appNameText.setText(TestProperties + .getProperty("openshift.jbossapp.name")); + + SWTBotCombo appTypeCombo = bot.comboBoxInGroup("New application"); + bot.waitUntil(Conditions.widgetIsEnabled(appNameText)); + appTypeCombo.setSelection(OpenShiftUI.AppType.JBOSS); + + bot.button(IDELabel.Button.NEXT).click(); - appNameText.setText(TestProperties - .getProperty("openshift.jbossapp.name")); + bot.waitUntil(Conditions.widgetIsEnabled(bot + .button(IDELabel.Button.FINISH))); + bot.button(IDELabel.Button.FINISH).click(); - bot.comboBox(0).setSelection("jbossas-7.0"); + bot.waitForShell("Information", 500); + bot.text(0).setText(TestProperties.getPassphrase()); + bot.button(IDELabel.Button.OK).click(); - bot.button(IDELabel.Button.FINISH).click(); + bot.waitUntil(Conditions.shellCloses(bot.activeShell()), TIME_20S); + + assertNotNull("OpenShift Server runtime is not in the Servers View!", + servers.findServerByName(servers.show().bot().tree(), + TestProperties.getProperty("openshift.jbossapp.name"))); + } - bot.waitUntil(Conditions.shellCloses(bot.activeShell())); - - assertTrue(bot.tableInGroup("Available Applications").containsItem( - TestProperties.getProperty("openshift.jbossapp.name"))); - } - } Modified: trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/CreateDomain.java =================================================================== --- trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/CreateDomain.java 2012-03-07 13:36:34 UTC (rev 39334) +++ trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/CreateDomain.java 2012-03-07 13:50:56 UTC (rev 39335) @@ -1,30 +1,49 @@ package org.jboss.tools.openshift.ui.bot.test; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.swt.widgets.Widget; +import org.eclipse.swtbot.eclipse.finder.matchers.WidgetMatcherFactory; import org.eclipse.swtbot.swt.finder.waits.Conditions; import org.eclipse.swtbot.swt.finder.widgets.SWTBotText; +import org.hamcrest.Matcher; import org.jboss.tools.openshift.ui.bot.util.TestProperties; import org.jboss.tools.ui.bot.ext.SWTTestExt; +import org.jboss.tools.ui.bot.ext.condition.NonSystemJobRunsCondition; +import org.jboss.tools.ui.bot.ext.types.IDELabel; import org.junit.Test; +/** + * Domain creation consists of creating the SSH key pair, storing user password + * in the secure storage and creating the domain itself. + * + * @author sbunciak + * + */ public class CreateDomain extends SWTTestExt { - @Test - public void domainCreate() { + @Test + public void canCreateDomain() throws InterruptedException { - // create domain only if explicit configured - if (Boolean.parseBoolean(TestProperties.getProperty("createDomain"))) { + SWTBotText domainText = bot.text(0); + + assertTrue("Domain should not be set at this stage!", domainText + .getText().equals("")); - SWTBotText domainText = bot.textInGroup("Domain", 0); + domainText.setText(TestProperties.getProperty("openshift.domain")); + bot.button(IDELabel.Button.FINISH).click(); - bot.waitUntil(Conditions.widgetIsEnabled(domainText)); + bot.waitUntil(new NonSystemJobRunsCondition()); - assertTrue("Domain should not be set at this stage!", domainText - .getText().equals("")); + bot.waitForShell("New OpenShift Express Application", 100); + + @SuppressWarnings("unchecked") + Matcher<Widget> matcher = WidgetMatcherFactory.allOf( + WidgetMatcherFactory.widgetOfType(Shell.class), + WidgetMatcherFactory.withText("New OpenShift Express Application")); - domainText.setText(TestProperties.getProperty("openshift.domain")); + bot.waitUntilWidgetAppears(Conditions.waitForWidget(matcher)); + + bot.waitUntil(new NonSystemJobRunsCondition()); + } - bot.button("Create").click(); - } - } - } Modified: trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/DeleteAppAS7.java =================================================================== --- trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/DeleteAppAS7.java 2012-03-07 13:36:34 UTC (rev 39334) +++ trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/DeleteAppAS7.java 2012-03-07 13:50:56 UTC (rev 39335) @@ -1,108 +1,105 @@ package org.jboss.tools.openshift.ui.bot.test; -import java.io.File; -import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import org.eclipse.core.runtime.jobs.Job; +import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView; import org.eclipse.swtbot.swt.finder.SWTBot; -import org.eclipse.swtbot.swt.finder.matchers.WidgetMatcherFactory; -import org.eclipse.swtbot.swt.finder.waits.Conditions; -import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable; -import org.eclipse.swtbot.swt.finder.widgets.SWTBotText; +import org.eclipse.swtbot.swt.finder.waits.ICondition; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; +import org.jboss.tools.openshift.ui.bot.util.OpenShiftUI; import org.jboss.tools.openshift.ui.bot.util.TestProperties; import org.jboss.tools.ui.bot.ext.SWTTestExt; -import org.jboss.tools.ui.bot.ext.gen.ActionItem; import org.jboss.tools.ui.bot.ext.types.IDELabel; import org.junit.Test; public class DeleteAppAS7 extends SWTTestExt { - @Test - public void deleteApplication() { - SWTBot wiz = open.newObject(ActionItem.NewObject.create("OpenShift", - "OpenShift Express Application")); - wiz.text(0).setText(TestProperties.getProperty("openshift.user.name")); - wiz.text(1).setText(TestProperties.getProperty("openshift.user.pwd")); - wiz.button(IDELabel.Button.NEXT).click(); - - SWTBotText domainText = bot.textInGroup("Domain", 0); - bot.waitUntil(Conditions.widgetIsEnabled(domainText)); - - SWTBotTable appTable = bot.tableInGroup("Available Applications"); + @Test + public void canDeleteApplication() { + projectExplorer.show(); + projectExplorer.bot().tree(0).contextMenu("Delete").click(); - appTable.select(TestProperties.getProperty("openshift.jbossapp.name")); + bot.waitForShell("Delete Resources"); + bot.checkBox().select(); + bot.button(IDELabel.Button.OK).click(); - bot.buttonInGroup(IDELabel.Button.DELETE, "Available Applications") - .click(); + assertFalse("The project still exists!", + projectExplorer.existsResource(TestProperties + .getProperty("openshift.jbossapp.name"))); - bot.waitUntilWidgetAppears(Conditions - .waitForWidget(WidgetMatcherFactory - .withLabel("You're up to delete all data within an application. " - + "The data may not be recovered. Are you sure that you want to delete application "+TestProperties.getProperty("openshift.jbossapp.name")+"?"))); + SWTBotView openshiftConsole = open.viewOpen(OpenShiftUI.Console.iView); - bot.button(IDELabel.Button.YES).click(); + SWTBot consoleBot = openshiftConsole.bot(); - bot.waitUntil(Conditions.widgetIsEnabled(appTable)); + SWTBotTreeItem account = consoleBot.tree() + .expandNode(TestProperties.getProperty("openshift.user.name")) + .doubleClick(); - assertFalse(appTable.containsItem(TestProperties - .getProperty("openshift.jbossapp.name"))); + account.getNode(0).contextMenu("Delete Application").click(); - deleteJenkins(); - - deleteLocalGitRepo(); - } + bot.waitForShell("Application deletion"); - /* - * Since the JBoss tooling doesn't remove app repos, we need to delete it - * manually - */ - private void deleteLocalGitRepo() { + bot.button(IDELabel.Button.OK).click(); +// TODO !!! + bot.waitWhile(new ICondition() { - String userHome = System.getProperty("user.home"); - String defaultGitLocation = userHome + "\\git\\" - + TestProperties.getProperty("openshift.jbossapp.name"); + private boolean deletionInvoked = false; - log.info("Removing " + defaultGitLocation); + @Override + public boolean test() throws Exception { - File gitDir = new File(defaultGitLocation); - if (gitDir.exists() && gitDir.isDirectory()) { - try { - doDelete(gitDir); - } catch (IOException e) { - log.error("Exception when trying to delete git repo!", e); - } - } + if (deletionInvoked && getJobs().size() == 0) { + return false; + } else { + return true; + } - } + } - private void doDelete(File path) throws IOException { - if (path.isDirectory()) { - for (File child : path.listFiles()) { - doDelete(child); - } - } - if (!path.delete()) { - throw new IOException("Could not delete " + path); - } - } + @Override + public void init(SWTBot bot) { + // Keep empty + } - private void deleteJenkins() { - SWTBotTable appTable = bot.tableInGroup("Available Applications"); + @Override + public String getFailureMessage() { + return "Deletion was not invoked in timeout."; + } - if (appTable.containsItem("jenkins")) { - appTable.select("jenkins"); + private List<Job> getJobs() { + List<Job> jobs = new ArrayList<Job>(); + for (Job job : Job.getJobManager().find(null)) { + if (Job.SLEEPING != job.getState()) { + jobs.add(job); - bot.buttonInGroup(IDELabel.Button.DELETE, "Available Applications") - .click(); + System.out.println("Job: " + job.getName()); - bot.waitUntilWidgetAppears(Conditions - .waitForWidget(WidgetMatcherFactory - .withLabel("You're up to delete all data within an application. " - + "The data may not be recovered. Are you sure that you want to delete application jbossapp?"))); + if (job.getName().contains("OpenShift")) { + System.out + .println("!!!!!!!!!!!FOUND ONE!!!!!!!!!!!!!"); + deletionInvoked = true; + } - bot.button(IDELabel.Button.YES).click(); + } + } + return jobs; + } + }, TIME_60S, TIME_1S); - bot.waitUntil(Conditions.widgetIsEnabled(appTable)); + /* + * TODO + * + * // delete jenkins if present if (account.getNode("jenkins") != null) + * { account.getNode("jenkins").contextMenu("Delete Application"); + * + * bot.waitForShell("Application deletion"); + * bot.button(IDELabel.Button.OK).click(); + * + * bot.waitUntil(new NonSystemJobRunsCondition()); } + */ + assertTrue("Application still present in the OpenShift Console view!", + account.getItems().length == 0); - assertFalse(appTable.containsItem("jenkins")); - } - } + } } Modified: trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/DestroyDomain.java =================================================================== --- trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/DestroyDomain.java 2012-03-07 13:36:34 UTC (rev 39334) +++ trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/DestroyDomain.java 2012-03-07 13:50:56 UTC (rev 39335) @@ -7,18 +7,21 @@ public class DestroyDomain extends SWTTestExt { - /* - * Since there is no way how to destroy a domain from JBoss Tools, we need - * to use OpenShift REST API to clean the account - */ - @Test - public void testDestroyDomain() { + /* + * Since there is no way how to destroy a domain from JBoss Tools, we need + * to use OpenShift REST API to clean the account + */ + @Test + public void canDestroyDomain() { - int resp_code = DomainDestroyer.destroyDomain( - TestProperties.getProperty("openshift.domain.new"), - TestProperties.getProperty("openshift.user.name"), - TestProperties.getProperty("openshift.user.pwd")); + // destroy domain + int resp_code = DomainDestroyer.destroyDomain( + TestProperties.getProperty("openshift.domain.new"), + TestProperties.getProperty("openshift.user.name"), + TestProperties.getProperty("openshift.user.pwd")); - assertTrue("Trying to destroy domain: HTTP Response code is not 200.", resp_code == 200); - } + assertTrue("Trying to destroy domain: HTTP Response code is not 200.", + resp_code == 200); + + } } Modified: trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/EmbeddCartrides.java =================================================================== --- trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/EmbeddCartrides.java 2012-03-07 13:36:34 UTC (rev 39334) +++ trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/EmbeddCartrides.java 2012-03-07 13:50:56 UTC (rev 39335) @@ -2,57 +2,82 @@ import java.util.StringTokenizer; -import org.eclipse.swtbot.swt.finder.matchers.WidgetMatcherFactory; -import org.eclipse.swtbot.swt.finder.waits.Conditions; +import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; +import org.jboss.tools.openshift.ui.bot.util.OpenShiftUI; import org.jboss.tools.openshift.ui.bot.util.TestProperties; import org.jboss.tools.ui.bot.ext.SWTTestExt; +import org.jboss.tools.ui.bot.ext.condition.NonSystemJobRunsCondition; import org.jboss.tools.ui.bot.ext.types.IDELabel; import org.junit.Test; public class EmbeddCartrides extends SWTTestExt { - @Test - public void embeddCartriges() { + @Test + public void canEmbeddCartriges() { - //TODO: be sure to have app selected - - bot.buttonInGroup("Edit", "Available Applications").click(); + SWTBotView openshiftConsole = open.viewOpen(OpenShiftUI.Console.iView); - // TODO: Doesn't work - bot.waitUntilWidgetAppears(Conditions - .waitForWidget(WidgetMatcherFactory - .withText("Embeddable Cartridges"))); + SWTBotTreeItem account = openshiftConsole.bot().tree() + .expandNode(TestProperties.getProperty("openshift.user.name")) + .doubleClick(); - StringTokenizer tokenizer = new StringTokenizer( - TestProperties.getProperty("openshift.jbossapp.cartridges"), - ";"); + account.getNode(0).contextMenu("Edit Embeddable Cartridges").click(); - SWTBotTable cartridgeTable = bot.tableInGroup("Embeddable Cartridges", - 0); + StringTokenizer tokenizer = new StringTokenizer( + TestProperties.getProperty("openshift.jbossapp.cartridges"), + ";"); - while (tokenizer.hasMoreTokens()) { - String cartridge = tokenizer.nextToken(); + bot.waitForShell(""); + + SWTBotTable cartridgeTable = bot.tableInGroup("Embeddable Cartridges"); - cartridgeTable.getTableItem(cartridge).click(); + selectCartridges(tokenizer, cartridgeTable); - if (cartridge.contains("jenkins")) { - bot.text(0).setText("jenkins"); - bot.button(IDELabel.Button.OK).click(); - bot.waitUntilWidgetAppears(Conditions - .waitForWidget(WidgetMatcherFactory - .withLabel(IDELabel.Button.OK))); - bot.button(IDELabel.Button.OK).click(); - } + bot.button(IDELabel.Button.FINISH).click(); - bot.button(IDELabel.Button.FINISH).click(); + bot.waitForShell("Embedded Cartridges"); + bot.button(IDELabel.Button.OK).click(); + } - bot.waitUntilWidgetAppears(Conditions - .waitForWidget(WidgetMatcherFactory - .withLabel(IDELabel.Button.OK))); - bot.button(IDELabel.Button.OK).click(); - } + private void selectCartridges(StringTokenizer tokenizer, + SWTBotTable cartridgeTable) { + + while (tokenizer.hasMoreTokens()) { - } + String cartridge = tokenizer.nextToken(); + System.out.println(cartridge); + if (cartridge.equals("jenkins")) { + cartridgeTable.getTableItem(OpenShiftUI.Cartridge.JENKINS).toggleCheck(); + bot.waitForShell("New Jenkins application"); + bot.text(0).setText("jenkins"); + bot.button(IDELabel.Button.OK).click(); + //bot.waitUntil(condition, timeout) + bot.waitUntil(new NonSystemJobRunsCondition(), 200); + } + if (cartridge.equals("mysql")) { + cartridgeTable.getTableItem(OpenShiftUI.Cartridge.MYSQL).toggleCheck(); + } + if (cartridge.equals("phpmyadmin")) { + cartridgeTable.getTableItem(OpenShiftUI.Cartridge.PHPMYADMIN).toggleCheck(); + } + if (cartridge.equals("cron")) { + cartridgeTable.getTableItem(OpenShiftUI.Cartridge.CRON).toggleCheck(); + } + if (cartridge.equals("postgresql")) { + cartridgeTable.getTableItem(OpenShiftUI.Cartridge.POSTGRESQL).toggleCheck(); + } + if (cartridge.equals("mongodb")) { + cartridgeTable.getTableItem(OpenShiftUI.Cartridge.MONGODB).toggleCheck(); + } + if (cartridge.equals("rockmongo")) { + cartridgeTable.getTableItem(OpenShiftUI.Cartridge.ROCKMONGO).toggleCheck(); + } + if (cartridge.equals("metrics")) { + cartridgeTable.getTableItem(OpenShiftUI.Cartridge.METRICS).toggleCheck(); + } + } + } } Deleted: trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/ImportRepublishAppASS7.java =================================================================== --- trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/ImportRepublishAppASS7.java 2012-03-07 13:36:34 UTC (rev 39334) +++ trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/ImportRepublishAppASS7.java 2012-03-07 13:50:56 UTC (rev 39335) @@ -1,63 +0,0 @@ -package org.jboss.tools.openshift.ui.bot.test; - -import org.eclipse.swtbot.swt.finder.SWTBot; -import org.eclipse.swtbot.swt.finder.waits.Conditions; -import org.eclipse.swtbot.swt.finder.widgets.SWTBotButton; -import org.jboss.tools.openshift.ui.bot.util.TestProperties; -import org.jboss.tools.ui.bot.ext.SWTTestExt; -import org.jboss.tools.ui.bot.ext.gen.ActionItem; -import org.jboss.tools.ui.bot.ext.types.IDELabel; -import org.junit.Test; - -public class ImportRepublishAppASS7 extends SWTTestExt { - - private void finishWizardAndImportApp() { - - bot.tableInGroup("Available Applications").select( - TestProperties.getProperty("openshift.jbossapp.name")); - - bot.button(IDELabel.Button.NEXT).click(); - - SWTBotButton finishButton = bot.button(IDELabel.Button.FINISH); - - bot.waitUntil(Conditions.widgetIsEnabled(finishButton)); - - finishButton.click(); - - // TODO: wait for new shell - bot.text(0).setText(TestProperties - .getProperty("openshift.ssh.passphrase")); - - bot.waitUntil(Conditions.shellCloses(bot.activeShell())); - - assertTrue("App is not in the Package Explorer!", - packageExplorer.existsResource(TestProperties - .getProperty("openshift.jbossapp.name"))); - } - - @Test - public void adapterIsCreated() { - finishWizardAndImportApp(); - - assertNotNull("App runtime not in the Servers View!", - servers.findServerByName(servers.show().bot().tree(), - TestProperties.getProperty("openshift.jbossapp.name"))); - } - - private void modifyApp() { - SWTBot wiz = open.newObject(ActionItem.NewObject.WebHTMLPage.LABEL); - wiz.text(1).setText("Test.html"); - wiz.button(IDELabel.Button.FINISH); - } - - @Test - public void republishApp() { - modifyApp(); - - servers.findServerByName(servers.show().bot().tree(), - TestProperties.getProperty("openshift.jbossapp.name")) - .select("Jon, Doe").contextMenu("Publish").click(); - - } - -} Modified: trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/OpenShiftAllBotTests.java =================================================================== --- trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/OpenShiftAllBotTests.java 2012-03-07 13:36:34 UTC (rev 39334) +++ trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/OpenShiftAllBotTests.java 2012-03-07 13:50:56 UTC (rev 39335) @@ -16,6 +16,8 @@ /** * <b>OpenShift SWTBot TestSuite</b> + * <br> + * This bot test will try to demonstrate a new OpenShift Express Application and domain life cycle. * * <br> * TestSuite covers following test cases : @@ -36,18 +38,20 @@ */ @SuiteClasses({ -CredentialsValidation.class, +ValidateCredentials.class, +SSHKeyManagement.class, CreateDomain.class, -SSHKeysManagment.class, +CreateAppAS7.class, +EmbeddCartrides.class, +RepublishAppASS7.class, RenameDomain.class, -CreateAppAS7.class, -EmbeddCartrides.class, -ImportRepublishAppASS7.class, DeleteAppAS7.class, DestroyDomain.class }) @RunWith(RequirementAwareSuite.class) public class OpenShiftAllBotTests { - // TODO: test republishing with selenium + /** + * Wrapper Suite class + */ } Modified: trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/RenameDomain.java =================================================================== --- trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/RenameDomain.java 2012-03-07 13:36:34 UTC (rev 39334) +++ trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/RenameDomain.java 2012-03-07 13:50:56 UTC (rev 39335) @@ -1,30 +1,54 @@ package org.jboss.tools.openshift.ui.bot.test; -import org.eclipse.swtbot.swt.finder.SWTBotTestCase; +import org.apache.commons.httpclient.HttpClient; +import org.apache.commons.httpclient.methods.GetMethod; +import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView; import org.eclipse.swtbot.swt.finder.waits.Conditions; import org.eclipse.swtbot.swt.finder.widgets.SWTBotText; +import org.jboss.tools.openshift.ui.bot.util.OpenShiftUI; import org.jboss.tools.openshift.ui.bot.util.TestProperties; +import org.jboss.tools.ui.bot.ext.SWTTestExt; +import org.jboss.tools.ui.bot.ext.types.IDELabel; import org.junit.Test; -public class RenameDomain extends SWTBotTestCase { +public class RenameDomain extends SWTTestExt { - @Test - public void domainRename() { + @Test + public void canRenameDomain() { - SWTBotText domainText = bot.textInGroup("Domain", 0); + SWTBotView openshiftConsole = open.viewOpen(OpenShiftUI.Console.iView); - bot.waitUntil(Conditions.widgetIsEnabled(domainText)); + openshiftConsole.bot().tree() + .getTreeItem(TestProperties.getProperty("openshift.user.name")) + .contextMenu("Create or Edit Domain").click(); - assertTrue( - "Domain should be set correctly at this stage!", - domainText.getText().equals( - TestProperties.getProperty("openshift.domain"))); + bot.waitForShell(""); + + SWTBotText domainText = bot.text(0); - domainText.setText(TestProperties.getProperty("openshift.domain.new")); + assertTrue( + "Domain should be set correctly at this stage!", + domainText.getText().equals( + TestProperties.getProperty("openshift.domain"))); - bot.button("Rename").click(); + domainText.setText(TestProperties.getProperty("openshift.domain.new")); - bot.waitUntil(Conditions.widgetIsEnabled(domainText)); - } + bot.button(IDELabel.Button.FINISH).click(); + bot.waitUntil(Conditions.shellCloses(bot.activeShell()), TIME_60S); + + HttpClient client = new HttpClient(); + GetMethod method = new GetMethod("https://" + + TestProperties.getProperty("openshift.jbossapp.name") + "-" + + TestProperties.getProperty("openshift.domain.new") + + ".rhcloud.com/Test.html"); + + try { + assertTrue(client.executeMethod(method) == 200); + } catch (Exception e) { + log.error("File has not been published to the server!", e); + } finally { + method.releaseConnection(); + } + } } Copied: trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/RepublishAppASS7.java (from rev 38080, trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/ImportRepublishAppASS7.java) =================================================================== --- trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/RepublishAppASS7.java (rev 0) +++ trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/RepublishAppASS7.java 2012-03-07 13:50:56 UTC (rev 39335) @@ -0,0 +1,59 @@ +package org.jboss.tools.openshift.ui.bot.test; + +import org.apache.commons.httpclient.HttpClient; +import org.apache.commons.httpclient.methods.GetMethod; +import org.eclipse.swtbot.swt.finder.SWTBot; +import org.jboss.tools.openshift.ui.bot.util.TestProperties; +import org.jboss.tools.ui.bot.ext.SWTTestExt; +import org.jboss.tools.ui.bot.ext.gen.ActionItem; +import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper; +import org.jboss.tools.ui.bot.ext.types.IDELabel; +import org.junit.Test; + +public class RepublishAppASS7 extends SWTTestExt { + + @Test + public void canModifyAndRepublishApp() { + SWTBot wiz = open.newObject(ActionItem.NewObject.WebHTMLPage.LABEL); + wiz.text(0).setText( + TestProperties.getProperty("openshift.jbossapp.name") + + "/src/main/webapp"); + wiz.text(1).setText("Test.html"); + + wiz.button(IDELabel.Button.FINISH).click(); + + projectExplorer.show(); + projectExplorer.bot().tree().select(0); + ContextMenuHelper.clickContextMenu(projectExplorer.bot().tree(), + "Team", "Commit and Push..."); + + bot.waitForShell("Commit Changes"); + bot.styledText(0).setText("comment"); + + bot.table().getTableItem(0).toggleCheck(); + //bot.toolbarButtonWithTooltip("Select All").click(); + + bot.button("Commit").click(); + + bot.waitForShell("Push to Another Repository"); + bot.button(IDELabel.Button.FINISH).click(); + + bot.waitForShell("Push Results: origin", 200); + bot.button(IDELabel.Button.OK).click(); + + HttpClient client = new HttpClient(); + GetMethod method = new GetMethod("https://" + + TestProperties.getProperty("openshift.jbossapp.name") + "-" + + TestProperties.getProperty("openshift.domain") + + ".rhcloud.com/Test.html"); + + try { + assertTrue(client.executeMethod(method) == 200); + } catch (Exception e) { + log.error("File has not been published to the server!", e); + } finally { + method.releaseConnection(); + } + } + +} Added: trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/SSHKeyManagement.java =================================================================== --- trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/SSHKeyManagement.java (rev 0) +++ trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/SSHKeyManagement.java 2012-03-07 13:50:56 UTC (rev 39335) @@ -0,0 +1,44 @@ +package org.jboss.tools.openshift.ui.bot.test; + +import org.eclipse.swt.widgets.Shell; +import org.eclipse.swt.widgets.Widget; +import org.eclipse.swtbot.eclipse.finder.matchers.WidgetMatcherFactory; +import org.eclipse.swtbot.swt.finder.waits.Conditions; +import org.hamcrest.Matcher; +import org.jboss.tools.openshift.ui.bot.util.TestProperties; +import org.jboss.tools.ui.bot.ext.SWTTestExt; +import org.jboss.tools.ui.bot.ext.types.IDELabel; +import org.junit.Test; + +public class SSHKeyManagement extends SWTTestExt { + + @Test + public void canCreateSSHKey() { + + bot.waitForShell("", 100); + + @SuppressWarnings("unchecked") + Matcher<Widget> matcher = WidgetMatcherFactory.allOf( + WidgetMatcherFactory.widgetOfType(Shell.class), + WidgetMatcherFactory.withText("")); + + bot.waitUntilWidgetAppears(Conditions.waitForWidget(matcher)); + + bot.link(0).click("SSH2 Preferences"); + bot.waitForShell(IDELabel.Shell.PREFERENCES); + + //SWTBotText sshDirText = bot.text(1); + //sshDirText.setText(System.getProperty("user.home") + "/.ssh2"); + + bot.button(IDELabel.Button.OK).click(); + bot.waitUntilWidgetAppears(Conditions.waitForWidget(matcher)); + + bot.button(IDELabel.Shell.NEW).click(); + bot.waitForShell("New ssh key"); + bot.text(0).setText(TestProperties.getPassphrase()); + bot.button(IDELabel.Button.OK).click(); + + bot.waitUntilWidgetAppears(Conditions.waitForWidget(matcher)); + } + +} Property changes on: trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/SSHKeyManagement.java ___________________________________________________________________ Added: svn:mime-type + text/plain Deleted: trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/SSHKeysManagment.java =================================================================== --- trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/SSHKeysManagment.java 2012-03-07 13:36:34 UTC (rev 39334) +++ trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/SSHKeysManagment.java 2012-03-07 13:50:56 UTC (rev 39335) @@ -1,31 +0,0 @@ -package org.jboss.tools.openshift.ui.bot.test; - -import org.eclipse.swtbot.swt.finder.matchers.WidgetMatcherFactory; -import org.eclipse.swtbot.swt.finder.waits.Conditions; -import org.eclipse.swtbot.swt.finder.widgets.SWTBotText; -import org.jboss.tools.ui.bot.ext.SWTTestExt; -import org.junit.Test; - -public class SSHKeysManagment extends SWTTestExt { - - @Test - public void addPrivateKey() { - - bot.waitUntilWidgetAppears(Conditions.waitForWidget(WidgetMatcherFactory - .withLabel("SSH Public Key"))); - - bot.link(0).click("SSH2 Preferences"); - //TODO: wait - - SWTBotText privateKeysText = bot.text(2); - - privateKeysText.setText(privateKeysText.getText() + ",libra_id_rsa"); - - bot.button("OK").click(); - - // TODO: repeat untilClosedActiveShell - due to HTTP 500 - - bot.button("Finish").click(); - } - -} Added: trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/ValidateCredentials.java =================================================================== --- trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/ValidateCredentials.java (rev 0) +++ trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/ValidateCredentials.java 2012-03-07 13:50:56 UTC (rev 39335) @@ -0,0 +1,76 @@ +package org.jboss.tools.openshift.ui.bot.test; + +import java.io.File; + +import org.eclipse.swtbot.swt.finder.SWTBot; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotButton; +import org.jboss.tools.openshift.ui.bot.util.OpenShiftUI; +import org.jboss.tools.openshift.ui.bot.util.TestProperties; +import org.jboss.tools.ui.bot.ext.SWTTestExt; +import org.jboss.tools.ui.bot.ext.condition.NonSystemJobRunsCondition; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; +import org.jboss.tools.ui.bot.ext.types.IDELabel; +import org.junit.Before; +import org.junit.Test; + +@Require(clearWorkspace = true) +public class ValidateCredentials extends SWTTestExt { + + @Before + public void prepareSSHPrefs() { + // clear dir from libra stuff + File sshDir = new File(System.getProperty("user.home") + "/.ssh"); + if (sshDir.exists() && sshDir.isDirectory() + && sshDir.listFiles().length > 0) { + for (File file : sshDir.listFiles()) { + if (file.getName().contains("libra")) + file.delete(); + } + } + + } + + @Test + public void canValidateCredentials() throws InterruptedException { + // create new OpenShift Express Application + SWTBot wiz = open.newObject(OpenShiftUI.NewApplication.iNewObject); + + // set wrong user credentials + wiz.text(0).setText(TestProperties.getProperty("openshift.user.name")); + wiz.text(1).setText( + TestProperties.getProperty("openshift.user.wrongpwd")); + + SWTBotButton nextButton = wiz.button(IDELabel.Button.NEXT); + // try to move forward + nextButton.click(); + + // wait for credentials validation + bot.waitUntil(new NonSystemJobRunsCondition()); + + assertFalse("Next > button shouldn't be enabled to move forward.", + nextButton.isEnabled()); + + // set correct user credentials and save it to secure storage + wiz.text(0).setText(TestProperties.getProperty("openshift.user.name")); + wiz.text(1).setText(TestProperties.getProperty("openshift.user.pwd")); + wiz.checkBox(0).select(); + + // move forward + nextButton.click(); + + storePasswordThenForward(); + + bot.waitForShell("", 100); + } + + /* + * give the secure storage password (will use the same as user's ssh + * passphrase) + */ + private void storePasswordThenForward() { + bot.waitForShell(IDELabel.Shell.SECURE_STORAGE); + bot.text(0).setText(TestProperties.getPassphrase()); + bot.button(IDELabel.Button.OK).click(); + } + +} Property changes on: trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/ValidateCredentials.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/util/DomainDestroyer.java =================================================================== --- trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/util/DomainDestroyer.java 2012-03-07 13:36:34 UTC (rev 39334) +++ trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/util/DomainDestroyer.java 2012-03-07 13:50:56 UTC (rev 39335) @@ -36,7 +36,7 @@ try { resp_code = client.executeMethod(method); } catch (Exception e) { - System.err.println(e); + System.out.println(e); } finally { method.releaseConnection(); } @@ -47,6 +47,10 @@ * @param args */ public static void main(String[] args) { - destroyDomain("rhtestdomain", "sbunciak", "rhtest123"); + if (destroyDomain("rhtest", "sbunciak", "rhtest123") == 200) { + System.out.println("Domain destroyed."); + } else { + System.out.println("Domain was not destroyed."); + } } } Added: trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/util/OpenShiftUI.java =================================================================== --- trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/util/OpenShiftUI.java (rev 0) +++ trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/util/OpenShiftUI.java 2012-03-07 13:50:56 UTC (rev 39335) @@ -0,0 +1,95 @@ +package org.jboss.tools.openshift.ui.bot.util; + +import java.util.List; +import java.util.Vector; + +import org.jboss.tools.ui.bot.ext.gen.INewObject; +import org.jboss.tools.ui.bot.ext.gen.IView; + +/** + * + * Wrapper class for OpenShift UI tooling. + * + * @author sbunciak + * + */ +public class OpenShiftUI { + + /** + * + * Class representing OpenShift Console View + * + */ + public static class Console { + + public static final IView iView = new IView() { + @Override + public String getName() { + return "OpenShift Express Console"; + } + + @Override + public List<String> getGroupPath() { + List<String> l = new Vector<String>(); + l.add("JBoss Tools"); + return l; + } + }; + } + + /** + * + * Class representing "navigation" to new OpenShift Express Application + * + */ + public static class NewApplication { + public static final INewObject iNewObject = new INewObject() { + @Override + public String getName() { + return "OpenShift Application"; + } + + @Override + public List<String> getGroupPath() { + List<String> l = new Vector<String>(); + l.add("OpenShift"); + return l; + } + }; + } + + /** + * List of available application type labels + * + * @author sbunciak + * + */ + public static class AppType { + + public static final String JBOSS = "jbossas-7"; + public static final String JENKINS = "jenkins-1.4"; + public static final String PERL = "perl-5.10"; + public static final String PHP = "php-5.3"; + public static final String PYTHON = "python-2.6"; + public static final String RAW = "raw-0.1"; + public static final String RUBY = "ruby-1.8"; + } + + /** + * List of available cartridge labels + * + * @author sbunciak + * + */ + public static class Cartridge { + + public static final String MONGODB = "mongodb-2.0"; + public static final String JENKINS = "jenkins-1.4"; + public static final String CRON = "cron-1.4"; + public static final String MYSQL = "mysql-5.1"; + public static final String POSTGRESQL = "postgresql-8.4"; + public static final String PHPMYADMIN = "phpmyadmin-3.4"; + public static final String METRICS = "metrics-0.1"; + public static final String ROCKMONGO = "rockmongo-1.1"; + } +} Property changes on: trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/util/OpenShiftUI.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/util/TestProperties.java =================================================================== --- trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/util/TestProperties.java 2012-03-07 13:36:34 UTC (rev 39334) +++ trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/util/TestProperties.java 2012-03-07 13:50:56 UTC (rev 39335) @@ -5,6 +5,7 @@ import java.io.IOException; import java.util.Properties; +import org.apache.commons.codec.binary.Base64; import org.apache.log4j.Logger; /** @@ -37,4 +38,10 @@ return props.getProperty(key); } + public static String getPassphrase() { + String passphrase = new String(new Base64().decode(TestProperties.getProperty( + "openshift.ssh.passphrase").getBytes())); + return passphrase; + } + }

13 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r39334 - trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext.

by jbosstools-commits＠lists.jboss.org

Author: jgargula Date: 2012-03-07 08:36:34 -0500 (Wed, 07 Mar 2012) New Revision: 39334 Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTBotExt.java Log: Fixed condition for disposed widget. Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTBotExt.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTBotExt.java 2012-03-07 11:53:30 UTC (rev 39333) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTBotExt.java 2012-03-07 13:36:34 UTC (rev 39334) @@ -244,13 +244,8 @@ for (int i = 0; i <= ATTEMPTS_TIMEOUT; i++) { for (SWTBotShell shell : shells()) { - try { - if (shellTitle.equals(shell.getText())) { - return shell; - } - } catch (WidgetNotFoundException wnfe) { - log.info("Waiting for shell: " + wnfe.getMessage()); - // do nothing more but continue in loop + if (!shell.widget.isDisposed() && shellTitle.equals(shell.getText())) { + return shell; } } if (i < ATTEMPTS_TIMEOUT) {

13 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r39333 - in branches/jbosstools-3.3.0.Beta1/vpe/plugins/org.jboss.tools.vpe.browsersim.browser: META-INF and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: yradtsevich Date: 2012-03-07 06:53:30 -0500 (Wed, 07 Mar 2012) New Revision: 39333 Modified: branches/jbosstools-3.3.0.Beta1/vpe/plugins/org.jboss.tools.vpe.browsersim.browser/ branches/jbosstools-3.3.0.Beta1/vpe/plugins/org.jboss.tools.vpe.browsersim.browser/META-INF/MANIFEST.MF Log: https://issues.jboss.org/browse/JBIDE-11047 : BrowserSim: the features should be disabled for 64-bit Java on 64-bit Windows - merged changeset 39167 with Beta1 Property changes on: branches/jbosstools-3.3.0.Beta1/vpe/plugins/org.jboss.tools.vpe.browsersim.browser ___________________________________________________________________ Added: svn:mergeinfo + /trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.browser:39169 Modified: branches/jbosstools-3.3.0.Beta1/vpe/plugins/org.jboss.tools.vpe.browsersim.browser/META-INF/MANIFEST.MF =================================================================== --- branches/jbosstools-3.3.0.Beta1/vpe/plugins/org.jboss.tools.vpe.browsersim.browser/META-INF/MANIFEST.MF 2012-03-07 11:51:01 UTC (rev 39332) +++ branches/jbosstools-3.3.0.Beta1/vpe/plugins/org.jboss.tools.vpe.browsersim.browser/META-INF/MANIFEST.MF 2012-03-07 11:53:30 UTC (rev 39333) @@ -8,3 +8,8 @@ Export-Package: org.jboss.tools.vpe.browsersim.browser Require-Bundle: org.eclipse.swt;bundle-version="3.7.0" Bundle-Vendor: JBoss by Red Hat +Eclipse-PlatformFilter: (| + (&(osgi.ws=win32)(osgi.os=win32)(osgi.arch=x86)) + (&(osgi.ws=cocoa)(osgi.os=macosx) (|(osgi.arch=x86)(osgi.arch=x86_64)) ) + (&(osgi.ws=gtk)(osgi.os=linux) (|(osgi.arch=x86)(osgi.arch=x86_64)) ) + )

13 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r39332 - in branches/jbosstools-3.3.0.Beta1/vpe/plugins/org.jboss.tools.vpe.browsersim: src/org/jboss/tools/vpe/browsersim/resources and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: yradtsevich Date: 2012-03-07 06:51:01 -0500 (Wed, 07 Mar 2012) New Revision: 39332 Added: branches/jbosstools-3.3.0.Beta1/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/resources/icons/ Modified: branches/jbosstools-3.3.0.Beta1/vpe/plugins/org.jboss.tools.vpe.browsersim/ branches/jbosstools-3.3.0.Beta1/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/BrowserSim.java Log: https://issues.jboss.org/browse/JBIDE-11045 : BrowserSim: set taskbar icon for application - merged changeset 39114 with Beta1 Property changes on: branches/jbosstools-3.3.0.Beta1/vpe/plugins/org.jboss.tools.vpe.browsersim ___________________________________________________________________ Added: svn:mergeinfo + /trunk/vpe/plugins/org.jboss.tools.vpe.browsersim:39114 Modified: branches/jbosstools-3.3.0.Beta1/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/BrowserSim.java =================================================================== --- branches/jbosstools-3.3.0.Beta1/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/BrowserSim.java 2012-03-07 07:13:28 UTC (rev 39331) +++ branches/jbosstools-3.3.0.Beta1/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/BrowserSim.java 2012-03-07 11:51:01 UTC (rev 39332) @@ -34,6 +34,7 @@ import org.eclipse.swt.events.MenuEvent; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.graphics.Image; import org.eclipse.swt.graphics.Point; import org.eclipse.swt.graphics.Rectangle; import org.eclipse.swt.program.Program; @@ -53,19 +54,21 @@ import org.jboss.tools.vpe.browsersim.model.DevicesListStorage; import org.jboss.tools.vpe.browsersim.model.SkinMap; import org.jboss.tools.vpe.browsersim.ui.skin.BrowserSimSkin; +import org.jboss.tools.vpe.browsersim.util.ResourcesUtil; /** * @author Yahor Radtsevich (yradtsevich) */ public class BrowserSim { private static final String DEFAULT_URL = "about:blank"; //"http://www.w3schools.com/js/tryit_view.asp?filename=try_nav_useragent"; //$NON-NLS-1$ + private static final String[] BROWSERSIM_ICONS = {"icons/browsersim_16px.png", "icons/browsersim_32px.png", "icons/browsersim_64px.png", "icons/browsersim_128px.png", "icons/browsersim_256px.png", }; //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$//$NON-NLS-4$//$NON-NLS-5$ private Display display; private String homeUrl; private DevicesListHolder devicesListHolder; private DeviceOrientation deviceOrientation; private BrowserSimSkin skin; -// private BrowserSimBrowser browser; private ControlHandler controlHandler; + private Image[] icons; public static void main(String[] args) { if (PlatformUtil.OS_MACOSX.equals(PlatformUtil.getOs())) { @@ -92,7 +95,7 @@ } Device defaultDevice = devicesList.getDevices().get(devicesList.getSelectedDeviceIndex()); Display display = new Display(); - BrowserSim browserSim = new BrowserSim(display, homeUrl); + BrowserSim browserSim = new BrowserSim(display, homeUrl); browserSim.initSkin(getSkinClass(defaultDevice, devicesList.getUseSkins())); browserSim.initDevicesListHolder(); browserSim.devicesListHolder.setDevicesList(devicesList); @@ -103,14 +106,28 @@ if (!display.readAndDispatch()) display.sleep(); } + browserSim.dispose(); display.dispose(); } public BrowserSim(Display display, String homeUrl) { this.display = display; this.homeUrl = homeUrl; + + this.icons = new Image[BROWSERSIM_ICONS.length]; + for (int i = 0; i < BROWSERSIM_ICONS.length; i++) { + String iconLocation = BROWSERSIM_ICONS[i]; + icons[i] = new Image(display, ResourcesUtil.getResourceAsStream(iconLocation)); + } } + private void dispose() { + for (Image icon : icons) { + icon.dispose(); + } + icons = null; + } + public void initSkin(Class<? extends BrowserSimSkin> skinClass) { try { skin = skinClass.newInstance();//new AppleIPhone3Skin();//new NativeSkin(); @@ -139,7 +156,7 @@ } } }); - shell.setText(Messages.BrowserSim_BROWSER_SIM); + setShellAttibutes(); BrowserSimBrowser browser = skin.getBrowser(); controlHandler = new ControlHandlerImpl(browser); @@ -231,6 +248,14 @@ } }); } + + private void setShellAttibutes() { + Shell shell = skin.getShell(); + if (shell != null) { + shell.setImages(icons); + shell.setText(Messages.BrowserSim_BROWSER_SIM); + } + } private void initDevicesListHolder() { devicesListHolder = new DevicesListHolder();

13 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r39331 - trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/jpa2/context/definition.

by jbosstools-commits＠lists.jboss.org

Author: dgeraskov Date: 2012-03-07 02:13:28 -0500 (Wed, 07 Mar 2012) New Revision: 39331 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/jpa2/context/definition/HibernateJavaIdMappingDefinition2_0.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/jpa2/context/definition/HibernateJavaManyToOneMappingDefinition2_0.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/jpa2/context/definition/HibernateJavaOneToOneMappingDefinition2_0.java Log: Added copyrigths Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/jpa2/context/definition/HibernateJavaIdMappingDefinition2_0.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/jpa2/context/definition/HibernateJavaIdMappingDefinition2_0.java 2012-03-07 06:11:23 UTC (rev 39330) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/jpa2/context/definition/HibernateJavaIdMappingDefinition2_0.java 2012-03-07 07:13:28 UTC (rev 39331) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2011-2012 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is 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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ package org.jboss.tools.hibernate.jpt.core.internal.jpa2.context.definition; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition; @@ -5,6 +15,11 @@ import org.eclipse.jpt.jpa.core.internal.context.java.JavaAttributeMappingDefinitionWrapper; import org.jboss.tools.hibernate.jpt.core.internal.context.definition.HibernateJavaIdMappingDefinition; +/** + * + * @author Dmitry Geraskov (geraskov(a)gmail.com) + * + */ public class HibernateJavaIdMappingDefinition2_0 extends JavaAttributeMappingDefinitionWrapper { private static final HibernateJavaIdMappingDefinition DELEGATE = HibernateJavaIdMappingDefinition.instance(); Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/jpa2/context/definition/HibernateJavaManyToOneMappingDefinition2_0.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/jpa2/context/definition/HibernateJavaManyToOneMappingDefinition2_0.java 2012-03-07 06:11:23 UTC (rev 39330) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/jpa2/context/definition/HibernateJavaManyToOneMappingDefinition2_0.java 2012-03-07 07:13:28 UTC (rev 39331) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2011-2012 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is 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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ package org.jboss.tools.hibernate.jpt.core.internal.jpa2.context.definition; import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable; @@ -8,6 +18,11 @@ import org.eclipse.jpt.jpa.core.resource.java.IdAnnotation; import org.jboss.tools.hibernate.jpt.core.internal.context.definition.HibernateJavaManyToOneMappingDefinition; +/** + * + * @author Dmitry Geraskov (geraskov(a)gmail.com) + * + */ public class HibernateJavaManyToOneMappingDefinition2_0 extends JavaAttributeMappingDefinitionWrapper { private static final JavaAttributeMappingDefinition DELEGATE = HibernateJavaManyToOneMappingDefinition.instance(); Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/jpa2/context/definition/HibernateJavaOneToOneMappingDefinition2_0.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/jpa2/context/definition/HibernateJavaOneToOneMappingDefinition2_0.java 2012-03-07 06:11:23 UTC (rev 39330) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/jpa2/context/definition/HibernateJavaOneToOneMappingDefinition2_0.java 2012-03-07 07:13:28 UTC (rev 39331) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2011-2012 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is 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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ package org.jboss.tools.hibernate.jpt.core.internal.jpa2.context.definition; import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable; @@ -8,6 +18,11 @@ import org.eclipse.jpt.jpa.core.resource.java.IdAnnotation; import org.jboss.tools.hibernate.jpt.core.internal.context.definition.HibernateJavaOneToOneMappingDefinition; +/** + * + * @author Dmitry Geraskov (geraskov(a)gmail.com) + * + */ public class HibernateJavaOneToOneMappingDefinition2_0 extends JavaAttributeMappingDefinitionWrapper { private static final JavaAttributeMappingDefinition DELEGATE = HibernateJavaOneToOneMappingDefinition.instance();

13 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r39330 - trunk/documentation/guides/GettingStartedGuide/en-US.

by jbosstools-commits＠lists.jboss.org

Author: irooskov(a)redhat.com Date: 2012-03-07 01:11:23 -0500 (Wed, 07 Mar 2012) New Revision: 39330 Modified: trunk/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml trunk/documentation/guides/GettingStartedGuide/en-US/Getting_Started_Guide.xml trunk/documentation/guides/GettingStartedGuide/en-US/getting_started.xml trunk/documentation/guides/GettingStartedGuide/en-US/gsg_faq.xml trunk/documentation/guides/GettingStartedGuide/en-US/project_examples.xml trunk/documentation/guides/GettingStartedGuide/en-US/rad_jsf_application.xml trunk/documentation/guides/GettingStartedGuide/en-US/usage_reporting.xml Log: updated with new qe fixes Modified: trunk/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml =================================================================== --- trunk/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml 2012-03-07 05:35:43 UTC (rev 39329) +++ trunk/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml 2012-03-07 06:11:23 UTC (rev 39330) @@ -8,7 +8,7 @@ <productname>JBoss Developer Studio</productname> <productnumber>5.0</productnumber> <edition>5.0.0</edition> -<pubsnumber>11</pubsnumber> +<pubsnumber>12</pubsnumber> <abstract> <para>The Getting Started Guide explains the JBoss Developer Studio.</para> </abstract> Modified: trunk/documentation/guides/GettingStartedGuide/en-US/Getting_Started_Guide.xml =================================================================== --- trunk/documentation/guides/GettingStartedGuide/en-US/Getting_Started_Guide.xml 2012-03-07 05:35:43 UTC (rev 39329) +++ trunk/documentation/guides/GettingStartedGuide/en-US/Getting_Started_Guide.xml 2012-03-07 06:11:23 UTC (rev 39330) @@ -18,7 +18,7 @@ <xi:include href="rad_jsf_application.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include> <xi:include href="project_examples.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include> <xi:include href="gsg_faq.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include> -<xi:include href="further_reading.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include> + <xi:include href="Feedback.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> <xi:include href="Revision_History.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include> </book> Modified: trunk/documentation/guides/GettingStartedGuide/en-US/getting_started.xml =================================================================== --- trunk/documentation/guides/GettingStartedGuide/en-US/getting_started.xml 2012-03-07 05:35:43 UTC (rev 39329) +++ trunk/documentation/guides/GettingStartedGuide/en-US/getting_started.xml 2012-03-07 06:11:23 UTC (rev 39330) @@ -143,7 +143,7 @@ </section> - <section id="OtherRelevantResourcesOnTheTopic33"> + </chapter> Modified: trunk/documentation/guides/GettingStartedGuide/en-US/gsg_faq.xml =================================================================== --- trunk/documentation/guides/GettingStartedGuide/en-US/gsg_faq.xml 2012-03-07 05:35:43 UTC (rev 39329) +++ trunk/documentation/guides/GettingStartedGuide/en-US/gsg_faq.xml 2012-03-07 06:11:23 UTC (rev 39330) @@ -115,14 +115,14 @@ </section> - <section id="question_2"> + <section id="question_3"> <title>I have an existing Seam 1.2.1 project. Can I migrate or import the project into a JBoss Developer Studio Seam project?</title> Modified: trunk/documentation/guides/GettingStartedGuide/en-US/project_examples.xml =================================================================== --- trunk/documentation/guides/GettingStartedGuide/en-US/project_examples.xml 2012-03-07 05:35:43 UTC (rev 39329) +++ trunk/documentation/guides/GettingStartedGuide/en-US/project_examples.xml 2012-03-07 06:11:23 UTC (rev 39330) @@ -38,7 +38,7 @@ <para> In oder to add a new project example you need to select the <property>User sites</property> option and press the <guibutton>Add</guibutton> button to the right. </para> - <para>When the <guibutton>Add</guibutton> button is pressed the <property>Add Project Example Site</property> dialog is displayed. The dialog contains two input fields: <property>Name</property>, where you need to specify the name of the new entry and <property>URL</property>,which has to point to the XML file that contains example project(s) properties. The structure of the XML file is discussed in more detail in a later chapter of this guide. Alternatively, if the XML is stored on your local machine, you can hit the <guibutton>Browse</guibutton> button to select the file in the file system.</para> + <para>When the <guibutton>Add</guibutton> button is pressed the <property>Add Project Example Site</property> dialog is displayed. The dialog contains two input fields: <property>Name</property>, where you need to specify the name of the new entry and <property>URL</property>,which has to point to the XML file that contains the example project properties. Alternatively, if the XML is stored on your local machine, you can hit the <guibutton>Browse</guibutton> button to select the file in the file system.</para> <para>Here is an example of the XML file that holds project example settings:</para> <programlisting role="XML"><![CDATA[<projects> Modified: trunk/documentation/guides/GettingStartedGuide/en-US/rad_jsf_application.xml =================================================================== --- trunk/documentation/guides/GettingStartedGuide/en-US/rad_jsf_application.xml 2012-03-07 05:35:43 UTC (rev 39329) +++ trunk/documentation/guides/GettingStartedGuide/en-US/rad_jsf_application.xml 2012-03-07 06:11:23 UTC (rev 39330) @@ -292,7 +292,7 @@ <section id="CreatingJavaBean"> <?dbhtml filename="CreatingJavaBean.html"?> - <title>Creating Java Bean</title> + <title>Creating a Java Bean</title> <para>In this section you'll learn how to create a Java bean that will hold business logic of our application.</para> <itemizedlist> <listitem> @@ -314,7 +314,7 @@ </itemizedlist> <programlisting role="JAVA"><![CDATA[Integer userNumber; ]]></programlisting> -<para>JBoss Developer Studio allows to quickly generate getters and setters for java bean.</para> +<para>JBoss Developer Studio allows for quick generation of getters and setters for java bean.</para> <itemizedlist> <listitem> <para>Right click the <filename>NumberBean.java</filename> file in the Package Explorer view</para> @@ -395,7 +395,7 @@ import javax.faces.application.FacesMessage; import java.util.ResourceBundle; ]]></programlisting> - <para>The whole java bean contain the following code:</para> + <para>The Java Bean contains the following code:</para> <programlisting role="JAVA"><![CDATA[package game; import javax.faces.context.FacesContext; Modified: trunk/documentation/guides/GettingStartedGuide/en-US/usage_reporting.xml =================================================================== --- trunk/documentation/guides/GettingStartedGuide/en-US/usage_reporting.xml 2012-03-07 05:35:43 UTC (rev 39329) +++ trunk/documentation/guides/GettingStartedGuide/en-US/usage_reporting.xml 2012-03-07 06:11:23 UTC (rev 39330) @@ -99,7 +99,7 @@ <term>Eclipse interface and version</term> <listitem> <para> - The <guilabel>Browser</guilabel> field has been modified to report the Eclipse interface and version being used. Sample returned values include: JBoss Developer Studio: 3.0.0 and JBoss Developer Studio: 3.0.1. + The <guilabel>Browser</guilabel> field has been modified to report the Eclipse interface and version being used. Sample returned values include: JBoss Developer Studio: 5.0.0 and JBoss Developer Studio: 5.0.1. </para> </listitem> </varlistentry> @@ -107,7 +107,7 @@ <term>Operating System</term> <listitem> <para> - The <guilabel>Operating System</guilabel> field reports the Operating System and its version that the product is running on (with Linux distribution version reporting conducted through the <guilabel>User Defined Value</guilabel> field). Sample returned values include: Linux, Macintosh 10.4, Macintosh 10.6, Windows XP and Windows 7. + The <guilabel>Operating System</guilabel> field reports the Operating System and its version that the product is running on (with Linux distribution version reporting conducted through the <guilabel>User Defined Value</guilabel> field). Sample returned values include: Linux, Macintosh 10.6, Macintosh 10.7 and Windows 7. </para> </listitem> </varlistentry> @@ -115,7 +115,7 @@ <term>Linux distribution version</term> <listitem> <para> - The <guilabel>User Defined Value</guilabel> field reports the distribution and version of Linux, if one is being used as the Operating System. Sample returned values include: Red Hat Enterprise Linux 5.4 and Fedora 13. + The <guilabel>User Defined Value</guilabel> field reports the distribution and version of Linux, if one is being used as the Operating System. Sample returned values include: Red Hat Enterprise Linux 6 and Fedora 16 </para> </listitem> </varlistentry> @@ -139,7 +139,7 @@ <term>Java version</term> <listitem> <para> - The <guilabel>Flash version</guilabel> field has been modified to report the Java version used. Sample returned values include: 1.6.0_20 and 1.5.0_9. + The <guilabel>Flash version</guilabel> field has been modified to report the Java version used. Sample returned values include: 1.6.0_20. </para> </listitem> </varlistentry>

13 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r39329 - trunk/build/target-platform.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2012-03-07 00:35:43 -0500 (Wed, 07 Mar 2012) New Revision: 39329 Modified: trunk/build/target-platform/jbds.target trunk/build/target-platform/multiple.target trunk/build/target-platform/unified.target Log: TP now has org.maven.ide.eclipse.wtp.feature.feature.group 0.15.2.20120306-2040 Modified: trunk/build/target-platform/jbds.target =================================================================== --- trunk/build/target-platform/jbds.target 2012-03-07 01:43:56 UTC (rev 39328) +++ trunk/build/target-platform/jbds.target 2012-03-07 05:35:43 UTC (rev 39329) @@ -18,7 +18,7 @@  <unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.0.100.20110804-1717"/> <unit id="org.eclipse.m2e.feature.feature.group" version="1.0.200.20111228-1245"/> - <unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.15.1.20120208-1300"/> + <unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.15.2.20120306-2040"/> <unit id="org.sonatype.m2e.mavenarchiver.feature.feature.group" version="0.15.0.201109290002"/> <unit id="ch.qos.logback.classic" version="0.9.27.v20110224-1110"/> <unit id="ch.qos.logback.core" version="0.9.27.v20110224-1110"/> Modified: trunk/build/target-platform/multiple.target =================================================================== --- trunk/build/target-platform/multiple.target 2012-03-07 01:43:56 UTC (rev 39328) +++ trunk/build/target-platform/multiple.target 2012-03-07 05:35:43 UTC (rev 39329) @@ -20,7 +20,7 @@  <unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.0.100.20110804-1717"/> <unit id="org.eclipse.m2e.feature.feature.group" version="1.0.200.20111228-1245"/> - <unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.15.1.20120208-1300"/> + <unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.15.2.20120306-2040"/> <unit id="org.sonatype.m2e.mavenarchiver.feature.feature.group" version="0.15.0.201109290002"/> <unit id="ch.qos.logback.classic" version="0.9.27.v20110224-1110"/> <unit id="ch.qos.logback.core" version="0.9.27.v20110224-1110"/> Modified: trunk/build/target-platform/unified.target =================================================================== --- trunk/build/target-platform/unified.target 2012-03-07 01:43:56 UTC (rev 39328) +++ trunk/build/target-platform/unified.target 2012-03-07 05:35:43 UTC (rev 39329) @@ -20,7 +20,7 @@  <unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.0.100.20110804-1717"/> <unit id="org.eclipse.m2e.feature.feature.group" version="1.0.200.20111228-1245"/> - <unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.15.1.20120208-1300"/> + <unit id="org.maven.ide.eclipse.wtp.feature.feature.group" version="0.15.2.20120306-2040"/> <unit id="org.sonatype.m2e.mavenarchiver.feature.feature.group" version="0.15.0.201109290002"/> <unit id="ch.qos.logback.classic" version="0.9.27.v20110224-1110"/> <unit id="ch.qos.logback.core" version="0.9.27.v20110224-1110"/>

13 years, 7 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits March 2012