JBoss Tools SVN: r39019 - trunk/build/parent.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-02-22 17:35:14 -0500 (Wed, 22 Feb 2012)
New Revision: 39019
Modified:
trunk/build/parent/pom.xml
Log:
add reminder to update associate.properties files when reqs mirror changes (JBIDE-11004)
Modified: trunk/build/parent/pom.xml
===================================================================
--- trunk/build/parent/pom.xml 2012-02-22 22:30:17 UTC (rev 39018)
+++ trunk/build/parent/pom.xml 2012-02-22 22:35:14 UTC (rev 39019)
@@ -51,6 +51,7 @@
<local.composite>file:///home/hudson/static_build_env/jbds/builds/staging/_composite_/trunk/</local.composite>
<!-- 3a. URL of latest JBT requirements composite mirror -->
+ <!-- TODO: don't forget to update this in ../aggregate/*/associate.properties too (5 files)! -->
<jboss-requirements-composite-mirror>http://download.jboss.org/jbosstools/updates/indigo/SR1-M/</jboss-requirements-composite-mirror>
<!-- 3b., or use -Plocal.requirements -Dlocal.requirements=file:///path/to/mirror/of/composite/requirements/site -->
12 years, 7 months
JBoss Tools SVN: r39018 - in branches/jbosstools-3.3.0.Beta1/build/aggregate: site and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-02-22 17:30:17 -0500 (Wed, 22 Feb 2012)
New Revision: 39018
Modified:
branches/jbosstools-3.3.0.Beta1/build/aggregate/bottests-site/site/associate.properties
branches/jbosstools-3.3.0.Beta1/build/aggregate/site/associate.properties
branches/jbosstools-3.3.0.Beta1/build/aggregate/site/sources/associate.properties
branches/jbosstools-3.3.0.Beta1/build/aggregate/soa-site/associate.properties
branches/jbosstools-3.3.0.Beta1/build/aggregate/webtools-site/associate.properties
Log:
associate sites should point to correct requirements mirror so that eGit 1.2 (and newer reqs) can be found when installing (https://issues.jboss.org/browse/JBIDE-11004)
Modified: branches/jbosstools-3.3.0.Beta1/build/aggregate/bottests-site/site/associate.properties
===================================================================
--- branches/jbosstools-3.3.0.Beta1/build/aggregate/bottests-site/site/associate.properties 2012-02-22 22:25:42 UTC (rev 39017)
+++ branches/jbosstools-3.3.0.Beta1/build/aggregate/bottests-site/site/associate.properties 2012-02-22 22:30:17 UTC (rev 39018)
@@ -4,4 +4,4 @@
#update.site.version=3.2.0.M2.2010-07-16_13-26-18-H21
# associate sites to add to the resulting repo
-associate.sites=http://download.jboss.org/jbosstools/updates/indigo/SR1/,http://download.jboss.org/jbosstools/updates/development/indigo/,http://dl.google.com/eclipse/plugin/3.7/
+associate.sites=http://download.jboss.org/jbosstools/updates/indigo/SR1-M/,http://download.jboss.org/jbosstools/updates/development/indigo/,http://dl.google.com/eclipse/plugin/3.7/
Modified: branches/jbosstools-3.3.0.Beta1/build/aggregate/site/associate.properties
===================================================================
--- branches/jbosstools-3.3.0.Beta1/build/aggregate/site/associate.properties 2012-02-22 22:25:42 UTC (rev 39017)
+++ branches/jbosstools-3.3.0.Beta1/build/aggregate/site/associate.properties 2012-02-22 22:30:17 UTC (rev 39018)
@@ -4,4 +4,4 @@
#update.site.version=3.2.0.M2.2010-07-16_13-26-18-H21
# associate sites to add to the resulting repo
-associate.sites=http://download.jboss.org/jbosstools/updates/indigo/SR1/,http://dl.google.com/eclipse/plugin/3.7/
+associate.sites=http://download.jboss.org/jbosstools/updates/indigo/SR1-M/,http://dl.google.com/eclipse/plugin/3.7/
Modified: branches/jbosstools-3.3.0.Beta1/build/aggregate/site/sources/associate.properties
===================================================================
--- branches/jbosstools-3.3.0.Beta1/build/aggregate/site/sources/associate.properties 2012-02-22 22:25:42 UTC (rev 39017)
+++ branches/jbosstools-3.3.0.Beta1/build/aggregate/site/sources/associate.properties 2012-02-22 22:30:17 UTC (rev 39018)
@@ -4,4 +4,4 @@
#update.site.version=3.2.0.M2.2010-07-16_13-26-18-H21
# associate sites to add to the resulting repo
-associate.sites=http://download.jboss.org/jbosstools/updates/indigo/SR1/,http://download.jboss.org/jbosstools/updates/development/indigo/,http://dl.google.com/eclipse/plugin/3.7/
+associate.sites=http://download.jboss.org/jbosstools/updates/indigo/SR1-M/,http://download.jboss.org/jbosstools/updates/development/indigo/,http://dl.google.com/eclipse/plugin/3.7/
Modified: branches/jbosstools-3.3.0.Beta1/build/aggregate/soa-site/associate.properties
===================================================================
--- branches/jbosstools-3.3.0.Beta1/build/aggregate/soa-site/associate.properties 2012-02-22 22:25:42 UTC (rev 39017)
+++ branches/jbosstools-3.3.0.Beta1/build/aggregate/soa-site/associate.properties 2012-02-22 22:30:17 UTC (rev 39018)
@@ -4,4 +4,4 @@
#update.site.version=3.2.0.M2.2010-07-16_13-26-18-H21
# associate sites to add to the resulting repo
-associate.sites=http://download.jboss.org/jbosstools/updates/indigo/SR1/,http://download.jboss.org/jbosstools/updates/development/indigo/
+associate.sites=http://download.jboss.org/jbosstools/updates/indigo/SR1-M/,http://download.jboss.org/jbosstools/updates/development/indigo/
Modified: branches/jbosstools-3.3.0.Beta1/build/aggregate/webtools-site/associate.properties
===================================================================
--- branches/jbosstools-3.3.0.Beta1/build/aggregate/webtools-site/associate.properties 2012-02-22 22:25:42 UTC (rev 39017)
+++ branches/jbosstools-3.3.0.Beta1/build/aggregate/webtools-site/associate.properties 2012-02-22 22:30:17 UTC (rev 39018)
@@ -4,4 +4,4 @@
#update.site.version=3.2.0.M2.2010-07-16_13-26-18-H21
# associate sites to add to the resulting repo
-associate.sites=http://download.jboss.org/jbosstools/updates/indigo/SR1/,http://download.jboss.org/jbosstools/updates/development/indigo/
+associate.sites=http://download.jboss.org/jbosstools/updates/indigo/SR1-M/,http://download.jboss.org/jbosstools/updates/development/indigo/
12 years, 7 months
JBoss Tools SVN: r39017 - in trunk/build/aggregate: site and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-02-22 17:25:42 -0500 (Wed, 22 Feb 2012)
New Revision: 39017
Modified:
trunk/build/aggregate/bottests-site/site/associate.properties
trunk/build/aggregate/site/associate.properties
trunk/build/aggregate/site/sources/associate.properties
trunk/build/aggregate/soa-site/associate.properties
trunk/build/aggregate/webtools-site/associate.properties
Log:
associate sites should point to correct requirements mirror so that eGit 1.2 (and newer reqs) can be found when installing (https://issues.jboss.org/browse/JBIDE-11004)
Modified: trunk/build/aggregate/bottests-site/site/associate.properties
===================================================================
--- trunk/build/aggregate/bottests-site/site/associate.properties 2012-02-22 21:52:01 UTC (rev 39016)
+++ trunk/build/aggregate/bottests-site/site/associate.properties 2012-02-22 22:25:42 UTC (rev 39017)
@@ -4,4 +4,4 @@
#update.site.version=3.2.0.M2.2010-07-16_13-26-18-H21
# associate sites to add to the resulting repo
-associate.sites=http://download.jboss.org/jbosstools/updates/indigo/SR1/,http://download.jboss.org/jbosstools/updates/development/indigo/,http://dl.google.com/eclipse/plugin/3.7/
+associate.sites=http://download.jboss.org/jbosstools/updates/indigo/SR1-M/,http://download.jboss.org/jbosstools/updates/development/indigo/,http://dl.google.com/eclipse/plugin/3.7/
Modified: trunk/build/aggregate/site/associate.properties
===================================================================
--- trunk/build/aggregate/site/associate.properties 2012-02-22 21:52:01 UTC (rev 39016)
+++ trunk/build/aggregate/site/associate.properties 2012-02-22 22:25:42 UTC (rev 39017)
@@ -4,4 +4,4 @@
#update.site.version=3.2.0.M2.2010-07-16_13-26-18-H21
# associate sites to add to the resulting repo
-associate.sites=http://download.jboss.org/jbosstools/updates/indigo/SR1/,http://dl.google.com/eclipse/plugin/3.7/
+associate.sites=http://download.jboss.org/jbosstools/updates/indigo/SR1-M/,http://dl.google.com/eclipse/plugin/3.7/
Modified: trunk/build/aggregate/site/sources/associate.properties
===================================================================
--- trunk/build/aggregate/site/sources/associate.properties 2012-02-22 21:52:01 UTC (rev 39016)
+++ trunk/build/aggregate/site/sources/associate.properties 2012-02-22 22:25:42 UTC (rev 39017)
@@ -4,4 +4,4 @@
#update.site.version=3.2.0.M2.2010-07-16_13-26-18-H21
# associate sites to add to the resulting repo
-associate.sites=http://download.jboss.org/jbosstools/updates/indigo/SR1/,http://download.jboss.org/jbosstools/updates/development/indigo/,http://dl.google.com/eclipse/plugin/3.7/
+associate.sites=http://download.jboss.org/jbosstools/updates/indigo/SR1-M/,http://download.jboss.org/jbosstools/updates/development/indigo/,http://dl.google.com/eclipse/plugin/3.7/
Modified: trunk/build/aggregate/soa-site/associate.properties
===================================================================
--- trunk/build/aggregate/soa-site/associate.properties 2012-02-22 21:52:01 UTC (rev 39016)
+++ trunk/build/aggregate/soa-site/associate.properties 2012-02-22 22:25:42 UTC (rev 39017)
@@ -4,4 +4,4 @@
#update.site.version=3.2.0.M2.2010-07-16_13-26-18-H21
# associate sites to add to the resulting repo
-associate.sites=http://download.jboss.org/jbosstools/updates/indigo/SR1/,http://download.jboss.org/jbosstools/updates/development/indigo/
+associate.sites=http://download.jboss.org/jbosstools/updates/indigo/SR1-M/,http://download.jboss.org/jbosstools/updates/development/indigo/
Modified: trunk/build/aggregate/webtools-site/associate.properties
===================================================================
--- trunk/build/aggregate/webtools-site/associate.properties 2012-02-22 21:52:01 UTC (rev 39016)
+++ trunk/build/aggregate/webtools-site/associate.properties 2012-02-22 22:25:42 UTC (rev 39017)
@@ -4,4 +4,4 @@
#update.site.version=3.2.0.M2.2010-07-16_13-26-18-H21
# associate sites to add to the resulting repo
-associate.sites=http://download.jboss.org/jbosstools/updates/indigo/SR1/,http://download.jboss.org/jbosstools/updates/development/indigo/
+associate.sites=http://download.jboss.org/jbosstools/updates/indigo/SR1-M/,http://download.jboss.org/jbosstools/updates/development/indigo/
12 years, 7 months
JBoss Tools SVN: r39016 - in trunk/documentation/whatsnew/ws: images and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: bfitzpat
Date: 2012-02-22 16:52:01 -0500 (Wed, 22 Feb 2012)
New Revision: 39016
Added:
trunk/documentation/whatsnew/ws/.project
trunk/documentation/whatsnew/ws/images/JAX-RS-WS-Tester.jpg
trunk/documentation/whatsnew/ws/images/JAX-RS-WS-Tester_Run_As.jpg
trunk/documentation/whatsnew/ws/images/WSDL-WS-Tester.jpg
trunk/documentation/whatsnew/ws/images/WSDL-WS-Tester_WSMenu.jpg
trunk/documentation/whatsnew/ws/ws-news-1.2.2.Beta1.html
Log:
[JBIDE-10368] Created first draft of the WS-related N&N for 3.3 beta1
Added: trunk/documentation/whatsnew/ws/.project
===================================================================
--- trunk/documentation/whatsnew/ws/.project (rev 0)
+++ trunk/documentation/whatsnew/ws/.project 2012-02-22 21:52:01 UTC (rev 39016)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>ws</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ </buildSpec>
+ <natures>
+ </natures>
+</projectDescription>
Property changes on: trunk/documentation/whatsnew/ws/.project
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/documentation/whatsnew/ws/images/JAX-RS-WS-Tester.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/ws/images/JAX-RS-WS-Tester.jpg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/ws/images/JAX-RS-WS-Tester_Run_As.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/ws/images/JAX-RS-WS-Tester_Run_As.jpg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/ws/images/WSDL-WS-Tester.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/ws/images/WSDL-WS-Tester.jpg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/ws/images/WSDL-WS-Tester_WSMenu.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/ws/images/WSDL-WS-Tester_WSMenu.jpg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/ws/ws-news-1.2.2.Beta1.html
===================================================================
--- trunk/documentation/whatsnew/ws/ws-news-1.2.2.Beta1.html (rev 0)
+++ trunk/documentation/whatsnew/ws/ws-news-1.2.2.Beta1.html 2012-02-22 21:52:01 UTC (rev 39016)
@@ -0,0 +1,115 @@
+<?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.3.0 Beta1 What's New</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>WS tools 3.3.0 Beta1 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>Web Service Tester</h3>
+ <hr/>
+ </td>
+ </tr>
+
+ <tr>
+
+ <td valign="top" align="right"><a name="itemname1"
+ id="itemname1"></a><b>Better Tooling Integration - JAX-RS</b></td>
+ <td valign="top">
+
+ <p>We recently had an opportunity to add some better shortcuts to get to the Web Service Tester from common access points in the UI.</p>
+
+ <p>Most importantly to go with our AS7 support, we now have right-click integration with the JAX-RS tooling for RESTful services. Now you can right-click on one of the exposed REST methods implemented by the service and select Run As...->Run on Server.</p>
+ <img src="./images/JAX-RS-WS-Tester_Run_As.jpg" style="width : 826px; height : 287px;"/>
+ <p>This does three things:</p>
+ <ol><li>If the Web Service Tester isn't open, it will open it in the current perspective.</li>
+ <li>It allows you to select which runtime to deploy the service to (and specify a default for future runs).</li>
+ <li>And it automatically sets the URL for the RESTful operation as well as the method drop-down to match. For instance, if you are testing a GET method, it will set the drop-down to GET. A PUT to a PUT, etc. So all you have to do is click the Invoke button on the toolbar (the little green play button) to execute the operation.</li>
+ </ol>
+
+ <p>A couple of caveats:</p>
+ <ul><li>If you need to specify a request header (for instance, setting the request to use an XML content type - "content-type=application/xml"), it doesn't know to do this automatically.</li>
+ <li>The JAX-RS tooling doesn't know how to interpret some configuration options, such as Servlet Mapping Prefixes, but this support is coming soon. </li>
+ </ul>
+
+ <img src="./images/JAX-RS-WS-Tester.jpg" style="width : 826px; height : 287px;"/>
+
+ <p><small><a href="https://jira.jboss.org/browse/JBIDE-10609">Related Jira</a></small></p>
+ </td>
+ </tr>
+ </tr>
+
+ <tr>
+ <td colspan="2">
+ <hr/>
+ </td>
+ </tr>
+
+ <tr>
+ <td valign="top" align="right"><a name="itemname2"
+ id="itemname2"></a><b>Partial WSDL file integration</b></td>
+ <td valign="top">
+ <p>In addition, you can now right-click on a WSDL and select Web Services -> Test in JBoss Web Service Tester. This action does two things:</p>
+ <ol><li>If the Web Service Tester isn't open, it will open the view in the current perspective.</li>
+ <li>And it automatically sets the URL for the WSDL file as well as the method drop-down to "JAX-WS". So all you have to do is click the Invoke button on the toolbar (the little green play button) to specify which port/operation combination you want to test with.</li></ol>
+ <img src="./images/WSDL-WS-Tester_WSMenu.jpg" style="width : 504px; height : 639px;"/>
+ <p>Unfortunately you can't quite run it in this state yet. It's a work in progress. I suspect we will implement a solution similar to the JAX-RS tooling integration where you specify the server on which to run the service and we'll figure out the URL dynamically.</p>
+ <img src="./images/WSDL-WS-Tester.jpg" style=" width : 647px; height : 262px;"/>
+ <p>You'll still need to look at your deployed services in the web console to determine the url to the service you want to test, then add "?WSDL" to the end so the tester can find the WSDL file in the running service. But it works the same as the WTP-provided Web Services Explorer.</p>
+ <p><small><a href="https://issues.jboss.org/browse/JBIDE-10485">Related Jira</a></small></p>
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2">
+ <hr/>
+ </td>
+ </tr>
+
+ <tr>
+ <td valign="top" align="right"><a name="itemname3"
+ id="itemname3"></a><b>Better Test History Tracking</b></td>
+ <td valign="top">
+ <p>Whereas before we would only remember the URLs for the services tested in the current session, we now remember much more for each successful test:</p>
+ <ul><li>The Method (JAX-WS or JAX-RS method name)</li>
+ <li>Any Request Headers</li>
+ <li>The Request Body</li>
+ <li>Plus the Response Headers and Response Body for the most recent test run.</li>
+ </ul>
+ <p>So now you can step back and forth through recent tests much easier. If you change something from a previous test run, that change is persisted so the next time you come back to that URL, you see your most recent settings.</p>
+
+ <p><small><a href="https://jira.jboss.org/browse/JBIDE-10883">Related Jira</a></small></p>
+ </td>
+ </tr>
+
+</table>
+
+</body>
+
+</html>
+
+
Property changes on: trunk/documentation/whatsnew/ws/ws-news-1.2.2.Beta1.html
___________________________________________________________________
Added: svn:mime-type
+ text/plain
12 years, 7 months
JBoss Tools SVN: r39015 - branches/jbosstools-3.3.0.Beta1/jst/features/org.jboss.tools.jst.feature.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-02-22 15:52:52 -0500 (Wed, 22 Feb 2012)
New Revision: 39015
Modified:
branches/jbosstools-3.3.0.Beta1/jst/features/org.jboss.tools.jst.feature/feature.xml
Log:
removed jst.ui.bot.test from jst.feature
Modified: branches/jbosstools-3.3.0.Beta1/jst/features/org.jboss.tools.jst.feature/feature.xml
===================================================================
--- branches/jbosstools-3.3.0.Beta1/jst/features/org.jboss.tools.jst.feature/feature.xml 2012-02-22 20:50:34 UTC (rev 39014)
+++ branches/jbosstools-3.3.0.Beta1/jst/features/org.jboss.tools.jst.feature/feature.xml 2012-02-22 20:52:52 UTC (rev 39015)
@@ -89,18 +89,4 @@
version="0.0.0"
unpack="false"/>
- <plugin
- id="org.jboss.tools.jst.ui.bot.test"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.jboss.tools.jst.ui.firstrun.bot.test"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
</feature>
12 years, 7 months
JBoss Tools SVN: r39014 - trunk/jst/features/org.jboss.tools.jst.feature.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-02-22 15:50:34 -0500 (Wed, 22 Feb 2012)
New Revision: 39014
Modified:
trunk/jst/features/org.jboss.tools.jst.feature/feature.xml
Log:
reverted jst.ui.bot.test from jst.feature
Modified: trunk/jst/features/org.jboss.tools.jst.feature/feature.xml
===================================================================
--- trunk/jst/features/org.jboss.tools.jst.feature/feature.xml 2012-02-22 20:28:31 UTC (rev 39013)
+++ trunk/jst/features/org.jboss.tools.jst.feature/feature.xml 2012-02-22 20:50:34 UTC (rev 39014)
@@ -89,18 +89,4 @@
version="0.0.0"
unpack="false"/>
- <plugin
- id="org.jboss.tools.jst.ui.bot.test"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.jboss.tools.jst.ui.firstrun.bot.test"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
</feature>
12 years, 7 months
JBoss Tools SVN: r39013 - in trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui: wizard and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: xcoulon
Date: 2012-02-22 15:28:31 -0500 (Wed, 22 Feb 2012)
New Revision: 39013
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/OpenShiftPasswordStorageKey.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/SecurePasswordStore.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPageModel.java
Log:
Fixed - JBIDE-10993 - Error when connecting into the OpenShift Express Console for the first time
https://issues.jboss.org/browse/JBIDE-10993
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/OpenShiftPasswordStorageKey.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/OpenShiftPasswordStorageKey.java 2012-02-22 20:20:19 UTC (rev 39012)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/OpenShiftPasswordStorageKey.java 2012-02-22 20:28:31 UTC (rev 39013)
@@ -29,8 +29,8 @@
private String userName;
public OpenShiftPasswordStorageKey(String platform, String userName) {
- this.userName = platform;
- this.platform = userName;
+ this.platform = platform;
+ this.userName = userName;
}
@Override
@@ -47,8 +47,8 @@
if (!key.getClass().isAssignableFrom(OpenShiftPasswordStorageKey.class)) {
return false;
}
- OpenShiftPasswordStorageKey deltaCloudKey = (OpenShiftPasswordStorageKey) key;
- return userName.equals(deltaCloudKey.userName)
- && platform.equals(deltaCloudKey.platform);
+ OpenShiftPasswordStorageKey openshiftKey = (OpenShiftPasswordStorageKey) key;
+ return (userName != null && openshiftKey.userName != null && userName.equals(openshiftKey.userName))
+ && (platform != null && openshiftKey.platform != null && platform.equals(openshiftKey.platform));
}
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/SecurePasswordStore.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/SecurePasswordStore.java 2012-02-22 20:20:19 UTC (rev 39012)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/SecurePasswordStore.java 2012-02-22 20:28:31 UTC (rev 39013)
@@ -48,11 +48,13 @@
}
}
- public void setPassword(String password) throws SecurePasswordStoreException {
+ public void setPassword(String password)
+ throws SecurePasswordStoreException {
update(storageKey, password);
}
- public void update(IStorageKey key, String password) throws SecurePasswordStoreException {
+ public void update(IStorageKey key, String password)
+ throws SecurePasswordStoreException {
if (!storageKey.equals(key) || isPasswordChanged(password)) {
storeInPreferences(this.password = password, this.storageKey = key);
}
@@ -62,7 +64,8 @@
if (this.password == null && password == null) {
return false;
} else {
- return (this.password == null && password != null) || (this.password != null && password == null)
+ return (this.password == null && password != null)
+ || (this.password != null && password == null)
|| !password.equals(this.password);
}
}
@@ -71,15 +74,18 @@
try {
ISecurePreferences node = getNode(storageKey);
if (node == null) {
- throw new SecurePasswordStoreException("Could not remove password");
+ throw new SecurePasswordStoreException(
+ "Could not remove password");
}
node.clear();
} catch (Exception e) {
- throw new SecurePasswordStoreException("Could not remove password", e);
+ throw new SecurePasswordStoreException("Could not remove password",
+ e);
}
}
- private String getFromPreferences(IStorageKey key) throws StorageException, UnsupportedEncodingException {
+ private String getFromPreferences(IStorageKey key) throws StorageException,
+ UnsupportedEncodingException {
ISecurePreferences node = getNode(key);
String password = node.get("password", null); //$NON-NLS-1$
if (password == null) {
@@ -88,16 +94,22 @@
return new String(EncodingUtils.decodeBase64(password));
}
- private void storeInPreferences(String password, IStorageKey key) throws SecurePasswordStoreException {
- try {
- ISecurePreferences node = getNode(key);
- node.put("password", EncodingUtils.encodeBase64(password.getBytes()), true /* encrypt */); //$NON-NLS-1$
- } catch (Exception e) {
- throw new SecurePasswordStoreException("Could not store password", e);
+ private void storeInPreferences(String password, IStorageKey key)
+ throws SecurePasswordStoreException {
+ if (password != null) {
+ try {
+ ISecurePreferences node = getNode(key);
+ node.put(
+ "password", EncodingUtils.encodeBase64(password.getBytes()), true /* encrypt */); //$NON-NLS-1$
+ } catch (Exception e) {
+ throw new SecurePasswordStoreException(
+ "Could not store password", e);
+ }
}
}
- private ISecurePreferences getNode(IStorageKey key) throws UnsupportedEncodingException {
+ private ISecurePreferences getNode(IStorageKey key)
+ throws UnsupportedEncodingException {
if (key == null) {
return null;
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPageModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPageModel.java 2012-02-22 20:20:19 UTC (rev 39012)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPageModel.java 2012-02-22 20:28:31 UTC (rev 39013)
@@ -225,6 +225,8 @@
} catch (Exception e) {
status = OpenShiftUIActivator.createErrorStatus(NLS.bind(
"Could not check user credentials: {0}.", e.getMessage()));
+ } catch(Throwable e) {
+ Logger.error("Failed to validate credentials", e);
}
return status;
}
12 years, 7 months
JBoss Tools SVN: r39012 - branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: xcoulon
Date: 2012-02-22 15:20:19 -0500 (Wed, 22 Feb 2012)
New Revision: 39012
Modified:
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java
Log:
Fixed - Error in wizard when typing complete existing application name
https://issues.jboss.org/browse/JBIDE-11002
Modified: branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java
===================================================================
--- branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-02-22 19:24:50 UTC (rev 39011)
+++ branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-02-22 20:20:19 UTC (rev 39012)
@@ -161,7 +161,7 @@
ApplicationConfigurationWizardPageModel.PROPERTY_EXISTING_APPLICATION_NAME).observe(pageModel);
ValueBindingBuilder.bind(existingAppNameTextObservable).to(existingAppNameModelObservable).in(dbc);
UIUtils.focusOnSelection(useExistingAppBtn, existingAppNameText);
- createContentAssist(existingAppNameText);
+ createExistingAppNameContentAssist();
this.browseAppsButton = new Button(existingAppSelectionGroup, SWT.NONE);
browseAppsButton.setText("Browse...");
@@ -181,7 +181,7 @@
return existingAppSelectionGroup;
}
- private void createContentAssist(final Text existingAppNameText) {
+ private void createExistingAppNameContentAssist() {
ControlDecoration dec = new ControlDecoration(existingAppNameText, SWT.TOP | SWT.LEFT);
FieldDecoration contentProposalFieldIndicator = FieldDecorationRegistry.getDefault().getFieldDecoration(
FieldDecorationRegistry.DEC_CONTENT_PROPOSAL);
@@ -638,6 +638,7 @@
public void run() {
loadOpenshiftResources(dbc);
enableApplicationWidgets(pageModel.isUseExistingApplication());
+ createExistingAppNameContentAssist();
// this is needed because of weird issues with UI not
// reacting to model changes while wizard runnable is
// run. We force another update
Modified: branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java
===================================================================
--- branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java 2012-02-22 19:24:50 UTC (rev 39011)
+++ branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java 2012-02-22 20:20:19 UTC (rev 39012)
@@ -111,18 +111,21 @@
return existingApplicationName;
}
- public void setExistingApplicationName(String applicationName) {
+ public void setExistingApplicationName(String applicationName) throws OpenShiftException {
firePropertyChange(PROPERTY_EXISTING_APPLICATION_NAME
, existingApplicationName
, this.existingApplicationName = applicationName);
- }
-
- protected void setExistingApplicationName(IApplication application) {
- String applicationName = null;
- if (application != null) {
- applicationName = application.getName();
+ if (applicationName != null) {
+ for (IApplication application : getApplications()) {
+ if (application.getName().equals(applicationName)) {
+ setApplicationName(application.getName());
+ setSelectedCartridge(application.getCartridge());
+ setSelectedEmbeddableCartridges(new HashSet<IEmbeddableCartridge>(
+ application.getEmbeddedCartridges()));
+ }
+ }
}
- setExistingApplicationName(applicationName);
+
}
public void loadExistingApplications() throws OpenShiftException {
@@ -213,11 +216,12 @@
}
public void setExistingApplication(IApplication application) throws OpenShiftException {
- // setUseExistingApplication(application);
- setExistingApplicationName(application);
- setApplicationName(application);
- setSelectedCartridge(application);
- setSelectedEmbeddableCartridges(application);
+ if(application != null) {
+ setExistingApplicationName(application.getName());
+ setApplicationName(application.getName());
+ setSelectedCartridge(application.getCartridge());
+ setSelectedEmbeddableCartridges(new HashSet<IEmbeddableCartridge>(application.getEmbeddedCartridges()));
+ }
wizardModel.setApplication(application);
}
@@ -262,14 +266,6 @@
wizardModel.setSelectedEmbeddableCartridges(selectedEmbeddableCartridges));
}
- protected void setSelectedEmbeddableCartridges(IApplication application) throws OpenShiftException {
- HashSet<IEmbeddableCartridge> selectedEmbeddableCartridges = new HashSet<IEmbeddableCartridge>();
- if (application != null) {
- selectedEmbeddableCartridges.addAll(application.getEmbeddedCartridges());
- }
- setSelectedEmbeddableCartridges(selectedEmbeddableCartridges);
- }
-
public boolean hasApplication(ICartridge cartridge) {
try {
return getUser().hasApplication(cartridge);
12 years, 7 months
JBoss Tools SVN: r39011 - branches/jbosstools-3.3.0.Beta1/as/features/org.jboss.ide.eclipse.as.server.rse.integration.feature.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-02-22 14:24:50 -0500 (Wed, 22 Feb 2012)
New Revision: 39011
Modified:
branches/jbosstools-3.3.0.Beta1/as/features/org.jboss.ide.eclipse.as.server.rse.integration.feature/feature.xml
Log:
JBIDE-10986 - to beta1 branch
Modified: branches/jbosstools-3.3.0.Beta1/as/features/org.jboss.ide.eclipse.as.server.rse.integration.feature/feature.xml
===================================================================
--- branches/jbosstools-3.3.0.Beta1/as/features/org.jboss.ide.eclipse.as.server.rse.integration.feature/feature.xml 2012-02-22 19:23:30 UTC (rev 39010)
+++ branches/jbosstools-3.3.0.Beta1/as/features/org.jboss.ide.eclipse.as.server.rse.integration.feature/feature.xml 2012-02-22 19:24:50 UTC (rev 39011)
@@ -46,10 +46,30 @@
<import plugin="org.jboss.ide.eclipse.as.ui" />
<import plugin="org.eclipse.rse.files.ui" version="3.2.0" match="greaterOrEqual" />
<import plugin="org.eclipse.rse.ui" version="3.2.0" match="greaterOrEqual" />
- <import plugin="org.eclipse.rse.subsystems.shells.dstore" version="2.1.300" match="greaterOrEqual" />
<import plugin="org.eclipse.rse.subsystems.shells.local" version="2.1.300" match="greaterOrEqual" />
<import plugin="org.eclipse.rse.subsystems.shells.ssh" version="2.1.300" match="greaterOrEqual" />
<import plugin="org.eclipse.rse.subsystems.shells.telnet" version="1.2.200" match="greaterOrEqual" />
+
+ <!--
+ The following plugins are required for completeness and usability of product only.
+ We have no compilation requirements against them, nor any critical outstanding bugs
+ that require a specific version or API. Functionality this forces to be included
+ are things such as terminal support, process support, shell support,
+ the sending and receiving of remote commands, the sending and receiving of remote files,
+ and support for the connector service.
+ -->
+ <import plugin="org.eclipse.rse.connectorservice.local"/>
+ <import plugin="org.eclipse.rse.connectorservice.ssh"/>
+ <import plugin="org.eclipse.rse.processes.ui"/>
+ <import plugin="org.eclipse.rse.shells.ui"/>
+ <import plugin="org.eclipse.rse.subsystems.files.local"/>
+ <import plugin="org.eclipse.rse.subsystems.files.ssh"/>
+ <import plugin="org.eclipse.rse.subsystems.processes.core"/>
+ <import plugin="org.eclipse.rse.subsystems.processes.local"/>
+ <import plugin="org.eclipse.rse.subsystems.processes.shell.linux"/>
+ <import plugin="org.eclipse.rse.subsystems.terminals.core"/>
+ <import plugin="org.eclipse.rse.subsystems.terminals.ssh"/>
+ <import plugin="org.eclipse.rse.terminals.ui"/>
</requires>
<plugin id="org.jboss.ide.eclipse.as.rse.core" download-size="0" install-size="0" version="0.0.0" unpack="false" />
12 years, 7 months
JBoss Tools SVN: r39010 - trunk/as/features/org.jboss.ide.eclipse.as.server.rse.integration.feature.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-02-22 14:23:30 -0500 (Wed, 22 Feb 2012)
New Revision: 39010
Modified:
trunk/as/features/org.jboss.ide.eclipse.as.server.rse.integration.feature/feature.xml
Log:
JBIDE-10986 - trunk
Modified: trunk/as/features/org.jboss.ide.eclipse.as.server.rse.integration.feature/feature.xml
===================================================================
--- trunk/as/features/org.jboss.ide.eclipse.as.server.rse.integration.feature/feature.xml 2012-02-22 18:18:28 UTC (rev 39009)
+++ trunk/as/features/org.jboss.ide.eclipse.as.server.rse.integration.feature/feature.xml 2012-02-22 19:23:30 UTC (rev 39010)
@@ -53,7 +53,10 @@
<!--
The following plugins are required for completeness and usability of product only.
We have no compilation requirements against them, nor any critical outstanding bugs
- that require a specific version or API.
+ that require a specific version or API. Functionality this forces to be included
+ are things such as terminal support, process support, shell support,
+ the sending and receiving of remote commands, the sending and receiving of remote files,
+ and support for the connector service.
-->
<import plugin="org.eclipse.rse.connectorservice.local"/>
<import plugin="org.eclipse.rse.connectorservice.ssh"/>
12 years, 7 months