JBoss Tools SVN: r32062 - trunk/requirements/jbossesb.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-06-13 17:35:32 -0400 (Mon, 13 Jun 2011)
New Revision: 32062
Modified:
trunk/requirements/jbossesb/build.properties
Log:
jbossesb 4.7 binary has moved; update URL accordingly
Modified: trunk/requirements/jbossesb/build.properties
===================================================================
--- trunk/requirements/jbossesb/build.properties 2011-06-13 20:22:47 UTC (rev 32061)
+++ trunk/requirements/jbossesb/build.properties 2011-06-13 21:35:32 UTC (rev 32062)
@@ -1,4 +1,4 @@
-jbossesb.build.uri=http://www.jboss.org/file-access/default/members/jbossesb/downloads/4.7/binary
+jbossesb.build.uri=http://download.jboss.org/jbossesb/4.7/binary/
build.uri=${jbossesb.build.uri}
build.archive.root=jbossesb-4.7
build.archive=${build.archive.root}.zip
14 years, 10 months
JBoss Tools SVN: r32061 - in trunk/download.jboss.org/jbosstools/updates: development/indigo and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-06-13 16:22:47 -0400 (Mon, 13 Jun 2011)
New Revision: 32061
Modified:
trunk/download.jboss.org/jbosstools/updates/development/helios/index.html
trunk/download.jboss.org/jbosstools/updates/development/indigo/index.html
trunk/download.jboss.org/jbosstools/updates/stable/galileo/index.html
trunk/download.jboss.org/jbosstools/updates/stable/ganymede/index.html
trunk/download.jboss.org/jbosstools/updates/stable/helios/index.html
Log:
instead of redirecting, simply copy HTML page from actual build into stable URL
Modified: trunk/download.jboss.org/jbosstools/updates/development/helios/index.html
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/development/helios/index.html 2011-06-13 20:22:26 UTC (rev 32060)
+++ trunk/download.jboss.org/jbosstools/updates/development/helios/index.html 2011-06-13 20:22:47 UTC (rev 32061)
@@ -1 +1,132 @@
-<meta http-equiv="refresh" content="0;url=http://download.jboss.org/jbosstools/updates/JBossTools-3.2.1.M1/">
+<html>
+<head>
+<title>JBoss Tools Development Milestone Update Site: 3.2.1.M1.2011-05-09_19-09-42-H843</title>
+<style>
+@import url("../web/site.css");
+</style>
+</head>
+<body marginheight="0" marginwidth="0" leftmargin="0" topmargin="0">
+<table marginheight="0" marginwidth="0" leftmargin="0" topmargin="0"
+ cellspacing="0" cellpadding="0">
+ <tr>
+ <td colspan="2"><img
+ src="https://www.jboss.org/dms/tools/images/tools-banner.png" /></td>
+ </tr>
+ <tr>
+ <td>  </td>
+ </tr>
+ <tr>
+ <td>  </td>
+ <td>
+ <h2 class="title">JBoss Tools Development Milestone Update Site</h2>
+ <table width="100%">
+ <tr class="header">
+ <td class="sub-header" width="100%"><span>Latest Build: 3.2.1.M1.2011-05-09_19-09-42-H843</span></td>
+ </tr>
+
+ <tr class="light-row" style="height: 30px">
+ <td class="bodyText">
+ <p class="bodyText">This is the <b>Development Milestone</b>
+ Update Site for JBoss Tools. See <a class="link"
+ href="http://www.jboss.org/tools/download/update">Installation
+ Instructions</a>.</p>
+ </td>
+ </tr>
+
+ <tr class="dark-row" style="height: 90px">
+ <td class="bodyText">
+ <p class="bodyText"><b class="bodyText" style="color: red;">NOTE:</b>
+<!-- see http://www.jboss.org/tools/download/dev#noteBirt for matching copy -->
+Some features (such as BIRT, Maven, or GWT) require additional third-party prerequisites not available from Eclipse.org or JBoss.org. These can be installed from the following composite update site mirror, which should be added automatically when you add the JBoss Tools update site to your Eclipse's list of Available Software Sites. To verify which sites are enabled, open <code><strong>Window > Preferences > Install/Update > Available Software Sites</strong></code>. To add sites, Click the <code><strong>Add...</strong></code> button, then right-click the link(s) below, copy the link(s), and paste them into Eclipse one by one as needed.
+ </p>
+
+ <ul>
+ <li><a href="http://download.jboss.org/jbosstools/updates/helios/">JBoss Tools Requirements - Composite Mirror - Helios</a></li>
+ </ul>
+ </td>
+ </tr>
+
+ <tr class="light-row" style="height: 30px">
+ <td class="bodyText">
+ <p class="bodyText">You can also download JBoss Tools as
+ individual zips for offline installation. See <a class="link"
+ href="http://www.jboss.org/tools/download">JBoss Tools
+ Downloads</a>.</p>
+ </td>
+ </tr>
+
+ <tr class="dark-row" style="height: 30px">
+ <td class="bodyText">
+ <p class="bodyText">For more information, see <a
+ href="http://www.jboss.org/tools/download/installation">Installation
+ methods</a>.</p>
+ </td>
+ </tr>
+ <tr>
+ <td class="spacer"><br />
+ </td>
+ <td class="spacer"><br />
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ <tr>
+ <td></td>
+ <td>
+ <table width="100%">
+ <tr class="header">
+ <td class="sub-header" width="100%"><span> Installation
+ Types</span></td>
+ </tr>
+ <tr class="light-row" style="height: 30px">
+ <td class="bodyText">
+ <p class="bodyText">Depending on how close to the bleeding edge
+ you like to be, there are several types of releases available.</p>
+ <br />
+
+ </td>
+ </tr>
+
+ <tr class="dark-row" style="height: 30px">
+ <td class="bodyText">
+ <h4>Stable Releases</h4>
+
+ <p><a href="https://www.jboss.org/tools/download/stable.html">Stable
+ releases</a> are - as indicated by their name - stable.</p><br/>
+
+ </td>
+ </tr>
+
+ <tr class="light-row" style="height: 30px">
+ <td class="bodyText">
+ <h4>Development Milestones</h4>
+
+ <p><a href="https://www.jboss.org/tools/download/dev.html">Development
+ builds</a>, released once per milestone and only a few times a year, are
+ fairly stable, but there may be some things which do not yet work.
+ If you would like to try one of these milestones, we'd greatly
+ appreciate the assistance in testing and <a
+ href="https://jira.jboss.org/jira/browse/JBIDE">reporting of
+ issues in our issue tracker</a>.</p><br/>
+
+ </td>
+ </tr>
+
+ <tr class="dark-row" style="height: 30px">
+ <td class="bodyText">
+ <h4>Nightly Builds</h4>
+
+ <p>The <a
+ href="https://www.jboss.org/tools/download/nightly.html">bleeding
+ edge</a> contains the latest and greatest new features, but nothing is
+ stable or guaranteed - yet. If you're using a Milestone and need a
+ fix, you can update to the latest Nightly, or wait for the next
+ Milestone.</p><br/>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+</table>
+</html>
Modified: trunk/download.jboss.org/jbosstools/updates/development/indigo/index.html
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/development/indigo/index.html 2011-06-13 20:22:26 UTC (rev 32060)
+++ trunk/download.jboss.org/jbosstools/updates/development/indigo/index.html 2011-06-13 20:22:47 UTC (rev 32061)
@@ -1 +1,132 @@
-<meta http-equiv="refresh" content="0;url=http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.M1a/">
+<html>
+<head>
+<title>JBoss Tools Nightly Build Update Site: 3.3.0.M1a.2011-05-11_15-56-28-H2359</title>
+<style>
+@import url("../web/site.css");
+</style>
+</head>
+<body marginheight="0" marginwidth="0" leftmargin="0" topmargin="0">
+<table marginheight="0" marginwidth="0" leftmargin="0" topmargin="0"
+ cellspacing="0" cellpadding="0">
+ <tr>
+ <td colspan="2"><img
+ src="https://www.jboss.org/dms/tools/images/tools-banner.png" /></td>
+ </tr>
+ <tr>
+ <td>  </td>
+ </tr>
+ <tr>
+ <td>  </td>
+ <td>
+ <h2 class="title">JBoss Tools Nightly Build Update Site</h2>
+ <table width="100%">
+ <tr class="header">
+ <td class="sub-header" width="100%"><span>Latest Build: 3.3.0.M1a.2011-05-11_15-56-28-H2359</span></td>
+ </tr>
+
+ <tr class="light-row" style="height: 30px">
+ <td class="bodyText">
+ <p class="bodyText">This is the <b>Nightly Build</b>
+ Update Site for JBoss Tools. See <a class="link"
+ href="http://www.jboss.org/tools/download/update">Installation
+ Instructions</a>.</p>
+ </td>
+ </tr>
+
+ <tr class="dark-row" style="height: 90px">
+ <td class="bodyText">
+ <p class="bodyText"><b class="bodyText" style="color: red;">NOTE:</b>
+<!-- see http://www.jboss.org/tools/download/dev#noteBirt for matching copy -->
+Some features (such as BIRT, Maven, or GWT) require additional third-party prerequisites not available from Eclipse.org or JBoss.org. These can be installed from the following composite update site mirror, which should be added automatically when you add the JBoss Tools update site to your Eclipse's list of Available Software Sites. To verify which sites are enabled, open <code><strong>Window > Preferences > Install/Update > Available Software Sites</strong></code>. To add sites, Click the <code><strong>Add...</strong></code> button, then right-click the link(s) below, copy the link(s), and paste them into Eclipse one by one as needed.
+ </p>
+
+ <ul>
+ <li><a href="http://download.jboss.org/jbosstools/updates/indigo/M6">JBoss Tools Requirements - Composite Mirror - Indigo M6</a></li>
+ </ul>
+ </td>
+ </tr>
+
+ <tr class="light-row" style="height: 30px">
+ <td class="bodyText">
+ <p class="bodyText">You can also download JBoss Tools as
+ individual zips for offline installation. See <a class="link"
+ href="http://www.jboss.org/tools/download">JBoss Tools
+ Downloads</a>.</p>
+ </td>
+ </tr>
+
+ <tr class="dark-row" style="height: 30px">
+ <td class="bodyText">
+ <p class="bodyText">For more information, see <a
+ href="http://www.jboss.org/tools/download/installation">Installation
+ methods</a>.</p>
+ </td>
+ </tr>
+ <tr>
+ <td class="spacer"><br />
+ </td>
+ <td class="spacer"><br />
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ <tr>
+ <td></td>
+ <td>
+ <table width="100%">
+ <tr class="header">
+ <td class="sub-header" width="100%"><span> Installation
+ Types</span></td>
+ </tr>
+ <tr class="light-row" style="height: 30px">
+ <td class="bodyText">
+ <p class="bodyText">Depending on how close to the bleeding edge
+ you like to be, there are several types of releases available.</p>
+ <br />
+
+ </td>
+ </tr>
+
+ <tr class="dark-row" style="height: 30px">
+ <td class="bodyText">
+ <h4>Stable Releases</h4>
+
+ <p><a href="https://www.jboss.org/tools/download/stable.html">Stable
+ releases</a> are - as indicated by their name - stable.</p><br/>
+
+ </td>
+ </tr>
+
+ <tr class="light-row" style="height: 30px">
+ <td class="bodyText">
+ <h4>Development Milestones</h4>
+
+ <p><a href="https://www.jboss.org/tools/download/dev.html">Development
+ builds</a>, released once per milestone and only a few times a year, are
+ fairly stable, but there may be some things which do not yet work.
+ If you would like to try one of these milestones, we'd greatly
+ appreciate the assistance in testing and <a
+ href="https://jira.jboss.org/jira/browse/JBIDE">reporting of
+ issues in our issue tracker</a>.</p><br/>
+
+ </td>
+ </tr>
+
+ <tr class="dark-row" style="height: 30px">
+ <td class="bodyText">
+ <h4>Nightly Builds</h4>
+
+ <p>The <a
+ href="https://www.jboss.org/tools/download/nightly.html">bleeding
+ edge</a> contains the latest and greatest new features, but nothing is
+ stable or guaranteed - yet. If you're using a Milestone and need a
+ fix, you can update to the latest Nightly, or wait for the next
+ Milestone.</p><br/>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+</table>
+</html>
Modified: trunk/download.jboss.org/jbosstools/updates/stable/galileo/index.html
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/stable/galileo/index.html 2011-06-13 20:22:26 UTC (rev 32060)
+++ trunk/download.jboss.org/jbosstools/updates/stable/galileo/index.html 2011-06-13 20:22:47 UTC (rev 32061)
@@ -1 +1,150 @@
-<meta http-equiv="refresh" content="0;url=http://download.jboss.org/jbosstools/updates/JBossTools-3.1.1.GA/">
+<html>
+<head>
+<title>JBoss Tools Stable Release Update Site: 3.1.1.v201006011046R-H111-GA</title>
+<style>
+@import url("web/site.css");
+</style>
+</head>
+<body marginheight="0" marginwidth="0" leftmargin="0" topmargin="0">
+<table marginheight="0" marginwidth="0" leftmargin="0" topmargin="0"
+ cellspacing="0" cellpadding="0">
+ <tr>
+ <td colspan="2"><img
+ src="https://www.jboss.org/dms/tools/images/tools-banner.png" /></td>
+ </tr>
+ <tr>
+ <td>  </td>
+ </tr>
+ <tr>
+ <td>  </td>
+ <td>
+ <h2 class="title">JBoss Tools Stable Release Update Site</h2>
+ <table width="100%">
+ <tr class="header">
+ <td class="sub-header" width="100%"><span>Latest Build:
+ 3.1.1.v201006011046R-H111-GA</span></td>
+ </tr>
+
+ <tr class="light-row" style="height: 30px">
+ <td class="bodyText">
+ <p class="bodyText">This is the <b>Stable Release</b>
+ Update Site for JBoss Tools. See <a class="link"
+ href="http://www.jboss.org/tools/download/update">Installation
+ Instructions</a>.</p>
+ </td>
+ </tr>
+
+ <tr class="dark-row" style="height: 70px">
+ <td class="bodyText">
+ <p class="bodyText"><b class="bodyText" style="color: red;">NOTE #1:</b> There are patches available for the Web Tools project, not available from the Galileo update site. To get these, enable or add the following site to your Eclipse's list of Available Software Sites, then search for updates.</p>
+ <ul>
+ <li><a class="link" href="http://download.eclipse.org/webtools/updates/">Web Tools 3.1 Update Site</a></li>
+ </ul>
+ </td>
+ </tr>
+
+ <tr class="light-row" style="height: 10px">
+ <td class="bodyText">
+ </td>
+ </tr>
+
+ <tr class="dark-row" style="height: 90px">
+ <td class="bodyText">
+ <p class="bodyText"><b class="bodyText" style="color: red;">NOTE #2:</b> Some
+ features (such as BIRT and Maven) require additional third-party
+ prerequisites not available from Eclipse.org or JBoss.org. These can
+ be installed from the following update sites, which may already be
+ listed - but not enabled - in your Eclipse's list of Available
+ Software Sites:</p>
+ <ul>
+ <li><a class="link" href="http://download.eclipse.org/birt/update-site/2.5/">BIRT 2.5 Update Site</a></li>
+ <li><a class="link" href="http://m2eclipse.sonatype.org/sites/m2e/">m2eclipse 0.10 Release</a></li>
+ <li><a class="link" href="http://m2eclipse.sonatype.org/sites/m2e-extras/">m2eclipse Extras 0.10 Release</a></li>
+ </ul>
+ </td>
+ </tr>
+
+ <tr class="light-row" style="height: 30px">
+ <td class="bodyText">
+ <p class="bodyText">You can also download JBoss Tools as
+ individual zips for offline installation. See <a class="link"
+ href="http://www.jboss.org/tools/download">JBoss Tools
+ Downloads</a>.</p>
+ </td>
+ </tr>
+
+ <tr class="dark-row" style="height: 30px">
+ <td class="bodyText">
+ <p class="bodyText">For more information, see <a
+ href="http://www.jboss.org/tools/download/installation">Installation
+ methods</a>.</p>
+ </td>
+ </tr>
+ <tr>
+ <td class="spacer"><br />
+ </td>
+ <td class="spacer"><br />
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ <tr>
+ <td></td>
+ <td>
+ <table width="100%">
+ <tr class="header">
+ <td class="sub-header" width="100%"><span> Installation
+ Types</span></td>
+ </tr>
+ <tr class="light-row" style="height: 30px">
+ <td class="bodyText">
+ <p class="bodyText">Depending on how close to the bleeding edge
+ you like to be, there are several types of releases available.</p>
+ <br />
+
+ </td>
+ </tr>
+
+ <tr class="dark-row" style="height: 30px">
+ <td class="bodyText">
+ <h4>Stable Releases</h4>
+
+ <p><a href="https://www.jboss.org/tools/download/stable.html">Stable
+ releases</a> are - as indicated by their name - stable.</p><br/>
+
+ </td>
+ </tr>
+
+ <tr class="light-row" style="height: 30px">
+ <td class="bodyText">
+ <h4>Development Milestones</h4>
+
+ <p><a href="https://www.jboss.org/tools/download/dev.html">Development
+ builds</a>, released once per milestone and only a few times a year, are
+ fairly stable, but there may be some things which do not yet work.
+ If you would like to try one of these milestones, we'd greatly
+ appreciate the assistance in testing and <a
+ href="https://jira.jboss.org/jira/browse/JBIDE">reporting of
+ issues in our issue tracker</a>.</p><br/>
+
+ </td>
+ </tr>
+
+ <tr class="dark-row" style="height: 30px">
+ <td class="bodyText">
+ <h4>Nightly Builds</h4>
+
+ <p>The <a
+ href="https://www.jboss.org/tools/download/nightly.html">bleeding
+ edge</a> contains the latest and greatest new features, but nothing is
+ stable or guaranteed - yet. If you're using a Milestone and need a
+ fix, you can update to the latest Nightly, or wait for the next
+ Milestone.</p><br/>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+</table>
+</html>
Modified: trunk/download.jboss.org/jbosstools/updates/stable/ganymede/index.html
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/stable/ganymede/index.html 2011-06-13 20:22:26 UTC (rev 32060)
+++ trunk/download.jboss.org/jbosstools/updates/stable/ganymede/index.html 2011-06-13 20:22:47 UTC (rev 32061)
@@ -1 +1,120 @@
-<meta http-equiv="refresh" content="0;url=http://download.jboss.org/jbosstools/updates/JBossTools-3.0.3.GA/">
+<html>
+<head>
+<title>JBoss Tools Nightly Build Update Site: 3.0.3.v200910211631N-H194-GA</title>
+<style>
+@import url("web/site.css");
+</style>
+</head>
+<body marginheight="0" marginwidth="0" leftmargin="0" topmargin="0">
+<table marginheight="0" marginwidth="0" leftmargin="0" topmargin="0"
+ cellspacing="0" cellpadding="0">
+ <tr>
+ <td colspan="2"><img
+ src="https://www.jboss.org/dms/tools/images/tools-banner.png" /></td>
+ </tr>
+ <tr>
+ <td>  </td>
+ </tr>
+ <tr>
+ <td>  </td>
+ <td>
+ <h2 class="title">JBoss Tools Nightly Build Update Site</h2>
+ <table width="100%">
+ <tr class="header">
+ <td class="sub-header" width="100%"><span>Latest Build:
+ 3.0.3.v200910211631N-H194-GA</span></td>
+ </tr>
+
+ <tr class="light-row" style="height: 30px">
+ <td class="bodyText">
+ <p class="bodyText">This is the <b>Nightly Build</b>
+ Update Site for JBoss Tools. See <a class="link"
+ href="http://www.jboss.org/tools/download/update">Installation
+ Instructions</a>.</p>
+ </td>
+ </tr>
+
+ <tr class="dark-row" style="height: 30px">
+ <td class="bodyText">
+ <p class="bodyText">You can also download JBoss Tools as
+ individual zips for offline installation. See <a class="link"
+ href="http://www.jboss.org/tools/download">JBoss Tools
+ Downloads</a>.</p>
+ </td>
+ </tr>
+
+ <tr class="light-row" style="height: 30px">
+ <td class="bodyText">
+ <p class="bodyText">For more information, see <a
+ href="http://www.jboss.org/tools/download/installation">Installation
+ methods</a>.</p>
+ </td>
+ </tr>
+ <tr>
+ <td class="spacer"><br />
+ </td>
+ <td class="spacer"><br />
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ <tr>
+ <td></td>
+ <td>
+ <table width="100%">
+ <tr class="header">
+ <td class="sub-header" width="100%"><span> Installation
+ Types</span></td>
+ </tr>
+ <tr class="light-row" style="height: 30px">
+ <td class="bodyText">
+ <p class="bodyText">Depending on how close to the bleeding edge
+ you like to be, there are several types of releases available.</p>
+ <br />
+
+ </td>
+ </tr>
+
+ <tr class="dark-row" style="height: 30px">
+ <td class="bodyText">
+ <h4>Stable Releases</h4>
+
+ <p><a href="https://www.jboss.org/tools/download/stable.html">Stable
+ releases</a> are - as indicated by their name - stable.</p><br/>
+
+ </td>
+ </tr>
+
+ <tr class="light-row" style="height: 30px">
+ <td class="bodyText">
+ <h4>Development Milestones</h4>
+
+ <p><a href="https://www.jboss.org/tools/download/dev.html">Development
+ builds</a>, released once per milestone and only a few times a year, are
+ fairly stable, but there may be some things which do not yet work.
+ If you would like to try one of these milestones, we'd greatly
+ appreciate the assistance in testing and <a
+ href="https://jira.jboss.org/jira/browse/JBIDE">reporting of
+ issues in our issue tracker</a>.</p><br/>
+
+ </td>
+ </tr>
+
+ <tr class="dark-row" style="height: 30px">
+ <td class="bodyText">
+ <h4>Nightly Builds</h4>
+
+ <p>The <a
+ href="https://www.jboss.org/tools/download/nightly.html">bleeding
+ edge</a> contains the latest and greatest new features, but nothing is
+ stable or guaranteed - yet. If you're using a Milestone and need a
+ fix, you can update to the latest Nightly, or wait for the next
+ Milestone.</p><br/>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+</table>
+</html>
Modified: trunk/download.jboss.org/jbosstools/updates/stable/helios/index.html
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/stable/helios/index.html 2011-06-13 20:22:26 UTC (rev 32060)
+++ trunk/download.jboss.org/jbosstools/updates/stable/helios/index.html 2011-06-13 20:22:47 UTC (rev 32061)
@@ -2,7 +2,7 @@
<head>
<title>JBoss Tools Stable Release Update Site: 3.2.0.GA 2011-02-16_18-30-44-H329</title>
<style>
-@import url("../../web/site.css");
+@import url("../web/site.css");
</style>
</head>
<body marginheight="0" marginwidth="0" leftmargin="0" topmargin="0">
14 years, 10 months
JBoss Tools SVN: r32059 - in trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test: extension and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-06-13 15:44:34 -0400 (Mon, 13 Jun 2011)
New Revision: 32059
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/extension/ExtensionManagerTest.java
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java
Log:
JBIDE-9123
https://issues.jboss.org/browse/JBIDE-9123
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java 2011-06-13 19:43:34 UTC (rev 32058)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java 2011-06-13 19:44:34 UTC (rev 32059)
@@ -16,6 +16,7 @@
import org.eclipse.jdt.internal.core.JavaModelManager;
import org.jboss.tools.cdi.core.test.ca.BeansXmlCATest;
import org.jboss.tools.cdi.core.test.extension.ExtensionFactoryTest;
+import org.jboss.tools.cdi.core.test.extension.ExtensionManagerTest;
import org.jboss.tools.cdi.core.test.project.EnableCDISupportForJarTest;
import org.jboss.tools.cdi.core.test.project.EnableCDISupportForWarTest;
import org.jboss.tools.cdi.core.test.tck.AssignabilityOfRawAndParameterizedTypesTest;
@@ -99,6 +100,7 @@
suite.addTestSuite(ELValidationTest.class);
suiteAll.addTestSuite(ExtensionFactoryTest.class);
+ suiteAll.addTestSuite(ExtensionManagerTest.class);
suiteAll.addTestSuite(WeldJarTest.class);
suiteAll.addTestSuite(BeansXMLTest.class);
TestSuite dependentSuite = new TestSuite("Dependent Projects Tests");
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/extension/ExtensionManagerTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/extension/ExtensionManagerTest.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/extension/ExtensionManagerTest.java 2011-06-13 19:44:34 UTC (rev 32059)
@@ -0,0 +1,47 @@
+/*******************************************************************************
+ * Copyright (c) 2011 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
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.cdi.core.test.extension;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import junit.framework.TestCase;
+
+import org.jboss.tools.cdi.core.extension.CDIExtensionManager;
+
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+public class ExtensionManagerTest extends TestCase {
+
+ public void testExtensionManager() throws Exception {
+ CDIExtensionManager m = new CDIExtensionManager();
+ Set<String> set = new HashSet<String>();
+ m.setRuntimes("path1", set);
+ m.pathRemoved("path1");
+
+ set.add("org.jboss.tools.cdi.core.fake.FakeExtension");
+ m.setRuntimes("path1", set);
+ m.pathRemoved("path1");
+
+ m.setRuntimes("path1", set);
+ m.pathRemoved("path1");
+ set.add("abc");
+
+ set.clear();
+ set.add("abc");
+ m.setRuntimes("path1", set);
+ m.pathRemoved("path1");
+ }
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/extension/ExtensionManagerTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
14 years, 10 months
JBoss Tools SVN: r32058 - in trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core: extension and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-06-13 15:43:34 -0400 (Mon, 13 Jun 2011)
New Revision: 32058
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreNature.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/CDIExtensionManager.java
Log:
JBIDE-9123
https://issues.jboss.org/browse/JBIDE-9123
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreNature.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreNature.java 2011-06-13 16:33:24 UTC (rev 32057)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreNature.java 2011-06-13 19:43:34 UTC (rev 32058)
@@ -69,9 +69,10 @@
Set<CDICoreNature> usedBy = new HashSet<CDICoreNature>();
- private CDIExtensionManager extensions = new CDIExtensionManager(this);
+ private CDIExtensionManager extensions = new CDIExtensionManager();
public CDICoreNature() {
+ extensions.setProject(this);
definitions.setProject(this);
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/CDIExtensionManager.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/CDIExtensionManager.java 2011-06-13 16:33:24 UTC (rev 32057)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/extension/CDIExtensionManager.java 2011-06-13 19:43:34 UTC (rev 32058)
@@ -47,7 +47,10 @@
FeatureStorage featureStorage = new FeatureStorage();
- public CDIExtensionManager(CDICoreNature n) {
+ public CDIExtensionManager() {
+ }
+
+ public void setProject(CDICoreNature n) {
this.n = n;
}
@@ -81,42 +84,46 @@
private void addRuntime(String runtime) {
CDIExtensionFactory factory = CDIExtensionFactory.getInstance();
Set<String> clss = factory.getExtensionClassesByRuntime(runtime);
- if(clss != null && !clss.isEmpty()) for (String cls: clss) {
- ICDIExtension ext = factory.createExtensionInstance(cls);
- if(ext == null) continue;
- instances.put(cls, ext);
- for (Class<?> feature: CDIExtensionFactory.getInstance().getFeatures()) {
- if(factory.getExtensionClassesByFeature(feature).contains(cls)) {
- Set<ICDIExtension> es = featureToExtensions.get(feature);
- if(es == null) {
- es = new HashSet<ICDIExtension>();
- featureToExtensions.put(feature, es);
+ if(clss != null) {
+ for (String cls: clss) {
+ ICDIExtension ext = factory.createExtensionInstance(cls);
+ if(ext == null) continue;
+ instances.put(cls, ext);
+ for (Class<?> feature: CDIExtensionFactory.getInstance().getFeatures()) {
+ if(factory.getExtensionClassesByFeature(feature).contains(cls)) {
+ Set<ICDIExtension> es = featureToExtensions.get(feature);
+ if(es == null) {
+ es = new HashSet<ICDIExtension>();
+ featureToExtensions.put(feature, es);
+ }
+ es.add(ext);
}
- es.add(ext);
}
+ featureStorage.clean();
}
- featureStorage.clean();
}
}
private void deleteRuntime(String runtime) {
Set<String> clss = CDIExtensionFactory.getInstance().getExtensionClassesByRuntime(runtime);
- for (String cls: clss) {
- ICDIExtension ext = instances.remove(cls);
- if(ext != null) {
- Class<?>[] is = featureToExtensions.keySet().toArray(new Class<?>[0]);
- for (Class<?> feature: is) {
- Set<ICDIExtension> es = featureToExtensions.get(feature);
- if(es != null) {
- es.remove(ext);
- if(es.isEmpty()) featureToExtensions.remove(feature);
+ if(clss != null) {
+ for (String cls: clss) {
+ ICDIExtension ext = instances.remove(cls);
+ if(ext != null) {
+ Class<?>[] is = featureToExtensions.keySet().toArray(new Class<?>[0]);
+ for (Class<?> feature: is) {
+ Set<ICDIExtension> es = featureToExtensions.get(feature);
+ if(es != null) {
+ es.remove(ext);
+ if(es.isEmpty()) featureToExtensions.remove(feature);
+ }
}
}
}
+ if(!clss.isEmpty()) {
+ featureStorage.clean();
+ }
}
- if(!clss.isEmpty()) {
- featureStorage.clean();
- }
}
static Set<ICDIExtension> EMPTY = new HashSet<ICDIExtension>();
14 years, 10 months
JBoss Tools SVN: r32057 - in trunk/thirdparty: plugins and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-06-13 12:33:24 -0400 (Mon, 13 Jun 2011)
New Revision: 32057
Removed:
trunk/thirdparty/features/javax.wsdl.feature/
trunk/thirdparty/features/org.apache.oro.feature/
trunk/thirdparty/features/org.jdom.feature/
trunk/thirdparty/plugins/javax.wsdl/
trunk/thirdparty/plugins/org.apache.oro/
trunk/thirdparty/plugins/org.jdom/
Log:
remove obsolete folders that git-svn left behind
14 years, 10 months
JBoss Tools SVN: r32056 - trunk/forge/plugins.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2011-06-13 08:06:47 -0400 (Mon, 13 Jun 2011)
New Revision: 32056
Modified:
trunk/forge/plugins/pom.xml
Log:
JBIDE-9118 remove plugins from overall plugin since its not listed in feature either
Modified: trunk/forge/plugins/pom.xml
===================================================================
--- trunk/forge/plugins/pom.xml 2011-06-13 11:34:51 UTC (rev 32055)
+++ trunk/forge/plugins/pom.xml 2011-06-13 12:06:47 UTC (rev 32056)
@@ -14,8 +14,8 @@
<packaging>pom</packaging>
<modules>
<module>org.jboss.tools.forge.runtime</module>
- <module>org.jboss.tools.forge.core</module>
- <module>org.jboss.tools.forge.ui</module>
+ <!-- <module>org.jboss.tools.forge.core</module>
+ <module>org.jboss.tools.forge.ui</module> -->
</modules>
</project>
14 years, 10 months
JBoss Tools SVN: r32055 - in trunk/forge: features and 6 other directories.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2011-06-13 07:34:51 -0400 (Mon, 13 Jun 2011)
New Revision: 32055
Added:
trunk/forge/plugins/org.jboss.tools.forge.core/pom.xml
trunk/forge/plugins/org.jboss.tools.forge.runtime/pom.xml
Modified:
trunk/forge/features/org.jboss.tools.forge.feature/
trunk/forge/features/org.jboss.tools.forge.feature/pom.xml
trunk/forge/features/pom.xml
trunk/forge/plugins/org.jboss.tools.forge.core/
trunk/forge/plugins/org.jboss.tools.forge.runtime/
trunk/forge/plugins/org.jboss.tools.forge.ui/
trunk/forge/plugins/org.jboss.tools.forge.ui/pom.xml
trunk/forge/plugins/pom.xml
trunk/forge/pom.xml
trunk/forge/site/
trunk/forge/site/pom.xml
Log:
JBIDE-9118 added in forge plugins into the build again
Property changes on: trunk/forge/features/org.jboss.tools.forge.feature
___________________________________________________________________
Added: svn:ignore
+ target
buildlog.latest.txt
bin
build
Modified: trunk/forge/features/org.jboss.tools.forge.feature/pom.xml
===================================================================
--- trunk/forge/features/org.jboss.tools.forge.feature/pom.xml 2011-06-13 09:08:07 UTC (rev 32054)
+++ trunk/forge/features/org.jboss.tools.forge.feature/pom.xml 2011-06-13 11:34:51 UTC (rev 32055)
@@ -5,10 +5,10 @@
<parent>
<groupId>org.jboss.tools.forge</groupId>
<artifactId>features</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>0.0.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.forge.features</groupId>
<artifactId>org.jboss.tools.forge.feature</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
-</project>
\ No newline at end of file
+</project>
Modified: trunk/forge/features/pom.xml
===================================================================
--- trunk/forge/features/pom.xml 2011-06-13 09:08:07 UTC (rev 32054)
+++ trunk/forge/features/pom.xml 2011-06-13 11:34:51 UTC (rev 32055)
@@ -5,11 +5,11 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>forge</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>0.0.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.forge</groupId>
<artifactId>features</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>0.0.2-SNAPSHOT</version>
<name>forge.features</name>
<packaging>pom</packaging>
<modules>
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.core
___________________________________________________________________
Added: svn:ignore
+ target
buildlog.latest.txt
bin
build
Added: trunk/forge/plugins/org.jboss.tools.forge.core/pom.xml
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.core/pom.xml (rev 0)
+++ trunk/forge/plugins/org.jboss.tools.forge.core/pom.xml 2011-06-13 11:34:51 UTC (rev 32055)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.jboss.tools.forge</groupId>
+ <artifactId>forge.plugins</artifactId>
+ <version>0.0.2-SNAPSHOT</version>
+ </parent>
+ <groupId>org.jboss.tools.forge.plugins</groupId>
+ <artifactId>org.jboss.tools.forge.core</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>eclipse-plugin</packaging>
+</project>
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.runtime
___________________________________________________________________
Added: svn:ignore
+ target
buildlog.latest.txt
bin
build
Added: trunk/forge/plugins/org.jboss.tools.forge.runtime/pom.xml
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.runtime/pom.xml (rev 0)
+++ trunk/forge/plugins/org.jboss.tools.forge.runtime/pom.xml 2011-06-13 11:34:51 UTC (rev 32055)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.jboss.tools.forge</groupId>
+ <artifactId>forge.plugins</artifactId>
+ <version>0.0.2-SNAPSHOT</version>
+ </parent>
+ <groupId>org.jboss.tools.forge.plugins</groupId>
+ <artifactId>org.jboss.tools.forge.runtime</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>eclipse-plugin</packaging>
+</project>
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui
___________________________________________________________________
Added: svn:ignore
+ target
buildlog.latest.txt
bin
build
Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/pom.xml
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/pom.xml 2011-06-13 09:08:07 UTC (rev 32054)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/pom.xml 2011-06-13 11:34:51 UTC (rev 32055)
@@ -2,12 +2,12 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.jboss.tools</groupId>
- <artifactId>org.jboss.tools.parent.pom</artifactId>
+ <groupId>org.jboss.tools.forge</groupId>
+ <artifactId>forge.plugins</artifactId>
<version>0.0.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.forge.plugins</groupId>
<artifactId>org.jboss.tools.forge.ui</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
Modified: trunk/forge/plugins/pom.xml
===================================================================
--- trunk/forge/plugins/pom.xml 2011-06-13 09:08:07 UTC (rev 32054)
+++ trunk/forge/plugins/pom.xml 2011-06-13 11:34:51 UTC (rev 32055)
@@ -5,14 +5,16 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>forge</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>0.0.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.forge</groupId>
- <artifactId>plugins</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <artifactId>forge.plugins</artifactId>
+ <version>0.0.2-SNAPSHOT</version>
<name>forge.plugins</name>
<packaging>pom</packaging>
<modules>
+ <module>org.jboss.tools.forge.runtime</module>
+ <module>org.jboss.tools.forge.core</module>
<module>org.jboss.tools.forge.ui</module>
</modules>
</project>
Modified: trunk/forge/pom.xml
===================================================================
--- trunk/forge/pom.xml 2011-06-13 09:08:07 UTC (rev 32054)
+++ trunk/forge/pom.xml 2011-06-13 11:34:51 UTC (rev 32055)
@@ -10,7 +10,7 @@
</parent>
<groupId>org.jboss.tools</groupId>
<artifactId>forge</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>0.0.2-SNAPSHOT</version>
<name>forge.all</name>
<packaging>pom</packaging>
<modules>
Property changes on: trunk/forge/site
___________________________________________________________________
Added: svn:ignore
+ target
buildlog.latest.txt
bin
build
Modified: trunk/forge/site/pom.xml
===================================================================
--- trunk/forge/site/pom.xml 2011-06-13 09:08:07 UTC (rev 32054)
+++ trunk/forge/site/pom.xml 2011-06-13 11:34:51 UTC (rev 32055)
@@ -5,11 +5,11 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>forge</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>0.0.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.forge</groupId>
<artifactId>forge.site</artifactId>
<name>forge.site</name>
- <version>0.0.1-SNAPSHOT</version>
+ <version>0.0.2-SNAPSHOT</version>
<packaging>eclipse-update-site</packaging>
-</project>
\ No newline at end of file
+</project>
14 years, 10 months
JBoss Tools SVN: r32054 - in trunk/as/plugins: org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-06-13 05:08:07 -0400 (Mon, 13 Jun 2011)
New Revision: 32054
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchDelegate.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSectionComposite.java
Log:
JBIDE-9093 for AS 4 through 7 local versions via RSE
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchDelegate.java 2011-06-13 08:37:34 UTC (rev 32053)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchDelegate.java 2011-06-13 09:08:07 UTC (rev 32054)
@@ -44,6 +44,7 @@
import org.jboss.ide.eclipse.as.core.util.ArgsUtil;
import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants;
import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants;
+import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
import org.jboss.ide.eclipse.as.core.util.JBossServerBehaviorUtils;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
import org.jboss.ide.eclipse.as.rse.core.RSEHostShellModel.ServerShellModel;
@@ -61,6 +62,14 @@
ILaunchConfiguration configuration, String mode, ILaunch launch,
IProgressMonitor monitor) throws CoreException {
JBossServerBehavior beh = JBossServerBehaviorUtils.getServerBehavior(configuration);
+ String ignore = beh.getServer().getAttribute(IJBossToolingConstants.IGNORE_LAUNCH_COMMANDS, (String)null);
+ Boolean ignoreB = ignore == null ? new Boolean(false) : new Boolean(ignore);
+ if( ignoreB.booleanValue()) {
+ beh.setServerStarting();
+ beh.setServerStarted();
+ return;
+ }
+
beh.setServerStarting();
String command = configuration.getAttribute(RSE_STARTUP_COMMAND, (String)null);
try {
@@ -107,6 +116,13 @@
}
public static void launchStopServerCommand(JBossServerBehavior behaviour) {
+ String ignore = behaviour.getServer().getAttribute(IJBossToolingConstants.IGNORE_LAUNCH_COMMANDS, (String)null);
+ Boolean ignoreB = ignore == null ? new Boolean(false) : new Boolean(ignore);
+ if( ignoreB.booleanValue()) {
+ behaviour.setServerStopping();
+ behaviour.setServerStopped();
+ return;
+ }
ILaunchConfiguration config = null;
String command2 = "";
try {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSectionComposite.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSectionComposite.java 2011-06-13 08:37:34 UTC (rev 32053)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSectionComposite.java 2011-06-13 09:08:07 UTC (rev 32054)
@@ -83,7 +83,7 @@
preferencePageBook = toolkit.createPageBook(this, SWT.FLAT|SWT.TOP);
preferencePageBook.setLayoutData(UIUtil.createFormData2(
- deployTypeCombo, 5, 0, 150, 0, 5, 100, -5));
+ deployTypeCombo, 5, 0, 200, 0, 5, 100, -5));
// fill widgets
String[] nameList = new String[deployAdditions.size()];
14 years, 10 months
JBoss Tools SVN: r32053 - in trunk/as/plugins: org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling and 5 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-06-13 04:37:34 -0400 (Mon, 13 Jun 2011)
New Revision: 32053
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/WebPortPoller.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartupLaunchUtil.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerStartupLaunchConfiguration.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSectionComposite.java
Log:
JBIDE-9093 for AS 4 through 7 local versions
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties 2011-06-12 22:15:19 UTC (rev 32052)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties 2011-06-13 08:37:34 UTC (rev 32053)
@@ -5,7 +5,7 @@
serverCountName={0} ({1})
runtime=Runtime
securityException=Security Exception: {0}
-JBoss7ServerBehavior_could_not_stop=Could not stop server adapter {}
+JBoss7ServerBehavior_could_not_stop=Could not stop server adapter {0}
JMXPoller=JMX Poller
loadJMXClassesFailed=Could not load JMX classes for server {0}
PollingStartupSuccess=Server Startup Succeeded
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/WebPortPoller.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/WebPortPoller.java 2011-06-12 22:15:19 UTC (rev 32052)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/WebPortPoller.java 2011-06-13 08:37:34 UTC (rev 32053)
@@ -22,13 +22,14 @@
private ServerStatePollerType type;
private boolean canceled, done;
private boolean state;
+ private boolean expectedState;
-
public void beginPolling(IServer server, boolean expectedState,
PollThread pt) {
this.server = server;
- canceled = done = false;
- state = SERVER_DOWN;
+ this.canceled = done = false;
+ this.expectedState = expectedState;
+ this.state = !expectedState;
launchThread();
}
@@ -46,9 +47,9 @@
String url = getURL(getServer());
while(!canceled && !done) {
boolean up = onePing(url);
- if( up ) {
+ if( up == expectedState ) {
done = true;
- state = SERVER_UP;
+ state = expectedState;
}
}
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartupLaunchUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartupLaunchUtil.java 2011-06-12 22:15:19 UTC (rev 32052)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartupLaunchUtil.java 2011-06-13 08:37:34 UTC (rev 32053)
@@ -305,6 +305,13 @@
JBossServerBehavior jbsBehavior = JBossServerBehaviorUtils.getServerBehavior(configuration);
if (!jbsBehavior.canStart(mode).isOK())
throw new CoreException(jbsBehavior.canStart(mode));
+ String ignore = jbsBehavior.getServer().getAttribute(IJBossToolingConstants.IGNORE_LAUNCH_COMMANDS, (String)null);
+ Boolean ignoreB = ignore == null ? new Boolean(false) : new Boolean(ignore);
+ if( ignoreB.booleanValue()) {
+ jbsBehavior.setServerStarting();
+ jbsBehavior.setServerStarted();
+ return false;
+ }
boolean started = WebPortPoller.onePing(jbsBehavior.getServer());
if( started ) {
jbsBehavior.setServerStarting();
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java 2011-06-12 22:15:19 UTC (rev 32052)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java 2011-06-13 08:37:34 UTC (rev 32053)
@@ -40,6 +40,7 @@
import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior;
import org.jboss.ide.eclipse.as.core.server.internal.JBossServerBehavior;
import org.jboss.ide.eclipse.as.core.server.internal.PollThread;
+import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
public class JBoss7ServerBehavior extends JBossServerBehavior {
@@ -151,7 +152,12 @@
}
public void stop(boolean force) {
-
+ String tmp = getServer().getAttribute(IJBossToolingConstants.IGNORE_LAUNCH_COMMANDS, (String)null);
+ Boolean b = tmp == null ? new Boolean(false) : new Boolean(tmp);
+ if( b.booleanValue()) {
+ super.setServerStopped();
+ return;
+ }
try {
if (force) {
if( serverProcess != null )
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerStartupLaunchConfiguration.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerStartupLaunchConfiguration.java 2011-06-12 22:15:19 UTC (rev 32052)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerStartupLaunchConfiguration.java 2011-06-13 08:37:34 UTC (rev 32053)
@@ -18,7 +18,9 @@
import org.eclipse.debug.core.model.IProcess;
import org.jboss.ide.eclipse.as.core.extensions.polling.WebPortPoller;
import org.jboss.ide.eclipse.as.core.server.internal.JBossServerBehavior;
+import org.jboss.ide.eclipse.as.core.server.internal.LocalJBossBehaviorDelegate;
import org.jboss.ide.eclipse.as.core.server.internal.launch.JBossServerStartupLaunchConfiguration;
+import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
import org.jboss.ide.eclipse.as.core.util.JBossServerBehaviorUtils;
/**
@@ -34,6 +36,13 @@
public boolean preLaunchCheck(ILaunchConfiguration configuration, String mode, IProgressMonitor monitor)
throws CoreException {
JBossServerBehavior jbsBehavior = JBossServerBehaviorUtils.getServerBehavior(configuration);
+ String tmp = jbsBehavior.getServer().getAttribute(IJBossToolingConstants.IGNORE_LAUNCH_COMMANDS, (String)null);
+ Boolean b = tmp == null ? new Boolean(false) : new Boolean(tmp);
+ if( b.booleanValue()) {
+ jbsBehavior.setServerStarting();
+ jbsBehavior.setServerStarted();
+ return false;
+ }
boolean started = WebPortPoller.onePing(jbsBehavior.getServer());
if( started ) {
jbsBehavior.setServerStarting();
@@ -61,6 +70,7 @@
IProcess[] processes = launch.getProcesses();
if (processes != null && processes.length >= 1) {
behavior.setProcess(processes[0]);
+ ((LocalJBossBehaviorDelegate) (behavior.getDelegate())).setProcess(processes[0]);
}
behavior.setRunMode(mode);
} catch (CoreException ce) {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java 2011-06-12 22:15:19 UTC (rev 32052)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java 2011-06-13 08:37:34 UTC (rev 32053)
@@ -96,8 +96,8 @@
public static final String WEB_PORT_DEFAULT_XPATH = Messages.Ports + IPath.SEPARATOR + "JBoss Web"; //$NON-NLS-1$
public static final int JNDI_DEFAULT_PORT = 1099;
public static final int JBOSS_WEB_DEFAULT_PORT = 8080;
+ public static final String IGNORE_LAUNCH_COMMANDS = "org.jboss.ide.eclipse.as.core.server.IGNORE_LAUNCH_COMMANDS"; //$NON-NLS-1$
-
public static final String LOCAL_DEPLOYMENT_NAME = "name"; //$NON-NLS-1$
public static final String LOCAL_DEPLOYMENT_LOC = "location"; //$NON-NLS-1$
public static final String LOCAL_DEPLOYMENT_TEMP_LOC = "tempLocation"; //$NON-NLS-1$
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java 2011-06-12 22:15:19 UTC (rev 32052)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java 2011-06-13 08:37:34 UTC (rev 32053)
@@ -182,6 +182,9 @@
public static String EditorSetTempDeployLabel;
public static String EditorEditDeployLocCommand;
public static String EditorModule;
+ public static String EditorDoNotLaunch;
+ public static String EditorDoNotLaunchCommand;
+ public static String EditorChangeServerMode;
public static String EditorZipDeployments;
public static String EditorSetRadioClicked;
public static String EditorDeployDNE;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2011-06-12 22:15:19 UTC (rev 32052)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2011-06-13 08:37:34 UTC (rev 32053)
@@ -159,6 +159,9 @@
EditorSetRadioClicked=Set Deploy Location
EditorDeployDNE=The deploy directory "{0}" does not exist.
EditorTempDeployDNE=The temporary deploy directory "{0}" does not exist.
+EditorDoNotLaunch=Do not execute startup or shutdown commands.
+EditorDoNotLaunchCommand=Toggle Startup and Shutdown scripts
+EditorChangeServerMode=Change server mode
EditorStartupPollerLabel=Startup Poller
EditorShutdownPollerLabel=Shutdown Poller
EditorChangeStartPollerCommandName=Change Startup Poller
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSectionComposite.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSectionComposite.java 2011-06-12 22:15:19 UTC (rev 32052)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSectionComposite.java 2011-06-13 08:37:34 UTC (rev 32053)
@@ -15,11 +15,15 @@
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.layout.FormData;
import org.eclipse.swt.layout.FormLayout;
+import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
import org.eclipse.ui.forms.widgets.FormToolkit;
import org.eclipse.ui.forms.widgets.ScrolledPageBook;
import org.eclipse.wst.server.core.IServerWorkingCopy;
@@ -33,6 +37,7 @@
import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
import org.jboss.ide.eclipse.as.ui.FormUtils;
+import org.jboss.ide.eclipse.as.ui.Messages;
import org.jboss.ide.eclipse.as.ui.UIUtil;
import org.jboss.ide.eclipse.as.ui.editor.IDeploymentTypeUI.IServerModeUICallback;
@@ -41,6 +46,7 @@
private Combo deployTypeCombo;
private ScrolledPageBook preferencePageBook;
private IServerModeUICallback callback;
+ private Button executeShellScripts; // may be null;
public ServerModeSectionComposite(Composite parent, int style, IServerModeUICallback callback) {
super(parent, style);
@@ -49,8 +55,29 @@
FormToolkit toolkit = new FormToolkit(getDisplay());
FormUtils.adaptFormCompositeRecursively(this, toolkit);
setLayout(new FormLayout());
+
+ Control top = null;
+ if( showExecuteShellCheckbox()) {
+ executeShellScripts = new Button(this, SWT.CHECK);
+ executeShellScripts.setText(Messages.EditorDoNotLaunch);
+ FormData fd = UIUtil.createFormData2(0, 5, null, 0, 0, 5, null, 0);
+ executeShellScripts.setLayoutData(fd);
+ top = executeShellScripts;
+ String tmp = callback.getServer().getAttribute(IJBossToolingConstants.IGNORE_LAUNCH_COMMANDS, (String)null);
+ Boolean b = tmp == null ? new Boolean(false) : new Boolean(tmp);
+ executeShellScripts.setSelection(b.booleanValue());
+
+ executeShellScripts.addSelectionListener(new SelectionListener(){
+ public void widgetSelected(SelectionEvent e) {
+ executeShellToggled();
+ }
+ public void widgetDefaultSelected(SelectionEvent e) {
+ }}
+ );
+ }
+
deployTypeCombo = new Combo(this, SWT.READ_ONLY);
- FormData fd = UIUtil.createFormData2(0, 5, null, 0, 0, 5, 50, -5);
+ FormData fd = UIUtil.createFormData2(top, 5, null, 0, 0, 5, 50, -5);
deployTypeCombo.setLayoutData(fd);
@@ -80,7 +107,7 @@
current = behType.getName();
callback.execute(new ChangeServerPropertyCommand(
callback.getServer(), IDeployableServer.SERVER_MODE,
- behType.getId(), "Change server mode"));
+ behType.getId(), Messages.EditorChangeServerMode));
}
if( current != null ) {
int index = deployTypeCombo.indexOf(current);
@@ -93,7 +120,17 @@
}});
deployTypeChanged(false);
}
+
+ protected boolean showExecuteShellCheckbox() {
+ return true;
+ }
+ protected void executeShellToggled() {
+ callback.execute(new ChangeServerPropertyCommand(
+ callback.getServer(), IJBossToolingConstants.IGNORE_LAUNCH_COMMANDS,
+ new Boolean(executeShellScripts.getSelection()).toString(), Messages.EditorDoNotLaunchCommand));
+ }
+
private class DeployUIAdditions {
private IJBossServerPublishMethodType publishType;
private IDeploymentTypeUI ui;
14 years, 10 months
