JBoss Tools SVN: r34597 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/project.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-09-09 03:48:54 -0400 (Fri, 09 Sep 2011)
New Revision: 34597
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/project/SarArtifactAdapter.java
Log:
JBIDE-9632 - sar artifact adapter with rogue override
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/project/SarArtifactAdapter.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/project/SarArtifactAdapter.java 2011-09-09 02:57:30 UTC (rev 34596)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/project/SarArtifactAdapter.java 2011-09-09 07:48:54 UTC (rev 34597)
@@ -31,7 +31,6 @@
this.module = mod;
}
- @Override
public IModule getModule() {
return module;
}
14 years, 7 months
JBoss Tools SVN: r34596 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-09-08 22:57:30 -0400 (Thu, 08 Sep 2011)
New Revision: 34596
Modified:
trunk/build/target-platform/publish.sh
Log:
add protocol=28 to make old slaves more friendly when publishing bits
Modified: trunk/build/target-platform/publish.sh
===================================================================
--- trunk/build/target-platform/publish.sh 2011-09-09 02:57:27 UTC (rev 34595)
+++ trunk/build/target-platform/publish.sh 2011-09-09 02:57:30 UTC (rev 34596)
@@ -69,7 +69,7 @@
du -sh ${repoDir} ${destinationPath}/${targetZipFile}
# copy/update into central place for reuse by local downstream build jobs
- date; rsync -arzqc --delete-after --delete-excluded --rsh=ssh ${exclude} ${include} ${destinationPath}/${targetZipFile}/
+ date; rsync -arzqc --protocol=28 --delete-after --delete-excluded --rsh=ssh ${exclude} ${include} ${destinationPath}/${targetZipFile}/
du -sh ${repoDir} ${destinationPath}/${targetZipFile}
@@ -78,7 +78,7 @@
mkdir -p ${DESTINATION}/
fi
# if the following line fails, make sure that ${DESTINATION} is already created on target server
- date; rsync -arzqc --delete-after --delete-excluded --rsh=ssh ${exclude} ${include} ${DESTINATION}/latest/
+ date; rsync -arzqc --protocol=28 --delete-after --delete-excluded --rsh=ssh ${exclude} ${include} ${DESTINATION}/latest/
targetZip=/tmp/${targetZipFile}.zip
@@ -89,6 +89,6 @@
# generate MD5 sum for zip (file contains only the hash, not the hash + filename)
for m in $(md5sum ${targetZip}); do if [[ $m != ${targetZip} ]]; then echo $m > ${targetZip}.MD5; fi; done
- date; rsync -arzq --rsh=ssh ${targetZip} ${targetZip}.MD5 ${DESTINATION}/
+ date; rsync -arzq --protocol=28 --rsh=ssh ${targetZip} ${targetZip}.MD5 ${DESTINATION}/
rm -f ${targetZip} ${targetZip}.MD5
fi
14 years, 7 months
JBoss Tools SVN: r34595 - branches/jbosstools-3.2.x/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-09-08 22:57:27 -0400 (Thu, 08 Sep 2011)
New Revision: 34595
Modified:
branches/jbosstools-3.2.x/build/target-platform/publish.sh
Log:
add protocol=28 to make old slaves more friendly when publishing bits
Modified: branches/jbosstools-3.2.x/build/target-platform/publish.sh
===================================================================
--- branches/jbosstools-3.2.x/build/target-platform/publish.sh 2011-09-09 02:53:01 UTC (rev 34594)
+++ branches/jbosstools-3.2.x/build/target-platform/publish.sh 2011-09-09 02:57:27 UTC (rev 34595)
@@ -67,7 +67,7 @@
du -sh ${repoDir} ${destinationPath}/${targetZipFile}
# copy/update into central place for reuse by local downstream build jobs
- date; rsync -arzqc --delete-after --delete-excluded --rsh=ssh ${exclude} ${include} ${destinationPath}/${targetZipFile}/
+ date; rsync -arzqc --protocol=28 --delete-after --delete-excluded --rsh=ssh ${exclude} ${include} ${destinationPath}/${targetZipFile}/
du -sh ${repoDir} ${destinationPath}/${targetZipFile}
@@ -76,7 +76,7 @@
mkdir -p ${DESTINATION}/
fi
# if the following line fails, make sure that ${DESTINATION} is already created on target server
- date; rsync -arzqc --delete-after --delete-excluded --rsh=ssh ${exclude} ${include} ${DESTINATION}/latest/
+ date; rsync -arzqc --protocol=28 --delete-after --delete-excluded --rsh=ssh ${exclude} ${include} ${DESTINATION}/latest/
targetZip=/tmp/${targetZipFile}.zip
@@ -87,6 +87,6 @@
# generate MD5 sum for zip (file contains only the hash, not the hash + filename)
for m in $(md5sum ${targetZip}); do if [[ $m != ${targetZip} ]]; then echo $m > ${targetZip}.MD5; fi; done
- date; rsync -arzq --rsh=ssh ${targetZip} ${targetZip}.MD5 ${DESTINATION}/
+ date; rsync -arzq --protocol=28 --rsh=ssh ${targetZip} ${targetZip}.MD5 ${DESTINATION}/
rm -f ${targetZip} ${targetZip}.MD5
fi
14 years, 7 months
JBoss Tools SVN: r34594 - in trunk/download.jboss.org/jbosstools/updates: indigo and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-09-08 22:53:01 -0400 (Thu, 08 Sep 2011)
New Revision: 34594
Added:
trunk/download.jboss.org/jbosstools/updates/helios/index.html
trunk/download.jboss.org/jbosstools/updates/indigo/index.html
Removed:
trunk/download.jboss.org/jbosstools/updates/helios/README.html
trunk/download.jboss.org/jbosstools/updates/indigo/README.html
Modified:
trunk/download.jboss.org/jbosstools/updates/indigo/.gitignore
Log:
https://issues.jboss.org/browse/JBIDE-9272 more dirs for which seeing a directory listing is apparently scary and evil and to be avoided
Deleted: trunk/download.jboss.org/jbosstools/updates/helios/README.html
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/helios/README.html 2011-09-08 23:16:41 UTC (rev 34593)
+++ trunk/download.jboss.org/jbosstools/updates/helios/README.html 2011-09-09 02:53:01 UTC (rev 34594)
@@ -1,114 +0,0 @@
-<html>
-<head>
-<title>JBoss Tools Requirements - Composite Mirror - Helios</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" width="800">
- <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 Requirements - Composite Mirror - Helios</h2>
- <table width="100%">
- <tr class="dark-row" style="height: 30px">
- <td class="bodyText">
- <p class="bodyText">
-This composite site includes all the third party projects' upstream dependencies (eg., Eclipse, WTP, Orbit) for Eclipse 3.6 / Web Tools 3.2 / Helios.
-Point Eclipse at this URL to browse or install features. You can also explore this site's contents via its <a class=link href=compositeArtifacts.xml>compositeArtifacts.xml</a> file, or <a href=../requirements/>here</a>.
- </p>
- </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>
Copied: trunk/download.jboss.org/jbosstools/updates/helios/index.html (from rev 34593, trunk/download.jboss.org/jbosstools/updates/helios/README.html)
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/helios/index.html (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/helios/index.html 2011-09-09 02:53:01 UTC (rev 34594)
@@ -0,0 +1,118 @@
+<html>
+<head>
+<title>JBoss Tools Requirements - Composite Mirror - Helios</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" width="800">
+ <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 Requirements - Composite Mirror - Helios</h2>
+ <table width="100%">
+ <tr class="dark-row" style="height: 30px">
+ <td class="bodyText">
+ <p class="bodyText">
+This composite site includes all the third party projects' upstream dependencies (eg., Eclipse, WTP, Orbit) for Eclipse 3.6 / Web Tools 3.2 / Helios.
+Point Eclipse at this URL to browse or install features. You can also explore this site's contents via its <a class=link href=compositeArtifacts.xml>compositeArtifacts.xml</a> file, or <a href=../requirements/>here</a>. For more on building this site, see <a href=README.building.txt>this README</a>.
+ </p>
+ <p class="bodyText">Available Versions:<ul>
+ <li><a href=compositeArtifacts.xml>Helios SR2</a> & <a href=extras/compositeArtifacts.xml>SR2 extras</a></li>
+ </ul>
+ </p>
+ </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/indigo/.gitignore
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/.gitignore 2011-09-08 23:16:41 UTC (rev 34593)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/.gitignore 2011-09-09 02:53:01 UTC (rev 34594)
@@ -1 +1,2 @@
*~
+.directory
Deleted: trunk/download.jboss.org/jbosstools/updates/indigo/README.html
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/README.html 2011-09-08 23:16:41 UTC (rev 34593)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/README.html 2011-09-09 02:53:01 UTC (rev 34594)
@@ -1,114 +0,0 @@
-<html>
-<head>
-<title>JBoss Tools Requirements - Composite Mirror - Indigo</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" width="800">
- <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 Requirements - Composite Mirror - Indigo</h2>
- <table width="100%">
- <tr class="dark-row" style="height: 30px">
- <td class="bodyText">
- <p class="bodyText">
-This composite site includes all the third party projects' upstream dependencies (eg., Eclipse, WTP, Orbit) for Eclipse 3.7 / Web Tools 3.3 / Indigo.
-Point Eclipse at this URL to browse or install features. You can also explore this site's contents via its <a class=link href=compositeArtifacts.xml>compositeArtifacts.xml</a> file, or <a href=../requirements/>here</a>.
- </p>
- </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>
Copied: trunk/download.jboss.org/jbosstools/updates/indigo/index.html (from rev 34593, trunk/download.jboss.org/jbosstools/updates/indigo/README.html)
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/index.html (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/index.html 2011-09-09 02:53:01 UTC (rev 34594)
@@ -0,0 +1,122 @@
+<html>
+<head>
+<title>JBoss Tools Requirements - Composite Mirror - Indigo</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" width="800">
+ <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 Requirements - Composite Mirror - Indigo</h2>
+ <table width="100%">
+ <tr class="dark-row" style="height: 30px">
+ <td class="bodyText">
+ <p class="bodyText">
+This composite site includes all the third party projects' upstream dependencies (eg., Eclipse, WTP, Orbit) for Eclipse 3.7 / Web Tools 3.3 / Indigo.
+Point Eclipse at this URL to browse or install features. You can also explore this site's contents via its <a class=link href=compositeArtifacts.xml>compositeArtifacts.xml</a> file, or <a href=../requirements/>here</a>. For more on building this site, see <a href=README.building.txt>this README</a>.
+</p>
+
+ <p class="bodyText">Available Versions:<ul>
+ <li><a href=SR0>Indigo SR0</a> & <a href=extras/SR0>SR0 extras</a></li>
+ <li><a href=RC2>Indigo RC2</a> & <a href=extras/RC2>RC2 extras</a></li>
+ <li><a href=M7>Indigo M7</a></li>
+ <li><a href=M6>Indigo M6</a> & <a href=extras/M6>M6 extras</a></li>
+ </ul>
+ </p>
+ </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>
14 years, 7 months
JBoss Tools SVN: r34593 - in trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext: hyperlink and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-09-08 19:16:41 -0400 (Thu, 08 Sep 2011)
New Revision: 34593
Added:
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AssignableBeansDialog.java
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AssignableBeansHyperlink.java
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/CDIExtensionsMessages.java
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlinkDetector.java
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/messages.properties
Log:
JBIDE-9347
https://issues.jboss.org/browse/JBIDE-9347
Initial implementation of Assignable Beans dialog.
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/CDIExtensionsMessages.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/CDIExtensionsMessages.java 2011-09-08 21:17:52 UTC (rev 34592)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/CDIExtensionsMessages.java 2011-09-08 23:16:41 UTC (rev 34593)
@@ -29,10 +29,13 @@
public static String CDI_INJECTED_POINT_HYPERLINK_OPEN_ALTERNATIVE;
public static String CDI_INJECTED_POINT_HYPERLINK_OPEN_PRODUCER;
public static String CDI_INJECTED_POINT_HYPERLINK_SHOW_ALTERNATIVES;
+ public static String CDI_INJECTED_POINT_HYPERLINK_SHOW_ASSIGNABLE;
public static String CDI_PRODUCER_DISPOSER_HYPERLINK_OPEN_BOUND_DISPOSER;
public static String CDI_PRODUCER_DISPOSER_HYPERLINK_OPEN_BOUND_PRODUCER;
public static String CDI_EVENT_LIST_HYPERLINK_OPEN_OBSERVER_METHODS;
public static String CDI_EVENT_LIST_HYPERLINK_OPEN_EVENTS;
public static String CDI_EVENT_HYPERLINK_OPEN_OBSERVER_METHOD;
public static String CDI_EVENT_HYPERLINK_OPEN_EVENT;
+
+ public static String ASSIGNABLE_BEANS_DIALOG_TITLE;
}
Added: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AssignableBeansDialog.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AssignableBeansDialog.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AssignableBeansDialog.java 2011-09-08 23:16:41 UTC (rev 34593)
@@ -0,0 +1,486 @@
+/*******************************************************************************
+ * 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.text.ext.hyperlink;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+
+import org.eclipse.jdt.core.IMethod;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.dialogs.TitleAreaDialog;
+import org.eclipse.jface.resource.JFaceResources;
+import org.eclipse.jface.viewers.CheckStateChangedEvent;
+import org.eclipse.jface.viewers.CheckboxTreeViewer;
+import org.eclipse.jface.viewers.ICheckStateListener;
+import org.eclipse.jface.viewers.ICheckStateProvider;
+import org.eclipse.jface.viewers.IColorProvider;
+import org.eclipse.jface.viewers.IFontProvider;
+import org.eclipse.jface.viewers.IStructuredContentProvider;
+import org.eclipse.jface.viewers.ITableLabelProvider;
+import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.Font;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.Shell;
+import org.jboss.tools.cdi.core.CDIConstants;
+import org.jboss.tools.cdi.core.IBean;
+import org.jboss.tools.cdi.core.IBeanMember;
+import org.jboss.tools.cdi.core.IClassBean;
+import org.jboss.tools.cdi.core.IInjectionPoint;
+import org.jboss.tools.cdi.core.IInjectionPointParameter;
+import org.jboss.tools.cdi.core.IProducer;
+import org.jboss.tools.cdi.core.IProducerField;
+import org.jboss.tools.cdi.core.IProducerMethod;
+import org.jboss.tools.cdi.core.IQualifierDeclaration;
+import org.jboss.tools.common.java.IParametedType;
+
+public class AssignableBeansDialog extends TitleAreaDialog {
+ IInjectionPoint injectionPoint;
+ Set<IBean> beans = new HashSet<IBean>();
+ Set<IBean> eligibleBeans = new HashSet<IBean>();
+ Set<IBean> resolvedBeans = new HashSet<IBean>();
+
+ CheckboxTreeViewer filterView;
+ TableViewer list;
+
+ public AssignableBeansDialog(Shell parentShell) {
+ super(parentShell);
+ }
+
+ public void setInjectionPoint(IInjectionPoint injectionPoint) {
+ this.injectionPoint = injectionPoint;
+ beans = injectionPoint.getCDIProject().getBeans(false, injectionPoint);
+ eligibleBeans = new HashSet<IBean>(beans);
+ for (int i = OPTION_UNAVAILABLE_BEANS + 1; i < OPTION_ELIMINATED_AMBIGUOUS; i++) {
+ Filter f = ALL_OPTIONS[i].filter;
+ if(f != null) {
+ f.filter(eligibleBeans);
+ }
+ }
+ resolvedBeans = injectionPoint.getCDIProject().getBeans(true, injectionPoint);
+ }
+
+ String computeTitle() {
+ StringBuffer result = new StringBuffer();
+ result.append("@Inject ");
+
+ if(injectionPoint instanceof IInjectionPointParameter) {
+ IMethod m = ((IInjectionPointParameter)injectionPoint).getBeanMethod().getMethod();
+ result.append(m.getElementName()).append("(");
+ }
+ Set<IQualifierDeclaration> ds = injectionPoint.getQualifierDeclarations();
+ for (IQualifierDeclaration d: ds) {
+ result.append("@").append(d.getType().getElementName()).append(" ");
+ }
+
+ IParametedType type = injectionPoint.getMemberType();
+ result.append(type.getType().getElementName()).append(" ");
+
+ if(injectionPoint instanceof IInjectionPointParameter) {
+ result.append(((IInjectionPointParameter)injectionPoint).getName());
+ result.append(")");
+ } else {
+ result.append(injectionPoint.getSourceMember().getElementName());
+ }
+
+ return result.toString();
+ }
+
+ protected void buttonPressed(int buttonId) {
+ if(buttonId == IDialogConstants.CLOSE_ID) {
+ cancelPressed();
+ }
+ }
+
+ protected Control createDialogArea(Composite parent) {
+ Composite composite = new Composite(parent, SWT.NONE);
+ GridLayout layout = new GridLayout(2, false);
+ layout.marginHeight = 0;
+ layout.marginWidth = 0;
+ layout.verticalSpacing = 0;
+ layout.horizontalSpacing = 0;
+ composite.setLayout(layout);
+ composite.setLayoutData(new GridData(GridData.FILL_BOTH));
+ composite.setFont(parent.getFont());
+ setTitle(computeTitle());
+ createListView(composite);
+ createFilterView(composite);
+ return composite;
+ }
+
+ protected void createButtonsForButtonBar(Composite parent) {
+ createButton(parent, IDialogConstants.CLOSE_ID, IDialogConstants.CLOSE_LABEL,
+ true);
+ }
+
+ void createListView(Composite parent) {
+ list = new TableViewer(parent);
+ GridData g = new GridData(GridData.FILL_BOTH);
+ list.getControl().setLayoutData(g);
+ list.setContentProvider(new ListContent());
+ list.setLabelProvider(new LP());
+ list.setInput(injectionPoint);
+ }
+
+ void createFilterView(Composite parent) {
+ Group g = new Group(parent, 0);
+ g.setText("Show/Hide");
+ g.setLayoutData(new GridData(GridData.FILL_VERTICAL | GridData.VERTICAL_ALIGN_BEGINNING));
+ g.setLayout(new GridLayout(1, false));
+ filterView = new CheckboxTreeViewer(g);
+ filterView.setAutoExpandLevel(3);
+ filterView.setContentProvider(checkboxContentProvider);
+ filterView.setInput(ROOT);
+ for (int i = 1; i < ALL_OPTIONS.length; i++) {
+ filterView.setChecked(ALL_OPTIONS[i], true);
+ }
+ filterView.getControl().setBackground(g.getBackground());
+ g.setData(new GridData(GridData.FILL_BOTH));
+ filterView.addCheckStateListener(new ICheckStateListener() {
+ @Override
+ public void checkStateChanged(CheckStateChangedEvent event) {
+ ((Checkbox)event.getElement()).state = event.getChecked();
+ filterView.refresh();
+ list.refresh();
+ }
+ });
+ filterView.setCheckStateProvider(new ICheckStateProvider() {
+
+ @Override
+ public boolean isGrayed(Object element) {
+ Checkbox c = (Checkbox)element;
+ return c.parent != null && !c.parent.state;
+ }
+
+ @Override
+ public boolean isChecked(Object element) {
+ Checkbox c = (Checkbox)element;
+ return c.state;
+ }
+ });
+ }
+
+ static int OPTION_UNAVAILABLE_BEANS = 1;
+ static int OPTION_DECORATOR = 2;
+ static int OPTION_INTERCEPTOR = 3;
+ static int OPTION_UNSELECTED_ALTERNATIVE = 4;
+ static int OPTION_PRODUCER_IN_UNAVAILABLE_BEAN = 5;
+ static int OPTION_SPECIALIZED_BEAN = 6;
+ static int OPTION_ELIMINATED_AMBIGUOUS = 7;
+
+ static class Checkbox {
+ int id;
+ String label;
+ Filter filter;
+ boolean state = true;
+ Checkbox(int id, String label, Filter filter) {
+ this.id = id;
+ this.label = label;
+ this.filter = filter;
+ }
+ Checkbox parent = null;
+ List<Checkbox> children = new ArrayList<Checkbox>();
+
+ Checkbox add(int id, String label, Filter f) {
+ Checkbox c = new Checkbox(id, label, f);
+ ALL_OPTIONS[id] = c;
+ c.parent = this;
+ children.add(c);
+ return c;
+ }
+
+ public String toString() {
+ return label;
+ }
+
+ public boolean isEnabled() {
+ return state && (parent == null || parent.isEnabled());
+ }
+
+ public void filter(Set<IBean> beans) {
+ if(id == OPTION_ELIMINATED_AMBIGUOUS) filter = new EliminatedAmbiguousFilter();
+ if(!isEnabled() && filter != null) {
+ filter.filter(beans);
+ }
+ for (Checkbox c: children) {
+ c.filter(beans);
+ }
+ }
+ }
+
+ static Checkbox[] ALL_OPTIONS = new Checkbox[8];
+
+ static Checkbox ROOT = new Checkbox(0, "", null);
+
+ static {
+ Checkbox unavailable = ROOT.add(OPTION_UNAVAILABLE_BEANS, "Unavailable Beans", null);
+ unavailable.add(OPTION_DECORATOR, "@Decorator", new DecoratorFilter());
+ unavailable.add(OPTION_INTERCEPTOR, "@Interceptor", new InterceptorFilter());
+ unavailable.add(OPTION_UNSELECTED_ALTERNATIVE, "Unselected @Alternative", new UnselectedAlternativeFilter());
+ unavailable.add(OPTION_PRODUCER_IN_UNAVAILABLE_BEAN, "@Produces in unavailable bean", new ProducerFilter());
+ unavailable.add(OPTION_SPECIALIZED_BEAN, "Specialized beans", new SpecializedBeanFilter());
+ ROOT.add(OPTION_ELIMINATED_AMBIGUOUS, "Eliminated ambiguous", new EliminatedAmbiguousFilter());
+ }
+
+ static CheckboxContentProvider checkboxContentProvider = new CheckboxContentProvider();
+
+ static class CheckboxContentProvider implements ITreeContentProvider {
+
+ @Override
+ public void dispose() {
+ }
+
+ @Override
+ public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+ }
+
+ @Override
+ public Object[] getElements(Object inputElement) {
+ return getChildren(inputElement);
+ }
+
+ @Override
+ public Object[] getChildren(Object parentElement) {
+ return ((Checkbox)parentElement).children.toArray(new Checkbox[0]);
+ }
+
+ @Override
+ public Object getParent(Object element) {
+ return ((Checkbox)element).parent;
+ }
+
+ @Override
+ public boolean hasChildren(Object element) {
+ return !((Checkbox)element).children.isEmpty();
+ }
+ }
+
+ class ListContent implements IStructuredContentProvider {
+
+ @Override
+ public void dispose() {
+ }
+
+ @Override
+ public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+ }
+
+ @Override
+ public Object[] getElements(Object inputElement) {
+ Set<IBean> bs = new HashSet<IBean>(beans);
+ LP p = new LP();
+ ROOT.filter(bs);
+ Map<String, IBean> map = new TreeMap<String, IBean>();
+ for (IBean b: bs) {
+ if(resolvedBeans.contains(b)) {
+ map.put(p.getText(b), b);
+ }
+ }
+ List<IBean> sorted = new ArrayList<IBean>();
+ sorted.addAll(map.values());
+ bs.removeAll(map.values());
+ map.clear();
+
+ for (IBean b: bs) {
+ if(eligibleBeans.contains(b)) {
+ map.put(p.getText(b), b);
+ }
+ }
+ sorted.addAll(map.values());
+ bs.removeAll(map.values());
+ map.clear();
+
+ for (IBean b: bs) {
+ map.put(p.getText(b), b);
+ }
+ sorted.addAll(map.values());
+
+ return sorted.toArray(new IBean[0]);
+ }
+
+ }
+
+ class LP extends LabelProvider implements ITableLabelProvider, IFontProvider, IColorProvider {
+ public String getText(Object element) {
+ IBean b = (IBean)element;
+ StringBuffer sb = new StringBuffer();
+ if(b.isAlternative()) {
+ sb.append("@Alternative ");
+ }
+ if(b.isAnnotationPresent(CDIConstants.DECORATOR_STEREOTYPE_TYPE_NAME)) {
+ sb.append("@Decorator ");
+ }
+ if(b.isAnnotationPresent(CDIConstants.INTERCEPTOR_ANNOTATION_TYPE_NAME)) {
+ sb.append("@Interceptor ");
+ }
+ if(b instanceof IProducer) {
+ sb.append("@Produces ");
+ sb.append(b.getBeanClass().getElementName()).append(".");
+ if(b instanceof IProducerField) {
+ sb.append(((IProducerField)b).getField().getElementName());
+ } else {
+ sb.append(((IProducerMethod)b).getMethod().getElementName());
+ }
+ } else {
+ sb.append(b.getBeanClass().getElementName());
+ }
+ String pkg = b.getBeanClass().getPackageFragment().getElementName();
+ sb.append(" - ").append(pkg).append(" - ");
+ return sb.toString();
+ }
+
+ @Override
+ public Font getFont(Object element) {
+ IBean b = (IBean)element;
+ if(eligibleBeans.contains(b)) {
+ return JFaceResources.getFontRegistry().getBold(JFaceResources.DEFAULT_FONT);
+ }
+ return JFaceResources.getFontRegistry().getItalic(JFaceResources.DEFAULT_FONT);
+ }
+
+ Color gray = new Color(null, 128, 128, 128);
+
+ @Override
+ public Color getForeground(Object element) {
+ IBean b = (IBean)element;
+ if(!eligibleBeans.contains(b)) {
+ return gray;
+ }
+ return null;
+ }
+
+ @Override
+ public Color getBackground(Object element) {
+ return null;
+ }
+
+ @Override
+ public Image getColumnImage(Object element, int columnIndex) {
+ return null;
+ }
+
+ @Override
+ public String getColumnText(Object element, int columnIndex) {
+ return getText(element);
+ }
+ }
+
+ static class Filter {
+ public void filter(Set<IBean> beans) {
+ }
+ }
+
+ static class DecoratorFilter extends Filter {
+ public void filter(Set<IBean> beans) {
+ Iterator<IBean> it = beans.iterator();
+ while(it.hasNext()) {
+ IBean b = it.next();
+ if(b.isAnnotationPresent(CDIConstants.DECORATOR_STEREOTYPE_TYPE_NAME)) {
+ it.remove();
+ }
+ }
+ }
+ }
+
+ static class InterceptorFilter extends Filter {
+ public void filter(Set<IBean> beans) {
+ Iterator<IBean> it = beans.iterator();
+ while(it.hasNext()) {
+ IBean b = it.next();
+ if(b.isAnnotationPresent(CDIConstants.INTERCEPTOR_ANNOTATION_TYPE_NAME)) {
+ it.remove();
+ }
+ }
+ }
+ }
+
+ static class UnselectedAlternativeFilter extends Filter {
+ public void filter(Set<IBean> beans) {
+ Iterator<IBean> it = beans.iterator();
+ while(it.hasNext()) {
+ IBean b = it.next();
+ if(b.isAlternative() && !b.isSelectedAlternative()) {
+ it.remove();
+ }
+ }
+ }
+ }
+
+ static class SpecializedBeanFilter extends Filter {
+ public void filter(Set<IBean> beans) {
+ Iterator<IBean> it = beans.iterator();
+ while(it.hasNext()) {
+ IBean b = it.next();
+ if(b instanceof IClassBean && !((IClassBean) b).getSpecializingBeans().isEmpty()) {
+ it.remove();
+ }
+ }
+ }
+ }
+
+ static class ProducerFilter extends Filter {
+ public void filter(Set<IBean> beans) {
+ Iterator<IBean> it = beans.iterator();
+ while(it.hasNext()) {
+ IBean b = it.next();
+ if(b instanceof IProducer && ((IProducer) b).getClassBean() != null && !((IProducer) b).getClassBean().isEnabled()) {
+ it.remove();
+ }
+ }
+ }
+ }
+
+ static class EliminatedAmbiguousFilter extends Filter {
+ public void filter(Set<IBean> beans) {
+ Set<IBean> eligible = new HashSet<IBean>(beans);
+ for (int i = OPTION_UNAVAILABLE_BEANS + 1; i < OPTION_ELIMINATED_AMBIGUOUS; i++) {
+ Filter f = ALL_OPTIONS[i].filter;
+ if(f != null) {
+ f.filter(eligible);
+ }
+ }
+ boolean hasAlternative = false;
+ for (IBean b: eligible) {
+ if(b.isEnabled() && b.isAlternative() && b.isSelectedAlternative()) {
+ hasAlternative = true;
+ }
+ }
+ if(hasAlternative) {
+ Iterator<IBean> it = beans.iterator();
+ while(it.hasNext()) {
+ IBean bean = it.next();
+ if(!eligible.contains(bean) || bean.isAlternative()) continue;
+ if(bean instanceof IProducer && bean instanceof IBeanMember) {
+ IBeanMember p = (IBeanMember)bean;
+ if(p.getClassBean() != null && p.getClassBean().isAlternative()) continue;
+ }
+ it.remove();
+ }
+ }
+ }
+
+ }
+
+}
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AssignableBeansDialog.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AssignableBeansHyperlink.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AssignableBeansHyperlink.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AssignableBeansHyperlink.java 2011-09-08 23:16:41 UTC (rev 34593)
@@ -0,0 +1,63 @@
+/*******************************************************************************
+ * 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.text.ext.hyperlink;
+
+import java.util.Set;
+
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.swt.widgets.Display;
+import org.jboss.tools.cdi.core.ICDIElement;
+import org.jboss.tools.cdi.core.IInjectionPoint;
+import org.jboss.tools.cdi.text.ext.CDIExtensionsMessages;
+import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink;
+
+public class AssignableBeansHyperlink extends AbstractHyperlink implements ITestableCDIHyperlink{
+ protected IInjectionPoint injectionPoint;
+ IRegion region;
+
+ public AssignableBeansHyperlink(IRegion region, IInjectionPoint injectionPoint, IDocument document){
+ this.injectionPoint = injectionPoint;
+ this.region = region;
+ setDocument(document);
+ }
+
+ @Override
+ protected IRegion doGetHyperlinkRegion(int offset) {
+ return region;
+ }
+
+ protected void doHyperlink(IRegion region) {
+ Display display = Display.getCurrent();
+ if(display == null) {
+ display = Display.getDefault();
+ }
+ AssignableBeansDialog dialog = new AssignableBeansDialog(display.getActiveShell());
+ dialog.setInjectionPoint(injectionPoint);
+ dialog.create();
+ dialog.getShell().setText(CDIExtensionsMessages.ASSIGNABLE_BEANS_DIALOG_TITLE);
+ dialog.open();
+ }
+
+ @Override
+ public String getHyperlinkText() {
+ return CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_SHOW_ASSIGNABLE;
+ }
+
+ public ICDIElement getCDIElement() {
+ return null;
+ }
+
+ public Set<? extends ICDIElement> getCDIElements() {
+ return null;
+ }
+
+}
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AssignableBeansHyperlink.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlinkDetector.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlinkDetector.java 2011-09-08 21:17:52 UTC (rev 34592)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlinkDetector.java 2011-09-08 23:16:41 UTC (rev 34593)
@@ -134,10 +134,14 @@
List<IBean> alternativeBeans = CDIUtil.getSortedBeans(cdiProject, false, injectionPoint);
- if(resultBeans.size() > 0){
- hyperlinks.add(new InjectedPointHyperlink(region, resultBeans.get(0), document, true));
- if(alternativeBeans.size() > 1)
+ if(alternativeBeans.size() > 0){
+ if(resultBeans.size() > 0){
+ hyperlinks.add(new InjectedPointHyperlink(region, resultBeans.get(0), document, true));
+ }
+ if(alternativeBeans.size() > 1) {
hyperlinks.add(new AlternativeInjectedPointListHyperlink(region, alternativeBeans, viewer, document));
+ hyperlinks.add(new AssignableBeansHyperlink(region, injectionPoint, document));
+ }
}
}
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/messages.properties
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/messages.properties 2011-09-08 21:17:52 UTC (rev 34592)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/messages.properties 2011-09-08 23:16:41 UTC (rev 34593)
@@ -8,9 +8,12 @@
CDI_INJECTED_POINT_HYPERLINK_OPEN_ALTERNATIVE=Open @Alternative
CDI_INJECTED_POINT_HYPERLINK_OPEN_PRODUCER=Open @Produces
CDI_INJECTED_POINT_HYPERLINK_SHOW_ALTERNATIVES=Show All Eligible Beans...
+CDI_INJECTED_POINT_HYPERLINK_SHOW_ASSIGNABLE=Show All Assignable Beans...
CDI_PRODUCER_DISPOSER_HYPERLINK_OPEN_BOUND_DISPOSER=Open Bound Disposer Method
CDI_PRODUCER_DISPOSER_HYPERLINK_OPEN_BOUND_PRODUCER=Open Bound Producer Method
CDI_EVENT_LIST_HYPERLINK_OPEN_OBSERVER_METHODS=Open CDI Observer Methods
CDI_EVENT_LIST_HYPERLINK_OPEN_EVENTS=Open CDI Events
CDI_EVENT_HYPERLINK_OPEN_OBSERVER_METHOD=Open CDI Observer Method
CDI_EVENT_HYPERLINK_OPEN_EVENT=Open CDI Event
+
+ASSIGNABLE_BEANS_DIALOG_TITLE=Assignable Beans
14 years, 7 months
JBoss Tools SVN: r34592 - trunk/documentation/whatsnew.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-09-08 17:17:52 -0400 (Thu, 08 Sep 2011)
New Revision: 34592
Added:
trunk/documentation/whatsnew/upload.sh.deprecated
Removed:
trunk/documentation/whatsnew/upload.sh
Log:
the upload script no longer works corectly so am renaming so peple know not to use it
Deleted: trunk/documentation/whatsnew/upload.sh
===================================================================
--- trunk/documentation/whatsnew/upload.sh 2011-09-08 21:04:57 UTC (rev 34591)
+++ trunk/documentation/whatsnew/upload.sh 2011-09-08 21:17:52 UTC (rev 34592)
@@ -1 +0,0 @@
-rsync -i -I -c -P -C --protocol=29 --exclude-from '.rsyncexclude' -avz . tools@filemgmt.jboss.org:/docs_htdocs/tools/whatsnew/
Added: trunk/documentation/whatsnew/upload.sh.deprecated
===================================================================
--- trunk/documentation/whatsnew/upload.sh.deprecated (rev 0)
+++ trunk/documentation/whatsnew/upload.sh.deprecated 2011-09-08 21:17:52 UTC (rev 34592)
@@ -0,0 +1 @@
+rsync -i -I -c -P -C --protocol=29 --exclude-from '.rsyncexclude' -avz . tools@filemgmt.jboss.org:/docs_htdocs/tools/whatsnew/
Property changes on: trunk/documentation/whatsnew/upload.sh.deprecated
___________________________________________________________________
Added: svn:executable
+ *
14 years, 7 months
JBoss Tools SVN: r34591 - trunk/documentation/whatsnew.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-09-08 17:04:57 -0400 (Thu, 08 Sep 2011)
New Revision: 34591
Modified:
trunk/documentation/whatsnew/index.html
Log:
reinstated index.html file with 3.3 N&N
Modified: trunk/documentation/whatsnew/index.html
===================================================================
--- trunk/documentation/whatsnew/index.html 2011-09-08 19:16:03 UTC (rev 34590)
+++ trunk/documentation/whatsnew/index.html 2011-09-08 21:04:57 UTC (rev 34591)
@@ -2,7 +2,7 @@
<head>
<link rel="stylesheet" href="whatsnew.css">
-<title>JBoss Tools New and Noteworthy</title>
+<title>JBoss Tools News and Noteworthy</title>
<script type="text/javascript">
var _gaq = _gaq || [];
@@ -19,14 +19,85 @@
<body>
-<h1>JBoss Tools New and Noteworthy</h1>
+<h1>JBoss Tools News and Noteworthy</h1>
<html>
<table border="0" cellpadding="10" cellspacing="0" width="80%">
+
<tr>
<td colspan="2">
<hr>
+ <h3>JBoss Tools 3.3 individual new and noteworthy</h3>
+ <hr>
+ </td>
+ </tr>
+
+ <tr>
+ <td valign="top" align="left">
+ <p align="right"><b>3.3.0.M3</b>
+ <td valign="top">
+
+ <p><a href="core/core-news-3.3.0.M3.html">Core/General</a></p>
+ <p><a href="forge/forge-news-3.3.0.M3.html">Forge Tools</a></p>
+ <p><a href="as/as-news-3.3.0.M3.html">JBoss AS Server Tools</a></p>
+ <p><a href="cdi/cdi-news-3.3.0.M3.html">CDI/Seam 3 Tools</a></p>
+ <p><a href="gwt/gwt-news-1.0.2.M3.html">GWT Tools</a></p>
+ <p><a href="hibernate/hibernate-news-3.5.0.M3.html">Hibernate Tools</a></p>
+ <p><a href="seam/seam-news-3.3.0.M3.html">Seam 2 Tools</a></p>
+ <p><a href="teiid/teiid-news-7.5.html">Teiid Designer</a></p>
+
+
+ </td>
+ </tr>
+
+ <tr>
+ <td valign="top" align="left">
+ <p align="right"><b>3.3.0.M2</b>
+ <td valign="top">
+
+ <p><a href="as/as-news-3.3.0.M2.html">JBoss AS Server Tools</a></p>
+ <p><a href="maven/maven-news-3.3.0.M2.html">Maven Tools</a></p>
+ <p><a href="hibernate/hibernate-news-3.5.0.M1.html">Hibernate
+ Tools</a></p>
+ <p><a href="jst/jst-news-3.3.0.M2.html">JST/JSF Tools</a></p>
+ <p><a href="vpe/vpe-news-3.3.0.M2.html">Visual Page Editor</a></p>
+ <p><a href="cdi/cdi-news-3.3.0.M2.html">CDI/Seam 3 Tools</a></p>
+ <p><a href="ws/ws-news-1.2.2.M2.html">Webservices Tools</a></p>
+ <p><a href="forge/forge-news-3.3.0.M2.html">Forge Tools</a></p>
+
+ <p><a href="deltacloud/deltacloud-news-0.2.0.M2.html">DeltaCloud Tools</a></p>
+ <p><a href="modeshape/modeshape-news-3.3.0.M2.html">ModeShape Tools</a></p>
+ <p><a href="jbpm/jbpm-news-3.3.0.M2.html">jBPM Tools</a></p>
+ <p><a href="teiid/teiid-news-7.4.html">Teiid Designer</a></p>
+
+ </td>
+ </tr>
+
+ <tr>
+ <td valign="top" align="left">
+ <p align="right"><b>3.3.0.M1</b>
+ <td valign="top">
+ <p><a href="as/as-news-3.3.0.M1.html">JBoss AS Server Tools</a></p>
+ <p><a href="jst/jst-news-3.3.0.M1.html">JST/JSF Tools</a></p>
+ <p><a href="vpe/vpe-news-3.3.0.M1.html">Visual Page Editor</a></p>
+ <p><a href="cdi/cdi-news-3.3.0.M1.html">CDI/Seam 3 Tools</a></p>
+ <p><a href="seam/seam-news-3.3.0.M1.html">Seam 2 Tools</a></p>
+ <p><a href="forge/forge-news-3.3.0.M1.html">Forge Tools</a></p>
+ <p><a href="modeshape/modeshape-news-3.3.0.M1.html">ModeShape Tools</a></p>
+ <p><a href="maven/maven-news-3.3.0.M1.html">Maven Tools</a></p>
+ <p><a href="examples/examples-news-3.3.0.M1.html">Project Examples</a></p>
+ <p><a href="deltacloud/deltacloud-news-0.2.0.M1.html">DeltaCloud Tools</a></p>
+ <p><a href="birt/birt-news-3.3.0.M1.html">Birt Tools</a></p>
+ <p><a href="gwt/gwt-news-1.1.0.M1.html">GWT Tools</a></p>
+ <p><a href="ws/ws-news-1.2.2.M1.html">Webservices Tools</a></p>
+
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2">
+ <hr>
<h3>JBoss Tools 3.2 individual new and noteworthy</h3>
<hr>
</td>
14 years, 7 months
JBoss Tools SVN: r34590 - in trunk: common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-09-08 15:16:03 -0400 (Thu, 08 Sep 2011)
New Revision: 34590
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreBuilder.java
trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/AbstractHyperlink.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamResourceVisitor.java
Log:
Code cleanup XMode.getWorkspace() replaced with original ResourcesPlugin.getWorkspace()
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreBuilder.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreBuilder.java 2011-09-08 18:42:12 UTC (rev 34589)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreBuilder.java 2011-09-08 19:16:03 UTC (rev 34590)
@@ -402,7 +402,7 @@
IClasspathEntry[] es = javaProject.getResolvedClasspath(true);
for (int i = 0; i < es.length; i++) {
if(es[i].getEntryKind() == IClasspathEntry.CPE_SOURCE) {
- IResource findMember = ModelPlugin.getWorkspace().getRoot().findMember(es[i].getPath());
+ IResource findMember = ResourcesPlugin.getWorkspace().getRoot().findMember(es[i].getPath());
if(findMember != null && findMember.exists()) {
ps.add(findMember.getFullPath());
}
Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/AbstractHyperlink.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/AbstractHyperlink.java 2011-09-08 18:42:12 UTC (rev 34589)
+++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/AbstractHyperlink.java 2011-09-08 19:16:03 UTC (rev 34590)
@@ -115,7 +115,7 @@
return null;
wsRelativePath = wsRelativePath.substring(0, i);
IPath path = new Path(wsRelativePath);
- IResource r = ModelPlugin.getWorkspace().getRoot().findMember(
+ IResource r = ResourcesPlugin.getWorkspace().getRoot().findMember(
path);
if (r != null && r.exists()) {
XModelObject o = EclipseResourceUtil
@@ -145,7 +145,7 @@
}
if (wsRelativePath.startsWith("/")) { //$NON-NLS-1$
IPath path = new Path(wsRelativePath);
- IResource r = ModelPlugin.getWorkspace().getRoot().findMember(
+ IResource r = ResourcesPlugin.getWorkspace().getRoot().findMember(
path);
if (r != null && r.exists() && r instanceof IFile)
return (IFile) r;
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamResourceVisitor.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamResourceVisitor.java 2011-09-08 18:42:12 UTC (rev 34589)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/SeamResourceVisitor.java 2011-09-08 19:16:03 UTC (rev 34590)
@@ -20,6 +20,7 @@
import org.eclipse.core.resources.IResourceDelta;
import org.eclipse.core.resources.IResourceDeltaVisitor;
import org.eclipse.core.resources.IResourceVisitor;
+import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.jdt.core.IClasspathEntry;
@@ -119,7 +120,7 @@
IClasspathEntry[] es = javaProject.getResolvedClasspath(true);
for (int i = 0; i < es.length; i++) {
if(es[i].getEntryKind() == IClasspathEntry.CPE_SOURCE) {
- IResource findMember = ModelPlugin.getWorkspace().getRoot().findMember(es[i].getPath());
+ IResource findMember = ResourcesPlugin.getWorkspace().getRoot().findMember(es[i].getPath());
if(findMember != null && findMember.exists()) {
ps.add(findMember.getFullPath());
}
@@ -129,8 +130,8 @@
}
}
}
- srcs = ps.toArray(new IPath[0]);
- outs = os.toArray(new IPath[0]);
+ srcs = ps.toArray(new IPath[ps.size()]);
+ outs = os.toArray(new IPath[os.size()]);
} catch(CoreException ce) {
ModelPlugin.getPluginLog().logError("Error while locating java source roots for " + project, ce);
}
14 years, 7 months
JBoss Tools SVN: r34589 - branches/jbosstools-3.2.x/build/parent.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-09-08 14:42:12 -0400 (Thu, 08 Sep 2011)
New Revision: 34589
Modified:
branches/jbosstools-3.2.x/build/parent/pom.xml
Log:
bump from M1 to CR1
Modified: branches/jbosstools-3.2.x/build/parent/pom.xml
===================================================================
--- branches/jbosstools-3.2.x/build/parent/pom.xml 2011-09-08 18:16:52 UTC (rev 34588)
+++ branches/jbosstools-3.2.x/build/parent/pom.xml 2011-09-08 18:42:12 UTC (rev 34589)
@@ -15,7 +15,7 @@
<!--tychoVersion>0.10.0-SNAPSHOT</tychoVersion -->
<tychoVersion>0.10.0</tychoVersion>
<scmBranch>branches/jbosstools-3.2.x</scmBranch>
- <BUILD_ALIAS>M1</BUILD_ALIAS>
+ <BUILD_ALIAS>CR1</BUILD_ALIAS>
<memoryOptions1>-Xms512m -Xmx1024m -XX:PermSize=256m</memoryOptions1>
<memoryOptions2>-XX:MaxPermSize=256m</memoryOptions2>
<systemProperties></systemProperties>
14 years, 7 months
JBoss Tools SVN: r34588 - in trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi: internal/core/validation and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-09-08 14:16:52 -0400 (Thu, 08 Sep 2011)
New Revision: 34588
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/preferences/CDIPreferenceInitializer.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/messages.properties
Log:
https://issues.jboss.org/browse/JBIDE-9683 CDI validation problems which may cause non-portable behavior results should be WARNINGs by default.
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/preferences/CDIPreferenceInitializer.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/preferences/CDIPreferenceInitializer.java 2011-09-08 18:14:55 UTC (rev 34587)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/preferences/CDIPreferenceInitializer.java 2011-09-08 18:16:52 UTC (rev 34588)
@@ -48,6 +48,9 @@
defaultPreferences.put(CDIPreferences.MISSING_OR_INCORRECT_TARGET_OR_RETENTION_IN_ANNOTATION_TYPE, CDIPreferences.WARNING);
defaultPreferences.put(CDIPreferences.DECORATOR_RESOLVES_TO_FINAL_BEAN, CDIPreferences.WARNING);
defaultPreferences.put(CDIPreferences.NOT_PASSIVATION_CAPABLE_BEAN, CDIPreferences.WARNING);
+ defaultPreferences.put(CDIPreferences.STEREOTYPE_IS_ANNOTATED_TYPED, CDIPreferences.WARNING);
+ defaultPreferences.put(CDIPreferences.ILLEGAL_QUALIFIER_IN_STEREOTYPE, CDIPreferences.WARNING);
+ defaultPreferences.put(CDIPreferences.MISSING_INTERCEPTOR_BINDING, CDIPreferences.WARNING);
// defaultPreferences.put(CDIPreferences.INCONSISTENT_SPECIALIZATION, CDIPreferences.WARNING);
defaultPreferences.putInt(SeverityPreferences.MAX_NUMBER_OF_MARKERS_PREFERENCE_NAME, SeverityPreferences.DEFAULT_MAX_NUMBER_OF_MARKERS_PER_FILE);
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/messages.properties
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/messages.properties 2011-09-08 18:14:55 UTC (rev 34587)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/messages.properties 2011-09-08 18:16:52 UTC (rev 34588)
@@ -1,8 +1,8 @@
STEREOTYPE_DECLARES_NON_EMPTY_NAME=Stereotype declares a non-empty @Named annotation [JSR-299 �2.7.1.3]
RESOURCE_PRODUCER_FIELD_SETS_EL_NAME=Producer field declaration of Java EE resource must not specify an EL name [JSR-299 �3.5.1]
PARAM_INJECTION_DECLARES_EMPTY_NAME=Injection point other than injected field must not declare a @Named annotation that does not specify the value member [JSR-299 �3.11]
-INTERCEPTOR_HAS_NAME=Interceptor has a name [JSR-299 �2.5.3]
-DECORATOR_HAS_NAME=Decorator has a name [JSR-299 �2.5.3]
+INTERCEPTOR_HAS_NAME=Interceptor should not have a name [JSR-299 �2.5.3]
+DECORATOR_HAS_NAME=Decorator should not have a name [JSR-299 �2.5.3]
DUPLCICATE_EL_NAME=A few beans ({0}) have the same EL name and the name is not resolvable [JSR-299 �5.3.1]
UNRESOLVABLE_EL_NAME=The EL name "{0}" is of the form x.y, where y ("{1}") is a valid bean EL name, and x ("{2}") is the EL name of the other bean {3} [JSR-299 �5.3.1]
@@ -27,10 +27,10 @@
PRODUCER_FIELD_TYPE_DOES_NOT_MATCH_JAVA_EE_OBJECT=Matching object in the Java EE component environment is not of the same type as the producer field declaration [JSR-299 �3.5.1]
INJECTION_TYPE_IS_VARIABLE=Injection point type cannot be a type variable [JSR-299 �5.2.2]
INJECT_RESOLVES_TO_NULLABLE_BEAN=Injection point of primitive type resolves to the bean that may have a null value [JSR-299 �5.2.4]
-STEREOTYPE_IS_ANNOTATED_TYPED=Stereotype cannot be annotated @Typed [JSR-299 �2.7.1.3]
-MISSING_NONBINDING_FOR_ANNOTATION_VALUE_IN_QUALIFIER_TYPE_MEMBER=Annotation-valued member of a qualifier type must be annotated @Nonbinding [JSR-299 �5.2.5]
-MISSING_NONBINDING_FOR_ARRAY_VALUE_IN_QUALIFIER_TYPE_MEMBER=Array-valued member of a qualifier type must be annotated @Nonbinding [JSR-299 �5.2.5]
-MISSING_NONBINDING_FOR_ANNOTATION_VALUE_IN_INTERCEPTOR_BINDING_TYPE_MEMBER=Annotation-valued member of an interceptor binding type must be annotated @Nonbinding [JSR-299 �9.5.2]
+STEREOTYPE_IS_ANNOTATED_TYPED=A stereotype should not be annotated @Typed [JSR-299 �2.7.1.3]
+MISSING_NONBINDING_FOR_ANNOTATION_VALUE_IN_QUALIFIER_TYPE_MEMBER=Annotation-valued member of a qualifier type should be annotated @Nonbinding [JSR-299 �5.2.5]
+MISSING_NONBINDING_FOR_ARRAY_VALUE_IN_QUALIFIER_TYPE_MEMBER=Array-valued member of a qualifier type should be annotated @Nonbinding [JSR-299 �5.2.5]
+MISSING_NONBINDING_FOR_ANNOTATION_VALUE_IN_INTERCEPTOR_BINDING_TYPE_MEMBER=Annotation-valued member of an interceptor binding type should be annotated @Nonbinding [JSR-299 �9.5.2]
MISSING_NONBINDING_FOR_ARRAY_VALUE_IN_INTERCEPTOR_BINDING_TYPE_MEMBER=Array-valued member of an interceptor binding type must be annotated @Nonbinding [JSR-299 �9.5.2]
MISSING_TARGET_ANNOTATION_IN_QUALIFIER_TYPE=Qualifier annotation type must be annotated with @Target('{'TYPE, METHOD, FIELD, PARAMETER'}') or @Target('{'FIELD, PARAMETER'}') [JSR-299 �2.3.2, �10.1]
MISSING_RETENTION_ANNOTATION_IN_QUALIFIER_TYPE=Qualifier annotation type must be annotated with @Retention(RUNTIME) [JSR-299 �2.3.2]
@@ -60,8 +60,8 @@
ILLEGAL_SCOPE_FOR_PRODUCER_METHOD=Producer method with a parameterized return type with a type variable must be @Dependent scoped [JSR-299 �3.3]
ILLEGAL_SCOPE_FOR_PRODUCER_FIELD=Producer field with a parameterized type with a type variable declares must be @Dependent scoped [JSR-299 �3.4]
ILLEGAL_SCOPE_WHEN_TYPE_INJECTIONPOINT_IS_INJECTED=Bean that declares any scope other than @Dependent has an injection point of type InjectionPoint and qualifier @Default [JSR-299 �5.5.7]
-ILLEGAL_SCOPE_FOR_INTERCEPTOR=Interceptor must be @Dependent scoped [JSR-299 �2.4.1]
-ILLEGAL_SCOPE_FOR_DECORATOR=Decorator must be @Dependent scoped [JSR-299 �2.4.1]
+ILLEGAL_SCOPE_FOR_INTERCEPTOR=Interceptor should not have any scope other than @Dependent [JSR-299 �2.4.1]
+ILLEGAL_SCOPE_FOR_DECORATOR=Decorator should not have any scope other than @Dependent [JSR-299 �2.4.1]
PRODUCER_ANNOTATED_INJECT=Producer method or field cannot be annotated @Inject [JSR-299 �3.3.2, �3.4.2]
PRODUCER_PARAMETER_ILLEGALLY_ANNOTATED_DISPOSES=Producer method has a parameter annotated @Disposes [JSR-299 �3.3.2]
@@ -102,9 +102,9 @@
CONFLICTING_INTERCEPTOR_BINDINGS=The set of interceptor bindings of a bean or interceptor, including bindings inherited from stereotypes and other interceptor bindings, has two instances of a certain interceptor binding type and the instances have different values of some annotation member [JSR-299 �9.5.2]
OBSERVER_IN_DECORATOR=Decorator cannot have a method with a parameter annotated @Observes [JSR-299 �10.4.2]
OBSERVER_IN_INTERCEPTOR=Interceptor cannot have a method with a parameter annotated @Observes [JSR-299 �10.4.2]
-INTERCEPTOR_IS_ALTERNATIVE=Interceptor is an alternative [JSR-299 �2.6.1]
-DECORATOR_IS_ALTERNATIVE=Decorator is an alternative [JSR-299 �2.6.1]
-MISSING_INTERCEPTOR_BINDING=Interceptor declared using @Interceptor must specify at least one interceptor binding [JSR-299 �9.2]
+INTERCEPTOR_IS_ALTERNATIVE=Interceptor should not be an alternative [JSR-299 �2.6.1]
+DECORATOR_IS_ALTERNATIVE=Decorator should not be an alternative [JSR-299 �2.6.1]
+MISSING_INTERCEPTOR_BINDING=Interceptor declared using @Interceptor should specify at least one interceptor binding [JSR-299 �9.2]
ILLEGAL_SPECIALIZING_MANAGED_BEAN=Managed bean class annotated @Specializes must directly extend the bean class of another managed bean [JSR-299 �3.1.4]
ILLEGAL_SPECIALIZING_SESSION_BEAN=Session bean class annotated @Specializes must directly extend the bean class of another session bean [JSR-299 �3.2.4]
@@ -112,13 +112,13 @@
ILLEGAL_SPECIALIZING_PRODUCER_OVERRIDE=Producer method annotated @Specializes must directly override another producer method [JSR-299 �3.3.3]
MISSING_TYPE_IN_SPECIALIZING_BEAN=Bean {0} specializes {1} but does not have bean type(s): {2} of bean {1} [JSR-299 �4.3.1]
CONFLICTING_NAME_IN_SPECIALIZING_BEAN=Bean {0} specializes {1} and {1} has a name and {0} declares a name explicitly, using @Named [JSR-299 �4.3.1]
-INTERCEPTOR_ANNOTATED_SPECIALIZES=Interceptor is annotated @Specializes [JSR-299 �4.3.1]
-DECORATOR_ANNOTATED_SPECIALIZES=Decorator is annotated @Specializes [JSR-299 �4.3.1]
+INTERCEPTOR_ANNOTATED_SPECIALIZES=Interceptor should not be annotated @Specializes [JSR-299 �4.3.1]
+DECORATOR_ANNOTATED_SPECIALIZES=Decorator should not be annotated @Specializes [JSR-299 �4.3.1]
INCONSISTENT_SPECIALIZATION=There are a few enabled beans ({0}) that specialize the same bean {1} [JSR-299 �5.1.3]
ILLEGAL_INJECTING_USERTRANSACTION_TYPE=Java EE component class has an injection point of type UserTransaction and qualifier @Default, and may not validly make use of the JTA UserTransaction according to the Java EE platform specification [JSR-299 �3.6]
ILLEGAL_INJECTING_INJECTIONPOINT_TYPE=Java EE component class supporting injection that is not a bean has an injection point of type InjectionPoint and qualifier @Default [JSR-299 �5.5.7]
-ILLEGAL_QUALIFIER_IN_STEREOTYPE=Stereotypes cannot declare qualifier annotations (except @Named) [JSR-299 �2.7.1.3]
+ILLEGAL_QUALIFIER_IN_STEREOTYPE=A stereotype should not declare any qualifier annotation other than @Named [JSR-299 �2.7.1.3]
#Beans.xml
14 years, 7 months
