JBoss Tools SVN: r24376 - in trunk/documentation/whatsnew/vpe: images and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2010-08-24 08:00:24 -0400 (Tue, 24 Aug 2010)
New Revision: 24376
Added:
trunk/documentation/whatsnew/vpe/images/3.2.0.M2/
trunk/documentation/whatsnew/vpe/images/3.2.0.M2/Import-Export.png
trunk/documentation/whatsnew/vpe/vpe-news-3.2.0.M2.html
Log:
https://jira.jboss.org/browse/JBIDE-6898 , N&N html file for VPE for 3.2.0.M2 was added.
Added: trunk/documentation/whatsnew/vpe/images/3.2.0.M2/Import-Export.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/vpe/images/3.2.0.M2/Import-Export.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/vpe/vpe-news-3.2.0.M2.html
===================================================================
--- trunk/documentation/whatsnew/vpe/vpe-news-3.2.0.M2.html (rev 0)
+++ trunk/documentation/whatsnew/vpe/vpe-news-3.2.0.M2.html 2010-08-24 12:00:24 UTC (rev 24376)
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!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 Visual Page Editor 3.2.0.M2</title>
+</head>
+<body>
+<h1>What's New Visual Page Editor 3.2.0.M2</h1>
+
+<p align="right">
+<a href="../index.html">< Main Index</a>
+<a href="../cdi/cdi-news-3.2.0.M2.html">CDI Tools ></a>
+</p>
+<table border="0" cellpadding="10" cellspacing="0" width="80%">
+ <tr>
+ <td colspan="2">
+ <hr />
+ <h3>General</h3>
+ <hr />
+ </td>
+ </tr>
+
+ <tr>
+ <td valign="top" align="left"><b>Import/Export for VPE visual templates</b></td>
+ <td valign="top">Now there are "Import" and "Export" buttons on the VPE Preference Pages that allow you to import/export templates quickly.
+ <p><img src="images/3.2.0.M2/Import-Export.png" alt="Import-Export" />
+ </p>
+ <p><small>
+ <a href="https://jira.jboss.org/jira/browse/JBIDE-6631">Related Jira</a>
+ </small></p>
+ </td>
+ </tr>
+
+ <tr>
+ <td valign="top" align="left"><b>Loren ipsum...</b></td>
+ <td valign="top">Loren ipsum...
+ <p><img src="images/3.2.0.M2/.png" alt="Loren ipsum..." />
+ </p>
+ <p><small>
+ <a href="https://jira.jboss.org/jira/browse/JBIDE-6631">Related Jira</a>
+ </small></p>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <hr />
+ <h3>Editor</h3>
+ <hr />
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left"><b>Loren ipsum...</b></td>
+ <td valign="top">Loren ipsum...
+ <p><img src="images/3.2.0.M2/.png" alt="Loren ipsum..." />
+ </p>
+ <p><small>
+ <a href="https://jira.jboss.org/jira/browse/JBIDE-6631">Related Jira</a>
+ </small></p>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <hr />
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2">
+ <hr />
+ <h3>Templates</h3>
+ <hr />
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left"><b>Loren ipsum...</b></td>
+ <td valign="top">Loren ipsum...
+ <p><img src="images/3.2.0.M2/.png" alt="Loren ipsum..." />
+ </p>
+ <p><small>
+ <a href="https://jira.jboss.org/jira/browse/JBIDE-6631">Related Jira</a>
+ </small></p>
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2">
+ <hr />
+ </td>
+ </tr>
+
+</table>
+</body>
+</html>
15 years, 4 months
JBoss Tools SVN: r24375 - in trunk/usage: tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-08-24 05:57:15 -0400 (Tue, 24 Aug 2010)
New Revision: 24375
Modified:
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsCookie.java
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsUrlStrategy.java
trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/IGoogleAnalyticsParameters.java
trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageIntegrationTest.java
Log:
[JBIDE-6881] added session cookies
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsCookie.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsCookie.java 2010-08-24 09:11:16 UTC (rev 24374)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsCookie.java 2010-08-24 09:57:15 UTC (rev 24375)
@@ -16,15 +16,15 @@
private CharSequence value;
private String identifier;
- private char delimiter;
+ private char[] delimiters;
- public GoogleAnalyticsCookie(String identifier, CharSequence value, char delimiter) {
+ public GoogleAnalyticsCookie(String identifier, CharSequence value, char... delimiters) {
Assert.isTrue(identifier != null && identifier.length() > 0);
Assert.isTrue(value != null && value.length() > 0);
this.identifier = identifier;
this.value = value;
- this.delimiter = delimiter;
+ this.delimiters = delimiters;
}
public GoogleAnalyticsCookie(String identifier, CharSequence value) {
@@ -35,7 +35,7 @@
builder.append(identifier)
.append(IGoogleAnalyticsParameters.EQUALS_SIGN)
.append(value);
- if (delimiter != (char) -1) {
+ for (char delimiter : delimiters) {
builder.append(delimiter);
}
}
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsUrlStrategy.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsUrlStrategy.java 2010-08-24 09:11:16 UTC (rev 24374)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/GoogleAnalyticsUrlStrategy.java 2010-08-24 09:57:15 UTC (rev 24375)
@@ -27,14 +27,16 @@
* @see <a
* href="http://code.google.com/apis/analytics/docs/concepts/gaConceptsCookies.htm...">Cookies
* Set By Google Analytics</a>
- *
- * @see <a href="http://www.morevisibility.com/analyticsblog/from-__utma-to-__utmz-google-...">From __utma to __utmz (Google Analytics Cookies)</a>
+ *
+ * @see <a
+ * href="http://www.morevisibility.com/analyticsblog/from-__utma-to-__utmz-google-...">From
+ * __utma to __utmz (Google Analytics Cookies)</a>
*/
public class GoogleAnalyticsUrlStrategy implements IURLBuildingStrategy {
private static final String TRACKING_URL = "http://www.google-analytics.com/__utm.gif";
-// private static final int VISITS = -1;
+ // private static final int VISITS = -1;
private IGoogleAnalyticsParameters googleParameters;
@@ -114,22 +116,32 @@
appendParameter(IGoogleAnalyticsParameters.PARAM_PAGE_REQUEST, focusPoint.getContentURI(), builder);
appendParameter(IGoogleAnalyticsParameters.PARAM_ACCOUNT_NAME, googleParameters.getAccountName(), builder);
- appendParameter(IGoogleAnalyticsParameters.PARAM_COOKIES, getCookies(focusPoint), builder);
+ appendParameter(IGoogleAnalyticsParameters.PARAM_COOKIES, getCookies(), builder);
appendParameter(IGoogleAnalyticsParameters.PARAM_GAQ, "1", false, builder);
googleParameters.visit();
-
+
return builder.toString();
}
- private String getCookies(FocusPoint focusPoint) {
+ /**
+ * Returns the google analytics cookies. These cookies determines user
+ * identity, session identity etc.
+ *
+ * @return the cookies
+ *
+ * @see <a
+ * href="http://www.analyticsexperts.com/google-analytics/information-about-the-ut...">Information
+ * about the utmLinker and the __utma, __utmb and __utmc cookies</a>
+ */
+ private String getCookies() {
StringBuilder builder = new StringBuilder();
/**
* unique visitor id cookie has to be unique per eclipse installation
*/
-// String timeStamp = "-1"; //String.valueOf(System.currentTimeMillis());
-
+ // String timeStamp = "-1";
+ // //String.valueOf(System.currentTimeMillis());
new GoogleAnalyticsCookie(IGoogleAnalyticsParameters.PARAM_COOKIES_UNIQUE_VISITOR_ID,
new StringBuilder().append("999.")
.append(googleParameters.getUserId()).append(IGoogleAnalyticsParameters.DOT)
@@ -141,13 +153,19 @@
IGoogleAnalyticsParameters.PLUS_SIGN)
.appendTo(builder);
- new GoogleAnalyticsCookie(IGoogleAnalyticsParameters.PARAM_COOKIES_REFERRAL_TYPE,
- new StringBuilder()
- .append("999.")
- .append(googleParameters.getFirstVisit())
- .append(IGoogleAnalyticsParameters.DOT)
- .append("1.1."))
- .appendTo(builder);
+ new GoogleAnalyticsCookie(IGoogleAnalyticsParameters.PARAM_COOKIES_SESSION,
+ new StringBuilder()
+ .append("1"),
+ IGoogleAnalyticsParameters.SEMICOLON
+ , IGoogleAnalyticsParameters.PLUS_SIGN)
+ .appendTo(builder);
+
+ new GoogleAnalyticsCookie(IGoogleAnalyticsParameters.PARAM_COOKIES_BROWSERSESSION,
+ new StringBuilder()
+ .append("1"),
+ IGoogleAnalyticsParameters.SEMICOLON
+ , IGoogleAnalyticsParameters.PLUS_SIGN)
+ .appendTo(builder);
new GoogleAnalyticsCookie(IGoogleAnalyticsParameters.PARAM_COOKIES_UTMCSR,
"(direct)",
@@ -160,14 +178,14 @@
.appendTo(builder);
new GoogleAnalyticsCookie(IGoogleAnalyticsParameters.PARAM_COOKIES_UTMCMD,
- "(none)",
+ "(none)",
IGoogleAnalyticsParameters.PIPE)
.appendTo(builder);
new GoogleAnalyticsCookie(IGoogleAnalyticsParameters.PARAM_COOKIES_KEYWORD,
googleParameters.getKeyword())
- .appendTo(builder);
-
+ .appendTo(builder);
+
builder.append(IGoogleAnalyticsParameters.SEMICOLON);
return EncodingUtils.checkedEncodeUtf8(builder.toString());
Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/IGoogleAnalyticsParameters.java
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/IGoogleAnalyticsParameters.java 2010-08-24 09:11:16 UTC (rev 24374)
+++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/IGoogleAnalyticsParameters.java 2010-08-24 09:57:15 UTC (rev 24375)
@@ -37,6 +37,8 @@
public static final String PARAM_HOST_NAME = "utmhn";
public static final String PARAM_COOKIES = "utmcc";
public static final String PARAM_COOKIES_UNIQUE_VISITOR_ID = "__utma";
+ public static final String PARAM_COOKIES_SESSION = "__utmb";
+ public static final String PARAM_COOKIES_BROWSERSESSION = "__utmc";
public static final String PARAM_REFERRAL = "utmr";
public static final String PARAM_TRACKING_CODE_VERSION = "utmwv";
@@ -50,7 +52,6 @@
public static final String PARAM_REPEAT_CAMPAIGN_VISIT = "utmcr";
public static final String PARAM_PAGE_TITLE = "utmdt";
public static final String PARAM_GAQ = "gaq";
- public static final String PARAM_COOKIES_REFERRAL_TYPE = "__utmz";
public static final String PARAM_COOKIES_UTMCSR = "utmcsr";
public static final String PARAM_COOKIES_UTMCCN = "utmccn";
public static final String PARAM_COOKIES_UTMCMD = "utmcmd";
Modified: trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageIntegrationTest.java
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageIntegrationTest.java 2010-08-24 09:11:16 UTC (rev 24374)
+++ trunk/usage/tests/org.jboss.tools.usage.test/src/org/jboss/tools/usage/test/JBossToolsUsageIntegrationTest.java 2010-08-24 09:57:15 UTC (rev 24375)
@@ -52,8 +52,8 @@
tracker = getTracker(getEclipseEnvironmentInstance());
tracker.trackSynchronously(focusPoint);
String newUserId = getUserId(tracker.getTrackingUrl());
+
assertTrue(newUserId != null);
-
assertEquals(userId, newUserId);
}
@@ -66,11 +66,11 @@
tracker = getTracker(createEclipseEnvironment());
FocusPoint focusPoint = createFocusPoint("testDifferentUserIdOnDifferentEclipseInstance"
- + +System.currentTimeMillis());
+ + System.currentTimeMillis());
tracker.trackSynchronously(focusPoint);
String newUserId = getUserId(tracker.getTrackingUrl());
+
assertTrue(newUserId != null);
-
assertTrue(!userId.equals(newUserId));
}
15 years, 4 months
JBoss Tools SVN: r24374 - trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext.
by jbosstools-commits＠lists.jboss.org
Author: jpeterka
Date: 2010-08-24 05:11:16 -0400 (Tue, 24 Aug 2010)
New Revision: 24374
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTJBTExt.java
Log:
#closeReportUsageWindowIfOpened() added
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTJBTExt.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTJBTExt.java 2010-08-24 07:07:14 UTC (rev 24373)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTJBTExt.java 2010-08-24 09:11:16 UTC (rev 24374)
@@ -492,4 +492,21 @@
return SWTJBTExt.getDefinedServerRuntimeVersion(bot,index);
}
+
+ /**
+ * Closes RH Report Usage Dialog if found
+ * @param cancel selecte if ok or cancel button is used
+ */
+public void closeReportUsageWindowIfOpened(boolean cancel) {
+ try {
+ bot.shell("Report usage").activate();
+ bot.button(
+ cancel ? IDELabel.Button.CANCEL
+ : IDELabel.Button.OK).click();
+ log.info("Report usage window closed");
+ } catch (WidgetNotFoundException wnfe) {
+ log.info("Report usage window didn't appear");
+ }
+
}
+}
Property changes on: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTJBTExt.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
15 years, 4 months
JBoss Tools SVN: r24373 - trunk/documentation/whatsnew/ws.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2010-08-24 03:07:14 -0400 (Tue, 24 Aug 2010)
New Revision: 24373
Added:
trunk/documentation/whatsnew/ws/ws-news-1.2.0.M2.html
Log:
https://jira.jboss.org/browse/JBIDE-6886 Webservices N&N page for M2 added
Added: trunk/documentation/whatsnew/ws/ws-news-1.2.0.M2.html
===================================================================
--- trunk/documentation/whatsnew/ws/ws-news-1.2.0.M2.html (rev 0)
+++ trunk/documentation/whatsnew/ws/ws-news-1.2.0.M2.html 2010-08-24 07:07:14 UTC (rev 24373)
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!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>WS Tools 3.2.0 M2 What's New</title>
+</head>
+<body>
+<h1>WS Tools 3.2.0 M1 What's New</h1>
+
+<p align="right"><a href="../index.html">< Main Index</a> <a href="../deltacloud/deltacloud-news-1.0.0.M2.html">Deltacloud Development Tools ></a></p>
+
+<table border="0" cellpadding="10" cellspacing="0" width="80%">
+
+ <tr>
+ <td colspan="2">
+ <hr/>
+ <h3>TBD: Category name</h3>
+ <hr/>
+ </td>
+ </tr>
+
+ <tr>
+ <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>TBD: Feature name</b></td>
+ <td valign="top">
+ TBD: Description
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2">
+
+ <hr/>
+ </td>
+ </tr>
+
+ <tr>
+ <td valign="top" align="right"><a name="itemname3"
+ id="itemname3"></a><b>TBD: Feture name</b></td>
+ <td valign="top">
+ TBD: Description
+ </td>
+ </tr>
+
+</table>
+
+</body>
+
+</html>
+
+
Property changes on: trunk/documentation/whatsnew/ws/ws-news-1.2.0.M2.html
___________________________________________________________________
Name: svn:mime-type
+ text/plain
15 years, 4 months
JBoss Tools SVN: r24372 - in trunk/documentation/whatsnew: gwt and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2010-08-23 20:39:19 -0400 (Mon, 23 Aug 2010)
New Revision: 24372
Added:
trunk/documentation/whatsnew/gwt/
trunk/documentation/whatsnew/gwt/gwt-news-1.0.0.M2.html
Log:
https://jira.jboss.org/browse/JBIDE-6889 GWT Integration Component Description in N&N
template page added
Added: trunk/documentation/whatsnew/gwt/gwt-news-1.0.0.M2.html
===================================================================
--- trunk/documentation/whatsnew/gwt/gwt-news-1.0.0.M2.html (rev 0)
+++ trunk/documentation/whatsnew/gwt/gwt-news-1.0.0.M2.html 2010-08-24 00:39:19 UTC (rev 24372)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!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>GWT Integration 1.0.0.M2 What's New</title>
+</head>
+<body>
+<h1>GWT Integration 1.0.0.M2 What's New</h1>
+
+<p align="right"><a href="../index.html">< Main Index</a></p>
+<table border="0" cellpadding="10" cellspacing="0" width="80%">
+ <tr>
+ <td colspan="2">
+ <hr />
+ <h3>General</h3>
+ <hr />
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left"><a name="itemname3" id="itemname3"></a><b>Deltacloud Tools</b></td>
+ <td valign="top">
+ <p>TBD: Description for GWT Integration functionality</p>
+ <p><small><a
+ href="#">Related Jira</a></small></p>
+ </td>
+ </tr>
+</table>
+
+</body>
+
+</html>
+
+
Property changes on: trunk/documentation/whatsnew/gwt/gwt-news-1.0.0.M2.html
___________________________________________________________________
Name: svn:mime-type
+ text/plain
15 years, 4 months
JBoss Tools SVN: r24371 - in trunk/documentation/whatsnew: deltacloud and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2010-08-23 20:35:50 -0400 (Mon, 23 Aug 2010)
New Revision: 24371
Added:
trunk/documentation/whatsnew/deltacloud/
trunk/documentation/whatsnew/deltacloud/deltacloud-news-1.0.0.M2.html
Log:
https://jira.jboss.org/browse/JBIDE-6888 Deltacloud Component description in N&N
template for component's N&N was added
Added: trunk/documentation/whatsnew/deltacloud/deltacloud-news-1.0.0.M2.html
===================================================================
--- trunk/documentation/whatsnew/deltacloud/deltacloud-news-1.0.0.M2.html (rev 0)
+++ trunk/documentation/whatsnew/deltacloud/deltacloud-news-1.0.0.M2.html 2010-08-24 00:35:50 UTC (rev 24371)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!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</title>
+</head>
+<body>
+<h1>Deltacloud Development Tools 1.0.0.M2 What's New</h1>
+
+<p align="right"><a href="../index.html">< Main Index</a> <a
+ href="../gwt/gwt-news-1.0.0.M2.html">GWT Integration ></a></p>
+<table border="0" cellpadding="10" cellspacing="0" width="80%">
+ <tr>
+ <td colspan="2">
+ <hr />
+ <h3>General</h3>
+ <hr />
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left"><a name="itemname3" id="itemname3"></a><b>Deltacloud Tools</b></td>
+ <td valign="top">
+ <p>TBD: Description for Delta Cloud Development Tools functionality</p>
+ <p><small><a
+ href="#">Related Jira</a></small></p>
+ </td>
+ </tr>
+</table>
+
+</body>
+
+</html>
+
+
Property changes on: trunk/documentation/whatsnew/deltacloud/deltacloud-news-1.0.0.M2.html
___________________________________________________________________
Name: svn:mime-type
+ text/plain
15 years, 4 months
JBoss Tools SVN: r24370 - trunk/documentation/whatsnew/core.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2010-08-23 20:02:37 -0400 (Mon, 23 Aug 2010)
New Revision: 24370
Added:
trunk/documentation/whatsnew/core/core-news-3.2.0.M2.html
Log:
https://jira.jboss.org/browse/JBIDE-6886 core N&N page for M2 added
Added: trunk/documentation/whatsnew/core/core-news-3.2.0.M2.html
===================================================================
--- trunk/documentation/whatsnew/core/core-news-3.2.0.M2.html (rev 0)
+++ trunk/documentation/whatsnew/core/core-news-3.2.0.M2.html 2010-08-24 00:02:37 UTC (rev 24370)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!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</title>
+</head>
+<body>
+<h1>What's New Core/General</h1>
+
+<p align="right"><a href="../index.html">< Main Index</a> <a
+ href="../hibernate/hibernate-news-3.4.0.M2.html">Hibernate Tools ></a></p>
+<table border="0" cellpadding="10" cellspacing="0" width="80%">
+ <tr>
+ <td colspan="2">
+ <hr />
+ <h3>General</h3>
+ <hr />
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left"><a name="itemname3" id="itemname3"></a><b>Usage Reporting</b></td>
+ <td valign="top">
+ <p>TBD: Description for Usage Reporting functionality</p>
+ <p><small><a
+ href="https://jira.jboss.org/browse/JBIDE-6376">Related Jira</a></small></p>
+ </td>
+ </tr>
+</table>
+
+</body>
+
+</html>
+
+
Property changes on: trunk/documentation/whatsnew/core/core-news-3.2.0.M2.html
___________________________________________________________________
Name: svn:mime-type
+ text/plain
15 years, 4 months
JBoss Tools SVN: r24369 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core: src/org/jboss/tools/deltacloud/core and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: jjohnstn
Date: 2010-08-23 18:41:25 -0400 (Mon, 23 Aug 2010)
New Revision: 24369
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Instance.java
Log:
2010-08-23 Jeff Johnston <jjohnstn(a)redhat.com>
* src/org/jboss/tools/deltacloud/core/client/Instance.java (getKey): New method.
(setKey): Ditto.
* src/org/jboss/tools/deltacloud/core/DeltaCloud.java (getCurrInstances): Fix to
call getInstances if there aren't any instances yet.
(getCurrImages): New method.
(refreshInstance): Pass any instance key into the new instance.
(getImages): Synchronize on imageLock.
(loadChildren): New method that loads the children in a thread.
(createInstance): Save the key if generated into the instance.
* src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java (getKey): New method.
* src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java (loadClouds): Ditto.
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2010-08-23 22:38:22 UTC (rev 24368)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2010-08-23 22:41:25 UTC (rev 24369)
@@ -1,3 +1,17 @@
+2010-08-23 Jeff Johnston <jjohnstn(a)redhat.com>
+
+ * src/org/jboss/tools/deltacloud/core/client/Instance.java (getKey): New method.
+ (setKey): Ditto.
+ * src/org/jboss/tools/deltacloud/core/DeltaCloud.java (getCurrInstances): Fix to
+ call getInstances if there aren't any instances yet.
+ (getCurrImages): New method.
+ (refreshInstance): Pass any instance key into the new instance.
+ (getImages): Synchronize on imageLock.
+ (loadChildren): New method that loads the children in a thread.
+ (createInstance): Save the key if generated into the instance.
+ * src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java (getKey): New method.
+ * src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java (loadClouds): Ditto.
+
2010-08-20 Jeff Johnston <jjohnstn(a)redhat.com>
* src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java (DCNS): Add KEYS.
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java 2010-08-23 22:38:22 UTC (rev 24368)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java 2010-08-23 22:41:25 UTC (rev 24369)
@@ -29,7 +29,9 @@
private String type;
private DeltaCloudClient client;
private ArrayList<DeltaCloudInstance> instances;
+ private ArrayList<DeltaCloudImage> images;
private Map<String, String> keys = new HashMap<String, String>();
+ private Object imageLock = new Object();
ListenerList instanceListeners = new ListenerList();
ListenerList imageListeners = new ListenerList();
@@ -78,6 +80,19 @@
return type;
}
+ public void loadChildren() {
+ Thread t = new Thread(new Runnable() {
+
+ @Override
+ public void run() {
+ getImages();
+ getInstances();
+ }
+
+ });
+ t.start();
+ }
+
public void addInstanceListListener(IInstanceListListener listener) {
instanceListeners.add(listener);
}
@@ -124,6 +139,8 @@
}
public DeltaCloudInstance[] getCurrInstances() {
+ if (instances == null)
+ return getInstances();
DeltaCloudInstance[] instanceArray = new DeltaCloudInstance[instances.size()];
instanceArray = instances.toArray(instanceArray);
return instanceArray;
@@ -156,6 +173,7 @@
for (int i = 0; i < instances.size(); ++i) {
DeltaCloudInstance inst = instances.get(i);
if (inst.getId().equals(instanceId)) {
+ instance.setKey(inst.getKey());
// FIXME: remove BOGUS state when server fixes state problems
if (!(instance.getState().equals(DeltaCloudInstance.BOGUS)) && !(inst.getState().equals(instance.getState()))) {
instances.set(i, retVal);
@@ -199,19 +217,34 @@
}
public DeltaCloudImage[] getImages() {
- ArrayList<DeltaCloudImage> images = new ArrayList<DeltaCloudImage>();
- try {
- List<Image> list = client.listImages();
- for (Iterator<Image> i = list.iterator(); i.hasNext();) {
- DeltaCloudImage image = new DeltaCloudImage(i.next());
- images.add(image);
+ synchronized (imageLock) {
+ images = new ArrayList<DeltaCloudImage>();
+ try {
+ List<Image> list = client.listImages();
+ for (Iterator<Image> i = list.iterator(); i.hasNext();) {
+ DeltaCloudImage image = new DeltaCloudImage(i.next());
+ images.add(image);
+ }
+ } catch (DeltaCloudClientException e) {
+ Activator.log(e);
}
- } catch (DeltaCloudClientException e) {
- Activator.log(e);
+ DeltaCloudImage[] imageArray = new DeltaCloudImage[images.size()];
+ imageArray = images.toArray(imageArray);
+ notifyImageListListeners(imageArray);
+ return imageArray;
}
- return images.toArray(new DeltaCloudImage[images.size()]);
}
+ public DeltaCloudImage[] getCurrImages() {
+ synchronized(imageLock) {
+ if (images == null)
+ return getImages();
+ DeltaCloudImage[] imageArray = new DeltaCloudImage[images.size()];
+ imageArray = images.toArray(imageArray);
+ return imageArray;
+ }
+ }
+
public boolean testConnection() {
String instanceId = "madeupValue"; //$NON-NLS-1$
try {
@@ -246,6 +279,7 @@
if (DeltaCloudInstance.EC2_TYPE.equals(type)) {
client.createKey(keyname, Activator.getDefault().getStateLocation());
instance = client.createInstance(imageId, profileId, realmId, name, keyname, memory, storage);
+ instance.setKey(keyname);
keys.put(instance.getId(), keyname);
} else {
instance = client.createInstance(imageId, profileId, realmId, name, memory, storage);
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java 2010-08-23 22:38:22 UTC (rev 24368)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java 2010-08-23 22:41:25 UTC (rev 24369)
@@ -51,6 +51,10 @@
return instance.getState().toString();
}
+ public String getKey() {
+ return instance.getKey();
+ }
+
public List<String> getActions() {
return instance.getActionNames();
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java 2010-08-23 22:38:22 UTC (rev 24368)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java 2010-08-23 22:41:25 UTC (rev 24369)
@@ -63,6 +63,7 @@
try {
password = node.get("password", null); //$NON-NLS-1$
DeltaCloud cloud = new DeltaCloud(name, url, username, password, type, false);
+ cloud.loadChildren();
clouds.add(cloud);
} catch (Exception e1) {
Activator.log(e1);
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Instance.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Instance.java 2010-08-23 22:38:22 UTC (rev 24368)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Instance.java 2010-08-23 22:41:25 UTC (rev 24369)
@@ -31,6 +31,8 @@
private String realmId;
+ private String keyname;
+
@XmlElement
private State state;
@@ -99,6 +101,14 @@
}
}
+ public void setKey(String keyname) {
+ this.keyname = keyname;
+ }
+
+ public String getKey() {
+ return keyname;
+ }
+
@SuppressWarnings("unused")
private void setPrivateAddresses(AddressList privateAddresses)
{
15 years, 4 months
JBoss Tools SVN: r24368 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui: src/org/jboss/tools/deltacloud/ui and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: jjohnstn
Date: 2010-08-23 18:38:22 -0400 (Mon, 23 Aug 2010)
New Revision: 24368
Added:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVImagesCategoryElement.java
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/DeltaCloudPerspective.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVCategoryElement.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVCloudElement.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVInstancesCategoryElement.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudView.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/ImageView.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/ImageViewLabelAndContentProvider.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java
Log:
2010-08-23 Jeff Johnston <jjohnstn(a)redhat.com>
* src/org/jboss/tools/deltacloud/ui/views/CVImagesCategoryElement.java: New file.
* src/org/jboss/tools/deltacloud/ui/DeltaCloudPerspective.java (createInitialLayout): Add Images
view.
* src/org/jboss/tools/deltacloud/ui/views/CVCategoryElement.java (getChildren): Return
super getChildren.
* src/org/jboss/tools/deltacloud/ui/views/CVCloudElement.java (getChildren):
(loadChildren): New method that runs a thread to load instances and images.
* src/org/jboss/tools/deltacloud/ui/views/CVInstancesCategoryElement.java (getChildren): Use
getCurrInstances method of cloud instead of getInstances.
* src/org/jboss/tools/deltacloud/ui/views/DeltaCloudView.java (fillLocalPullDown): Don't enable
the remove cloud and refresh cloud unless item selected.
(.run): Change refresh action to refresh the cloud, not whole view.
* src/org/jboss/tools/deltacloud/ui/views/ImageView.java:
(makeActions): Add refresh view action and remove double click action.
(fillLocalPullDown): Add refresh view action.
* src/org/jboss/tools/deltacloud/ui/views/ImageViewLabelAndContentProvider.java (inputChanged): Call
getCurrImages rather than getImages method of DeltaCloud.
* src/org/jboss/tools/deltacloud/ui/views/InstanceView.java (.run): Add RSE action.
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-08-23 22:16:03 UTC (rev 24367)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-08-23 22:38:22 UTC (rev 24368)
@@ -1,3 +1,24 @@
+2010-08-23 Jeff Johnston <jjohnstn(a)redhat.com>
+
+ * src/org/jboss/tools/deltacloud/ui/views/CVImagesCategoryElement.java: New file.
+ * src/org/jboss/tools/deltacloud/ui/DeltaCloudPerspective.java (createInitialLayout): Add Images
+ view.
+ * src/org/jboss/tools/deltacloud/ui/views/CVCategoryElement.java (getChildren): Return
+ super getChildren.
+ * src/org/jboss/tools/deltacloud/ui/views/CVCloudElement.java (getChildren):
+ (loadChildren): New method that runs a thread to load instances and images.
+ * src/org/jboss/tools/deltacloud/ui/views/CVInstancesCategoryElement.java (getChildren): Use
+ getCurrInstances method of cloud instead of getInstances.
+ * src/org/jboss/tools/deltacloud/ui/views/DeltaCloudView.java (fillLocalPullDown): Don't enable
+ the remove cloud and refresh cloud unless item selected.
+ (.run): Change refresh action to refresh the cloud, not whole view.
+ * src/org/jboss/tools/deltacloud/ui/views/ImageView.java:
+ (makeActions): Add refresh view action and remove double click action.
+ (fillLocalPullDown): Add refresh view action.
+ * src/org/jboss/tools/deltacloud/ui/views/ImageViewLabelAndContentProvider.java (inputChanged): Call
+ getCurrImages rather than getImages method of DeltaCloud.
+ * src/org/jboss/tools/deltacloud/ui/views/InstanceView.java (.run): Add RSE action.
+
2010-08-20 Jeff Johnston <jjohnstn(a)redhat.com>
* src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnection.java (performFinish): Store the
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/DeltaCloudPerspective.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/DeltaCloudPerspective.java 2010-08-23 22:16:03 UTC (rev 24367)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/DeltaCloudPerspective.java 2010-08-23 22:38:22 UTC (rev 24368)
@@ -13,6 +13,8 @@
0.80f, IPageLayout.ID_EDITOR_AREA);
layout.addView("org.jboss.tools.deltacloud.ui.views.InstanceView", IPageLayout.BOTTOM,
0.80f, IPageLayout.ID_EDITOR_AREA);
+ layout.addView("org.jboss.tools.deltacloud.ui.views.ImageView", IPageLayout.BOTTOM,
+ 0.80f, IPageLayout.ID_EDITOR_AREA);
}
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVCategoryElement.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVCategoryElement.java 2010-08-23 22:16:03 UTC (rev 24367)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVCategoryElement.java 2010-08-23 22:38:22 UTC (rev 24368)
@@ -1,10 +1,8 @@
package org.jboss.tools.deltacloud.ui.views;
import org.eclipse.ui.views.properties.IPropertySource;
-import org.jboss.tools.deltacloud.core.DeltaCloud;
-import org.jboss.tools.deltacloud.core.DeltaCloudImage;
-public class CVCategoryElement extends CloudViewElement {
+public abstract class CVCategoryElement extends CloudViewElement {
public final static int INSTANCES = 0;
public final static int IMAGES = 1;
@@ -19,18 +17,6 @@
@Override
public Object[] getChildren() {
- if (!initialized) {
- DeltaCloud cloud = (DeltaCloud)getElement();
- if (type == IMAGES) {
- DeltaCloudImage[] images = cloud.getImages();
- for (int i = 0; i < images.length; ++i) {
- DeltaCloudImage d = images[i];
- CVImageElement element = new CVImageElement(d, d.getName());
- addChild(element);
- }
- initialized = true;
- }
- }
return super.getChildren();
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVCloudElement.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVCloudElement.java 2010-08-23 22:16:03 UTC (rev 24367)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVCloudElement.java 2010-08-23 22:38:22 UTC (rev 24368)
@@ -32,8 +32,8 @@
DeltaCloud cloud = (DeltaCloud)getElement();
CVCategoryElement c1 = new CVInstancesCategoryElement(cloud, CVMessages.getString(INSTANCE_CATEGORY_NAME),
viewer);
- CVCategoryElement c2 = new CVCategoryElement(cloud, CVMessages.getString(IMAGE_CATEGORY_NAME),
- CVCategoryElement.IMAGES);
+ CVCategoryElement c2 = new CVImagesCategoryElement(cloud, CVMessages.getString(IMAGE_CATEGORY_NAME),
+ viewer);
addChild(c1);
addChild(c2);
}
@@ -46,4 +46,8 @@
return new CloudPropertySource(getElement());
}
+ public void loadChildren() {
+ DeltaCloud cloud = (DeltaCloud)getElement();
+ cloud.loadChildren();
+ }
}
Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVImagesCategoryElement.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVImagesCategoryElement.java (rev 0)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVImagesCategoryElement.java 2010-08-23 22:38:22 UTC (rev 24368)
@@ -0,0 +1,63 @@
+package org.jboss.tools.deltacloud.ui.views;
+
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.swt.widgets.Display;
+import org.jboss.tools.deltacloud.core.DeltaCloud;
+import org.jboss.tools.deltacloud.core.DeltaCloudImage;
+import org.jboss.tools.deltacloud.core.IImageListListener;
+
+public class CVImagesCategoryElement extends CVCategoryElement implements IImageListListener {
+
+ private Viewer viewer;
+ private CVImagesCategoryElement category;
+
+ public CVImagesCategoryElement(Object element, String name, Viewer viewer) {
+ super(element, name, CVCategoryElement.INSTANCES);
+ this.viewer = viewer;
+ DeltaCloud cloud = (DeltaCloud)getElement();
+ cloud.addImageListListener(this);
+ this.category = this;
+ }
+
+ protected void finalize() throws Throwable {
+ DeltaCloud cloud = (DeltaCloud)getElement();
+ cloud.removeImageListListener(this);
+ super.finalize();
+ }
+
+ @Override
+ public Object[] getChildren() {
+ if (!initialized) {
+ DeltaCloud cloud = (DeltaCloud)getElement();
+ cloud.removeImageListListener(this);
+ DeltaCloudImage[] images = cloud.getCurrImages();
+ for (int i = 0; i < images.length; ++i) {
+ DeltaCloudImage d = images[i];
+ CVImageElement element = new CVImageElement(d, d.getName());
+ addChild(element);
+ }
+ initialized = true;
+ cloud.addImageListListener(this);
+ }
+ return super.getChildren();
+ }
+
+ @Override
+ public void listChanged(DeltaCloudImage[] images) {
+ clearChildren();
+ for (int i = 0; i < images.length; ++i) {
+ DeltaCloudImage d = images[i];
+ CVImageElement element = new CVImageElement(d, d.getName());
+ addChild(element);
+ }
+ initialized = true;
+ Display.getDefault().asyncExec(new Runnable() {
+ @Override
+ public void run() {
+ ((TreeViewer)viewer).refresh(category, false);
+ }
+ });
+ }
+
+}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVInstancesCategoryElement.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVInstancesCategoryElement.java 2010-08-23 22:16:03 UTC (rev 24367)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVInstancesCategoryElement.java 2010-08-23 22:38:22 UTC (rev 24368)
@@ -31,7 +31,7 @@
if (!initialized) {
DeltaCloud cloud = (DeltaCloud)getElement();
cloud.removeInstanceListListener(this);
- DeltaCloudInstance[] instances = cloud.getInstances();
+ DeltaCloudInstance[] instances = cloud.getCurrInstances();
for (int i = 0; i < instances.length; ++i) {
DeltaCloudInstance d = instances[i];
CVInstanceElement element = new CVInstanceElement(d, d.getName());
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudView.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudView.java 2010-08-23 22:16:03 UTC (rev 24367)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudView.java 2010-08-23 22:38:22 UTC (rev 24368)
@@ -27,7 +27,6 @@
import org.eclipse.ui.part.ViewPart;
import org.eclipse.ui.views.properties.IPropertySheetPage;
import org.eclipse.ui.views.properties.tabbed.ITabbedPropertySheetPageContributor;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
import org.jboss.tools.deltacloud.core.DeltaCloud;
import org.jboss.tools.deltacloud.core.DeltaCloudImage;
import org.jboss.tools.deltacloud.core.DeltaCloudManager;
@@ -128,6 +127,12 @@
private void fillLocalPullDown(IMenuManager manager) {
manager.add(removeCloud);
+ IStructuredSelection selection = (IStructuredSelection) viewer.getSelection();
+ CloudViewElement element = (CloudViewElement)selection.getFirstElement();
+ if (element == null)
+ removeCloud.setEnabled(false);
+ else
+ removeCloud.setEnabled(true);
manager.add(refreshAction);
}
@@ -197,7 +202,15 @@
refreshAction = new Action() {
public void run() {
- viewer.setInput(new CVRootElement(viewer));
+ ISelection selection = viewer.getSelection();
+ Object obj = ((IStructuredSelection)selection).getFirstElement();
+ if (obj instanceof CloudViewElement) {
+ CloudViewElement element = (CloudViewElement)obj;
+ while (!(element instanceof CVCloudElement))
+ element = (CloudViewElement)element.getParent();
+ CVCloudElement cloud = (CVCloudElement)element;
+ cloud.loadChildren();
+ }
}
};
refreshAction.setText(CVMessages.getString(REFRESH));
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/ImageView.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/ImageView.java 2010-08-23 22:16:03 UTC (rev 24367)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/ImageView.java 2010-08-23 22:38:22 UTC (rev 24368)
@@ -6,11 +6,8 @@
import org.eclipse.jface.action.IToolBarManager;
import org.eclipse.jface.action.MenuManager;
import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.layout.TableColumnLayout;
import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.IStructuredSelection;
@@ -37,6 +34,7 @@
import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.TableColumn;
import org.eclipse.ui.IActionBars;
+import org.eclipse.ui.ISharedImages;
import org.eclipse.ui.IWorkbenchActionConstants;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.part.ViewPart;
@@ -51,6 +49,7 @@
private final static String CLOUD_SELECTOR_LABEL = "CloudSelector.label"; //$NON-NLS-1$
private final static String LAUNCH_INSTANCE = "CreateInstance.label"; //$NON-NLS-1$
+ private static final String REFRESH = "Refresh.label"; //$NON-NLS-1$
private TableViewer viewer;
private Composite container;
@@ -63,7 +62,7 @@
private ImageViewLabelAndContentProvider contentProvider;
- private Action doubleClickAction;
+ private Action refreshAction;
private Action launchAction;
private ImageView parentView;
@@ -206,7 +205,6 @@
PlatformUI.getWorkbench().getHelpSystem().setHelp(viewer.getControl(), "org.jboss.tools.deltacloud.ui.viewer");
makeActions();
hookContextMenu();
- hookDoubleClickAction();
hookSelection();
contributeToActionBars();
@@ -247,7 +245,7 @@
}
private void fillLocalPullDown(IMenuManager manager) {
- //TODO
+ manager.add(refreshAction);
}
private void fillContextMenu(IMenuManager manager) {
@@ -261,13 +259,25 @@
}
private void makeActions() {
- doubleClickAction = new Action() {
+ refreshAction = new Action() {
public void run() {
- ISelection selection = viewer.getSelection();
- Object obj = ((IStructuredSelection)selection).getFirstElement();
- showMessage("Double-click detected on "+obj.toString());
+ Thread t = new Thread(new Runnable() {
+
+ @Override
+ public void run() {
+ if (currCloud != null) {
+ currCloud.getImages();
+ }
+ }
+
+ });
+ t.start();
}
};
+ refreshAction.setText(CVMessages.getString(REFRESH));
+ refreshAction.setToolTipText(CVMessages.getString(REFRESH));
+ refreshAction.setImageDescriptor(PlatformUI.getWorkbench().getSharedImages().
+ getImageDescriptor(ISharedImages.IMG_TOOL_REDO));
launchAction = new Action() {
public void run() {
@@ -293,21 +303,6 @@
launchAction.setToolTipText(CVMessages.getString(LAUNCH_INSTANCE));
}
- private void hookDoubleClickAction() {
- viewer.addDoubleClickListener(new IDoubleClickListener() {
- public void doubleClick(DoubleClickEvent event) {
- doubleClickAction.run();
- }
- });
- }
-
- private void showMessage(String message) {
- MessageDialog.openInformation(
- viewer.getControl().getShell(),
- CVMessages.getString("CloudViewName"), //$NON-NLS-1$
- message);
- }
-
@Override
public void setFocus() {
// TODO Auto-generated method stub
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/ImageViewLabelAndContentProvider.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/ImageViewLabelAndContentProvider.java 2010-08-23 22:16:03 UTC (rev 24367)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/ImageViewLabelAndContentProvider.java 2010-08-23 22:38:22 UTC (rev 24368)
@@ -74,7 +74,7 @@
images = (DeltaCloudImage[])newInput;
} else {
cloud = (DeltaCloud)newInput;
- images = cloud.getImages();
+ images = cloud.getCurrImages();
}
}
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java 2010-08-23 22:16:03 UTC (rev 24367)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java 2010-08-23 22:38:22 UTC (rev 24368)
@@ -24,8 +24,9 @@
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.rse.core.IRSECoreRegistry;
import org.eclipse.rse.core.IRSESystemType;
-import org.eclipse.rse.core.model.IHost;
+import org.eclipse.rse.core.RSECorePlugin;
import org.eclipse.rse.core.model.ISystemRegistry;
import org.eclipse.rse.core.model.SystemStartHere;
import org.eclipse.swt.SWT;
@@ -469,7 +470,21 @@
DeltaCloudInstance instance = (DeltaCloudInstance)((IStructuredSelection)selection).getFirstElement();
String hostname = instance.getHostName();
ISystemRegistry registry = SystemStartHere.getSystemRegistry();
+ RSECorePlugin rsep = RSECorePlugin.getDefault();
+ IRSECoreRegistry coreRegistry = rsep.getCoreRegistry();
+ IRSESystemType[] sysTypes = coreRegistry.getSystemTypes();
+ IRSESystemType sshType = null;
+ for (IRSESystemType sysType : sysTypes) {
+ if (sysType.getId().equals(IRSESystemType.SYSTEMTYPE_SSH_ONLY_ID))
+ sshType = sysType;
+ }
String connectionName = instance.getName() + " [" + instance.getId() + "]"; //$NON-NLS-1$ //$NON-NLS-2$
+ try {
+ registry.createHost(sshType, connectionName, hostname, null);
+ } catch (Exception e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
}
};
rseAction.setText(CVMessages.getString(RSE_LABEL));
15 years, 4 months
JBoss Tools SVN: r24367 - in trunk: vpe/tests/org.jboss.tools.vpe.jsp.test and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2010-08-23 18:16:03 -0400 (Mon, 23 Aug 2010)
New Revision: 24367
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.html.test/build.properties
trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/build.properties
trunk/vpe/tests/org.jboss.tools.vpe.test/build.properties
trunk/ws/plugins/org.jboss.tools.ws.core/build.properties
trunk/ws/tests/org.jboss.tools.ws.core.test/build.properties
Log:
fix for class not found exceptions during test execution in uberbuilder for plug-ins: vpe.html.test, vpe.jsp.test, vpe.test, ws.core, ws.test
Modified: trunk/vpe/tests/org.jboss.tools.vpe.html.test/build.properties
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/build.properties 2010-08-23 18:43:31 UTC (rev 24366)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/build.properties 2010-08-23 22:16:03 UTC (rev 24367)
@@ -1,7 +1,8 @@
bin.includes = META-INF/,\
resources/,\
plugin.xml,\
- plugin.properties
+ plugin.properties,\
+ .
src.includes = META-INF/,\
build.properties,\
src/,\
Modified: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/build.properties
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/build.properties 2010-08-23 18:43:31 UTC (rev 24366)
+++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/build.properties 2010-08-23 22:16:03 UTC (rev 24367)
@@ -1,7 +1,8 @@
bin.includes = META-INF/,\
plugin.xml,\
resources/,\
- plugin.properties
+ plugin.properties,\
+ .
jars.compile.order = .
src.includes = META-INF/,\
build.properties,\
Modified: trunk/vpe/tests/org.jboss.tools.vpe.test/build.properties
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.test/build.properties 2010-08-23 18:43:31 UTC (rev 24366)
+++ trunk/vpe/tests/org.jboss.tools.vpe.test/build.properties 2010-08-23 22:16:03 UTC (rev 24367)
@@ -4,7 +4,8 @@
templates/,\
scheme/,\
plugin.properties,\
- plugin.xml
+ plugin.xml,\
+ .
src.includes = META-INF/,\
build.properties,\
src/,\
Modified: trunk/ws/plugins/org.jboss.tools.ws.core/build.properties
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.core/build.properties 2010-08-23 18:43:31 UTC (rev 24366)
+++ trunk/ws/plugins/org.jboss.tools.ws.core/build.properties 2010-08-23 22:16:03 UTC (rev 24367)
@@ -1,7 +1,8 @@
-source.. = src/
-output.. = bin/
bin.includes = META-INF/,\
- .,\
plugin.xml,\
plugin.properties,\
- about.html
+ about.html,\
+ .
+jars.compile.order = .
+source.. = src/
+output.. = bin/
Modified: trunk/ws/tests/org.jboss.tools.ws.core.test/build.properties
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.core.test/build.properties 2010-08-23 18:43:31 UTC (rev 24366)
+++ trunk/ws/tests/org.jboss.tools.ws.core.test/build.properties 2010-08-23 22:16:03 UTC (rev 24367)
@@ -1,5 +1,6 @@
bin.includes = META-INF/,\
- plugin.properties
+ plugin.properties,\
+ .
jars.compile.order = .
source.. = src/
output.. = bin/
15 years, 4 months
