JBoss Tools SVN: r25132 - in trunk: site and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-09-23 17:35:38 -0400 (Thu, 23 Sep 2010)
New Revision: 25132
Modified:
trunk/build/aggregate/site/index-template.html
trunk/build/aggregate/site/index.html
trunk/site/index.html
Log:
https://jira.jboss.org/browse/JBIDE-6938 add optional subclipse site to index.html for update site installation
Modified: trunk/build/aggregate/site/index-template.html
===================================================================
--- trunk/build/aggregate/site/index-template.html 2010-09-23 21:08:01 UTC (rev 25131)
+++ trunk/build/aggregate/site/index-template.html 2010-09-23 21:35:38 UTC (rev 25132)
@@ -43,11 +43,12 @@
Software Sites. Simply right-click the link(s) below from which you'd like to
install, copy the link, and paste it into Eclipse's Update or Install Manager:</p>
<ul>
- <li><a class="link" href="http://download.eclipse.org/birt/update-site/2.6/">BIRT 2.6 Release</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 0.10 Extras</a></li>
- <li><a class="link" href="http://dl.google.com/eclipse/plugin/3.6/">Google Plugin for Eclipse 3.6 (Helios)</a></li>
- </ul>
+ <li><a href="http://download.eclipse.org/birt/update-site/2.6/">BIRT 2.6 Update Site</a></li>
+ <li><a href="http://m2eclipse.sonatype.org/sites/m2e/">m2eclipse 0.10 Release</a></li>
+ <li><a href="http://m2eclipse.sonatype.org/sites/m2e-extras/">m2eclipse 0.10 Extras</a></li>
+ <li><a href="http://subclipse.tigris.org/update_1.6.x"/>Subclipse 1.6 Update Site </a></li>
+ <li><a href="http://dl.google.com/eclipse/plugin/3.6/">Google Plugin for Eclipse 3.6 (Helios)</a></li>
+ </ul>
</td>
</tr>
Modified: trunk/build/aggregate/site/index.html
===================================================================
--- trunk/build/aggregate/site/index.html 2010-09-23 21:08:01 UTC (rev 25131)
+++ trunk/build/aggregate/site/index.html 2010-09-23 21:35:38 UTC (rev 25132)
@@ -43,10 +43,11 @@
Software Sites. Simply right-click the link(s) below from which you'd like to
install, copy the link, and paste it into Eclipse's Update or Install Manager:</p>
<ul>
- <li><a class="link" href="http://download.eclipse.org/birt/update-site/2.6/">BIRT 2.6 Release</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 0.10 Extras</a></li>
- <li><a class="link" href="http://dl.google.com/eclipse/plugin/3.6/">Google Plugin for Eclipse 3.6 (Helios)</a></li>
+ <li><a href="http://download.eclipse.org/birt/update-site/2.6/">BIRT 2.6 Update Site</a></li>
+ <li><a href="http://m2eclipse.sonatype.org/sites/m2e/">m2eclipse 0.10 Release</a></li>
+ <li><a href="http://m2eclipse.sonatype.org/sites/m2e-extras/">m2eclipse 0.10 Extras</a></li>
+ <li><a href="http://subclipse.tigris.org/update_1.6.x"/>Subclipse 1.6 Update Site </a></li>
+ <li><a href="http://dl.google.com/eclipse/plugin/3.6/">Google Plugin for Eclipse 3.6 (Helios)</a></li>
</ul>
</td>
</tr>
Modified: trunk/site/index.html
===================================================================
--- trunk/site/index.html 2010-09-23 21:08:01 UTC (rev 25131)
+++ trunk/site/index.html 2010-09-23 21:35:38 UTC (rev 25132)
@@ -43,9 +43,12 @@
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 href="http://m2eclipse.sonatype.org/sites/m2e/">m2eclipse 0.10 Release</a></li>
- </ul>
+ <li><a href="http://download.eclipse.org/birt/update-site/2.6/">BIRT 2.6 Update Site</a></li>
+ <li><a href="http://m2eclipse.sonatype.org/sites/m2e/">m2eclipse 0.10 Release</a></li>
+ <li><a href="http://m2eclipse.sonatype.org/sites/m2e-extras/">m2eclipse 0.10 Extras</a></li>
+ <li><a href="http://subclipse.tigris.org/update_1.6.x"/>Subclipse 1.6 Update Site </a></li>
+ <li><a href="http://dl.google.com/eclipse/plugin/3.6/">Google Plugin for Eclipse 3.6 (Helios)</a></li>
+ </ul>
</td>
</tr>
15 years, 7 months
- 1
- 0
JBoss Tools SVN: r25131 - in trunk/documentation/whatsnew/ws: images and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: bfitzpat
Date: 2010-09-23 17:08:01 -0400 (Thu, 23 Sep 2010)
New Revision: 25131
Added:
trunk/documentation/whatsnew/ws/images/annotation_properties_view_esb.jpg
trunk/documentation/whatsnew/ws/images/jax_rs_annotation_properties_view.jpg
trunk/documentation/whatsnew/ws/images/simple_web_service_wizard.jpg
trunk/documentation/whatsnew/ws/images/update_web_xml_checkbox.jpg
trunk/documentation/whatsnew/ws/ws-news-1.2.0.Beta1.html
Log:
OPEN - issue JBIDE-7137: WS Component N&N
https://jira.jboss.org/browse/JBIDE-7137
Added: trunk/documentation/whatsnew/ws/images/annotation_properties_view_esb.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/ws/images/annotation_properties_view_esb.jpg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/ws/images/jax_rs_annotation_properties_view.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/ws/images/jax_rs_annotation_properties_view.jpg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/ws/images/simple_web_service_wizard.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/ws/images/simple_web_service_wizard.jpg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/ws/images/update_web_xml_checkbox.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/ws/images/update_web_xml_checkbox.jpg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/ws/ws-news-1.2.0.Beta1.html
===================================================================
--- trunk/documentation/whatsnew/ws/ws-news-1.2.0.Beta1.html (rev 0)
+++ trunk/documentation/whatsnew/ws/ws-news-1.2.0.Beta1.html 2010-09-23 21:08:01 UTC (rev 25131)
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Language" content="en-us" />
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<link rel="stylesheet" href="../whatsnew.css"/>
+<title>WS Tools 3.2.0 Beta1 What's New</title>
+</head>
+<body>
+<h1>WS tools 3.2.0 Beta1 What's New</h1>
+
+<p align="right"><a href="../index.html">< Main Index</a> <a href="../deltacloud/deltacloud-news-0.0.1.M2.html">Deltacloud Development Tools ></a></p>
+
+<table border="0" cellpadding="10" cellspacing="0" width="80%">
+
+ <tr>
+ <td colspan="2">
+ <hr/>
+ <h3>Web Service Tester</h3>
+ <hr/>
+ </td>
+ </tr>
+
+ <tr>
+ <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>New Checkbox to Turn off Web.xml updates</b></td>
+ <td valign="top">
+ <p>Starting in JBoss 6.0M4 entries in web.xml are not mandatory<a href="http://docs.jboss.org/resteasy/docs/2.0.0.GA/userguide/html_single/index....">[1]</a>, only the fact that the web.xml file exists is mandatory. To handle this case, we now provide the option not to generate entries in the web.xml file.</p>
+ <p>[1]: <a href="http://docs.jboss.org/resteasy/docs/2.0.0.GA/userguide/html_single/index....">http://docs.jboss.org/resteasy/docs/2.0.0.GA/userguide/html_single/index....</a></p>
+ <img src="./images/update_web_xml_checkbox.jpg" alt=""/>
+ <p><small><a href="https://jira.jboss.org/browse/JBIDE-6753">Related Jira</a></small></p>
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2">
+ <hr/>
+ <h3>JAX-WS and JAX-RS Annotations and the Annotation Properties View</h3>
+ <hr/>
+ </td>
+ </tr>
+
+ <tr>
+ <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>Annotation Properties View</b></td>
+ <td valign="top">
+ <p>There's a new Annotation Properties view in WTP for Eclipse Helios. It already comes pre-set with JAX-WS annotations and we've added JAX-RS annotations for RESTEasy as well.</p>
+ <p>For a few additional details, check out this <a href="http://community.jboss.org/community/jbosstools/blog/2010/09/13/extending...">blog post</a>.</p>
+ <img src="./images/jax_rs_annotation_properties_view.jpg" alt="" style="width : 681px; height : 535px;"/>
+ <p><small><a href="https://jira.jboss.org/browse/JBIDE-7106">Related Jira</a></small></p>
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2">
+ <hr/>
+ <h3>Simple Web Service wizard</h3>
+ <hr/>
+ </td>
+ </tr>
+
+ <tr>
+ <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>New wizard</b></td>
+ <td valign="top">
+ <p>In addition to the two Sample Web Service wizards (Create a Sample Web Service and Create a Sample RESTful Web Service), we've now added a third wizard to the mix. The Simple Web Service wizard allows you to specify your own annotated JAX-WS, JAX-RS, and application classes to quickly get your web project going.</p>
+ <img src="./images/simple_web_service_wizard.jpg" alt="" />
+ <p>For a walkthrough on using the wizard, check out <a href="http://community.jboss.org/wiki/UsingtheSampleWebServiceWizards">Using the Sample Web Service Wizards</a> in the wiki.</p>
+ <p><small><a href="https://jira.jboss.org/browse/JBIDE-7106">Related Jira</a></small></p>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+
+ <hr/>
+ </td>
+ </tr>
+
+</table>
+
+</body>
+
+</html>
+
+
Property changes on: trunk/documentation/whatsnew/ws/ws-news-1.2.0.Beta1.html
___________________________________________________________________
Name: svn:mime-type
+ text/plain
15 years, 7 months
- 1
- 0
JBoss Tools SVN: r25130 - in trunk/documentation/whatsnew/esb: images and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: bfitzpat
Date: 2010-09-23 17:05:57 -0400 (Thu, 23 Sep 2010)
New Revision: 25130
Added:
trunk/documentation/whatsnew/esb/esb-news-1.4.0.Beta1.html
trunk/documentation/whatsnew/esb/images/NewESBAction_1.jpg
trunk/documentation/whatsnew/esb/images/NewESBAction_2.jpg
trunk/documentation/whatsnew/esb/images/annotation_properties_view_esb.jpg
Modified:
trunk/documentation/whatsnew/esb/esb-news-1.4.0.M2.html
Log:
OPEN - issue JBIDE-7131: ESB Component N&N
https://jira.jboss.org/browse/JBIDE-7131
Added: trunk/documentation/whatsnew/esb/esb-news-1.4.0.Beta1.html
===================================================================
--- trunk/documentation/whatsnew/esb/esb-news-1.4.0.Beta1.html (rev 0)
+++ trunk/documentation/whatsnew/esb/esb-news-1.4.0.Beta1.html 2010-09-23 21:05:57 UTC (rev 25130)
@@ -0,0 +1,65 @@
+ <p><a href="smooks/smooks-news-1.1.0.CR1.html">Smooks Tools</a></p> <?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Language" content="en-us" />
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<link rel="stylesheet" href="../whatsnew.css"/>
+<title>ESB tools 1.4.0.Beta1 What's New</title>
+</head>
+<body>
+<h1>ESB tools 1.4.0.Beta1 What's New</h1>
+
+<p align="right"><a href="../index.html">< Main Index</a> <a href="../maven/maven-news-3.2.0.M2.html">Maven Tools ></a></p>
+
+<table border="0" cellpadding="10" cellspacing="0" width="80%">
+
+ <tr>
+ <td colspan="2">
+ <hr/>
+ <h3>Editors</h3>
+ <hr/>
+ </td>
+ </tr>
+
+ <tr>
+ <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>More ESB 4.9 Support</b></td>
+ <td valign="top">
+ <p>Continuing the theme of bringing the tooling in line with ESB 4.9, we added support for ESB Action Annotations...</p>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <hr/>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>Ability to Select Annotated ESB 4.9 Actions</b></td>
+ <td valign="top">
+ <p>When creating the configuration for a new ESB action, you can now create a new Annotated POJO class as well as a class that extends the AbstractActionPipelinedProcessor class.</p>
+ <img src="./images/NewESBAction_1.jpg" alt="" style="width : 469px; height : 532px;"/>
+ <img src="./images/NewESBAction_2.jpg" alt="" style="width : 467px; height : 437px;"/>
+ <p><small><a href="https://jira.jboss.org/browse/JBIDE-6616">Related Jira</a></small></p>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <hr/>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>Added support for using the Annotation Properties view to annotate a POJO as an ESB 4.9 Action</b></td>
+ <td valign="top">
+ <p>In addition, there's a new Annotation Properties view in WTP for Eclipse Helios. We've added ESB annotations to the view so you can use it to help annotate a POJO as a new ESB 4.9 Action.</p>
+ <p>For a few additional details, check out this <a href="http://community.jboss.org/community/jbosstools/blog/2010/09/13/extending...">blog post</a>.</p>
+ <img src="./images/annotation_properties_view_esb.jpg" alt=""" style="height : 474px; width : 593px;"/>
+ <p><small><a href="https://jira.jboss.org/browse/JBIDE-7055">Related Jira</a></small></p>
+ </td>
+ </tr>
+</table>
+</body>
+
+</html>
+
+
Property changes on: trunk/documentation/whatsnew/esb/esb-news-1.4.0.Beta1.html
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/documentation/whatsnew/esb/esb-news-1.4.0.M2.html
===================================================================
--- trunk/documentation/whatsnew/esb/esb-news-1.4.0.M2.html 2010-09-23 18:22:34 UTC (rev 25129)
+++ trunk/documentation/whatsnew/esb/esb-news-1.4.0.M2.html 2010-09-23 21:05:57 UTC (rev 25130)
@@ -6,10 +6,10 @@
<meta http-equiv="Content-Language" content="en-us" />
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
<link rel="stylesheet" href="../whatsnew.css"/>
-<title>ESB tools 1.3.0.M2 What's New</title>
+<title>ESB tools 1.4.0.M2 What's New</title>
</head>
<body>
-<h1>ESB tools 1.3.0.M2 What's New</h1>
+<h1>ESB tools 1.4.0.M2 What's New</h1>
<p align="right"><a href="../index.html">< Main Index</a> <a href="../maven/maven-news-3.2.0.M2.html">Maven Tools ></a></p>
Added: trunk/documentation/whatsnew/esb/images/NewESBAction_1.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/esb/images/NewESBAction_1.jpg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/esb/images/NewESBAction_2.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/esb/images/NewESBAction_2.jpg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/esb/images/annotation_properties_view_esb.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/esb/images/annotation_properties_view_esb.jpg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
15 years, 7 months
- 1
- 0
JBoss Tools SVN: r25129 - in trunk/documentation/whatsnew/vpe: images and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2010-09-23 14:22:34 -0400 (Thu, 23 Sep 2010)
New Revision: 25129
Added:
trunk/documentation/whatsnew/vpe/images/3.2.0.Beta1/
trunk/documentation/whatsnew/vpe/images/3.2.0.Beta1/dnd-text-captitions.png
trunk/documentation/whatsnew/vpe/images/3.2.0.Beta1/dogbook-templates.png
trunk/documentation/whatsnew/vpe/images/3.2.0.Beta1/selection-bar-controls.png
trunk/documentation/whatsnew/vpe/images/3.2.0.Beta1/text-dnd.png
trunk/documentation/whatsnew/vpe/vpe-news-3.2.0.Beta1.html
Log:
https://jira.jboss.org/browse/JBIDE-7136
Added: trunk/documentation/whatsnew/vpe/images/3.2.0.Beta1/dnd-text-captitions.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/vpe/images/3.2.0.Beta1/dnd-text-captitions.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
Added: trunk/documentation/whatsnew/vpe/images/3.2.0.Beta1/dogbook-templates.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/vpe/images/3.2.0.Beta1/dogbook-templates.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
Added: trunk/documentation/whatsnew/vpe/images/3.2.0.Beta1/selection-bar-controls.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/vpe/images/3.2.0.Beta1/selection-bar-controls.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
Added: trunk/documentation/whatsnew/vpe/images/3.2.0.Beta1/text-dnd.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/vpe/images/3.2.0.Beta1/text-dnd.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
Added: trunk/documentation/whatsnew/vpe/vpe-news-3.2.0.Beta1.html
===================================================================
--- trunk/documentation/whatsnew/vpe/vpe-news-3.2.0.Beta1.html (rev 0)
+++ trunk/documentation/whatsnew/vpe/vpe-news-3.2.0.Beta1.html 2010-09-23 18:22:34 UTC (rev 25129)
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Language" content="en-us" />
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<link rel="stylesheet" href="../whatsnew.css" />
+<title>What's New Visual Page Editor 3.2.0.Beta1</title>
+</head>
+<body>
+<h1>What's New Visual Page Editor 3.2.0.Beta1</h1>
+
+<p align="right">
+<a href="../index.html">< Main Index</a>
+<a href="../cdi/cdi-news-3.2.0.Beta1.html">CDI Tools ></a>
+</p>
+<table border="0" cellpadding="10" cellspacing="0" width="80%">
+ <tr>
+ <td colspan="2">
+ <hr />
+ <h3>General</h3>
+ <hr />
+ </td>
+ </tr>
+
+ <tr>
+ <td valign="top" align="left"><b>Selection Bar Movement</b></td>
+ <td valign="top">You can control selection bar behaviour using eclipse toolbar or main menu bar.
+ Also Selection Bar will be available on systems for which XulRunner not supported yet.
+ <p><img src="images/3.2.0.Beta1/selection-bar-controls.png" alt="Selection Bar Controls" />
+ </p>
+ <p><small>
+ <a href="https://jira.jboss.org/browse/JBIDE-7059">Related Jira</a>
+ </small></p>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left"><b>Selection Bar Enhancement</b></td>
+ <td valign="top">Now You can select any child under selection bar item.
+ <p><img src="images/3.2.0.Beta1/selection-bar-controls.png" alt="Selection Bar Controls" />
+ </p>
+ <p><small>
+ <a href="https://jira.jboss.org/browse/JBIDE-6981">Related Jira</a>
+ </small></p>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <hr />
+ <h3>Editor</h3>
+ <hr />
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left"><b>Text captition for D&D actions</b></td>
+ <td valign="top">Text captitions for Dctions has been added.
+ <p><img src="images/3.2.0.Beta1/dnd-text-captitions.png" alt="Doocbook editor View"/>
+ </p>
+ <p><small>
+ <a href="https://jira.jboss.org/browse/JBIDE-5970">Related Jira</a>
+ </small></p>
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2">
+ <hr />
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left"><b>D&D for selected text</b></td>
+ <td valign="top">D&D for selected text has been added.
+ <p><img src="images/3.2.0.Beta1/text-dnd.png" alt="Size Captition in VPE"/>
+ </p>
+ <p><small>
+ <a href="https://jira.jboss.org/browse/JBIDE-6229">Related Jira</a>
+ </small></p>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <hr />
+ <h3>Templates</h3>
+ <hr />
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left"><b>Docbook Templates</b></td>
+ <td valign="top"><p>We support preview of extra docbook tags now.</p>
+ <p><img src="images/3.2.0.Beta1/dogbook-templates.png" alt="Doocbook tags preview" />
+ </p>
+ <p><small>
+ <a href="https://jira.jboss.org/browse/JBIDE-6805">Related Jira</a>
+ </small></p>
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2">
+ <hr />
+ </td>
+ </tr>
+
+</table>
+</body>
+</html>
Property changes on: trunk/documentation/whatsnew/vpe/vpe-news-3.2.0.Beta1.html
___________________________________________________________________
Name: svn:mime-type
+ text/html
15 years, 7 months
- 1
- 0
JBoss Tools SVN: r25128 - trunk/build/parent.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-09-23 12:39:53 -0400 (Thu, 23 Sep 2010)
New Revision: 25128
Modified:
trunk/build/parent/pom.xml
Log:
enable eclipse.org repos to pull in newer Helios SR1 deps
Modified: trunk/build/parent/pom.xml
===================================================================
--- trunk/build/parent/pom.xml 2010-09-23 16:38:18 UTC (rev 25127)
+++ trunk/build/parent/pom.xml 2010-09-23 16:39:53 UTC (rev 25128)
@@ -184,7 +184,7 @@
<activeByDefault>false</activeByDefault>
</activation>
<repositories>
- <!--repository>
+ <repository>
<id>helios</id>
<url>http://download.eclipse.org/releases/helios/</url>
<layout>p2</layout>
@@ -194,7 +194,7 @@
<releases>
<enabled>true</enabled>
</releases>
- </repository-->
+ </repository>
<repository>
<id>eclipse36</id>
<url>http://download.eclipse.org/eclipse/updates/3.6.x/
@@ -218,7 +218,7 @@
<enabled>true</enabled>
</releases>
</repository>
- <!--repository>
+ <repository>
<id>webtools32</id>
<url>http://download.eclipse.org/webtools/repository/helios</url>
<layout>p2</layout>
@@ -228,7 +228,7 @@
<releases>
<enabled>true</enabled>
</releases>
- </repository-->
+ </repository>
<repository>
<id>jboss-webtools32</id>
<url>http://download.jboss.org/jbosstools/updates/requirements/webtools-3.2/</url>
15 years, 7 months
- 1
- 0
JBoss Tools SVN: r25127 - trunk/build/parent.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-09-23 12:38:18 -0400 (Thu, 23 Sep 2010)
New Revision: 25127
Modified:
trunk/build/parent/pom.xml
Log:
bump up to Beta2
Modified: trunk/build/parent/pom.xml
===================================================================
--- trunk/build/parent/pom.xml 2010-09-23 15:08:59 UTC (rev 25126)
+++ trunk/build/parent/pom.xml 2010-09-23 16:38:18 UTC (rev 25127)
@@ -14,7 +14,7 @@
<!--tychoVersion>0.10.0-SNAPSHOT</tychoVersion-->
<tychoVersion>0.9.0</tychoVersion>
<scmBranch>trunk</scmBranch>
- <BUILD_ALIAS>Beta1</BUILD_ALIAS>
+ <BUILD_ALIAS>Beta2</BUILD_ALIAS>
<memoryOptions1>-Xms512m -Xmx1024m -XX:PermSize=256m</memoryOptions1>
<memoryOptions2>-XX:MaxPermSize=256m</memoryOptions2>
<systemProperties></systemProperties>
15 years, 7 months
- 1
- 0
JBoss Tools SVN: r25126 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/lib.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-09-23 11:08:59 -0400 (Thu, 23 Sep 2010)
New Revision: 25126
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/lib/ClassPath.java
Log:
JBIDE-7148
https://jira.jboss.org/browse/JBIDE-7148
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/lib/ClassPath.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/lib/ClassPath.java 2010-09-23 14:51:29 UTC (rev 25125)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/scanner/lib/ClassPath.java 2010-09-23 15:08:59 UTC (rev 25126)
@@ -11,7 +11,6 @@
package org.jboss.tools.seam.internal.core.scanner.lib;
import java.io.File;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
@@ -30,9 +29,9 @@
import org.eclipse.jdt.core.JavaCore;
import org.jboss.tools.common.model.XModel;
import org.jboss.tools.common.model.XModelObject;
-import org.jboss.tools.common.model.filesystems.impl.FileSystemsLoader;
-import org.jboss.tools.common.model.util.EclipseResourceUtil;
-import org.jboss.tools.common.model.util.XModelObjectUtil;
+import org.jboss.tools.common.model.filesystems.FileSystemsHelper;
+import org.jboss.tools.common.model.filesystems.impl.Libs;
+import org.jboss.tools.common.model.filesystems.impl.LibsListener;
import org.jboss.tools.jst.web.model.helpers.InnerModelHelper;
import org.jboss.tools.seam.core.ISeamProject;
import org.jboss.tools.seam.core.SeamCorePlugin;
@@ -45,12 +44,13 @@
*
* @author Viacheslav Kabanovich
*/
-public class ClassPath {
+public class ClassPath implements LibsListener {
SeamProject project;
XModel model = null;
List<String> paths = null;
Map<IPath, String> paths2 = new HashMap<IPath, String>();
+ boolean libsModified = false;
Set<String> processedPaths = new HashSet<String>();
@@ -75,6 +75,9 @@
*/
public void init() {
model = InnerModelHelper.createXModel(project.getProject());
+ if(model == null) return;
+ Libs libs = FileSystemsHelper.getLibs(model);
+ if(libs != null) libs.addListener(this);
}
static String[] SYSTEM_JARS = {"rt.jar", "jsse.jar", "jce.jar", "charsets.jar"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
@@ -90,74 +93,19 @@
* @return
*/
public boolean update() {
- List<String> newPaths = null;
- try {
- newPaths = EclipseResourceUtil.getClassPath(project.getProject());
- List<String> jre = EclipseResourceUtil.getJREClassPath(project.getProject());
- if(jre != null) newPaths.removeAll(jre);
- } catch (CoreException e) {
- //TODO
- SeamCorePlugin.getDefault().logError(e);
- } catch(IOException e) {
- SeamCorePlugin.getDefault().logError(e);
+ Libs libs = FileSystemsHelper.getLibs(model);
+ libs.update();
+ List<String> newPaths = libs.getPaths();
+ boolean result = libsModified || paths == null;
+ paths = newPaths;
+ if(result) {
+ paths2.clear();
+ paths2.putAll(libs.getPathsAsMap());
}
- if(paths == null && newPaths == null) return false;
- if((newPaths == null || paths == null) || (paths.size() != newPaths.size())) {
- paths = newPaths;
- } else {
- boolean b = false;
- for (int i = 0; i < paths.size() && !b; i++) {
- if(!paths.get(i).equals(newPaths.get(i))) b = true;
- }
- if(!b) return false;
- paths = newPaths;
- }
- createMap();
- XModelObject object = model.getByPath("FileSystems"); //$NON-NLS-1$
- XModelObject[] fs = object.getChildren("FileSystemJar"); //$NON-NLS-1$
- Set<XModelObject> fss = new HashSet<XModelObject>();
- for (int i = 0; i < fs.length; i++) fss.add(fs[i]);
-
- for (int i = 0; i < paths.size(); i++) {
- String path = paths.get(i);
- if(!EclipseResourceUtil.isJar(path)) continue;
- String fileName = new File(path).getName();
- if(SYSTEM_JAR_SET.contains(fileName)) continue;
- String jsname = "lib-" + fileName; //$NON-NLS-1$
- XModelObject o = model.getByPath("FileSystems").getChildByPath(jsname); //$NON-NLS-1$
- if(o != null) {
- fss.remove(o);
- } else {
- o = object.getModel().createModelObject("FileSystemJar", null); //$NON-NLS-1$
- o.setAttributeValue("name", jsname); //$NON-NLS-1$
- o.setAttributeValue("location", path); //$NON-NLS-1$
- o.set(FileSystemsLoader.IS_ADDED_TO_CLASSPATH, "true"); //$NON-NLS-1$
- object.addChild(o);
-// object.setModified(true);
- }
- }
-
- for (XModelObject o: fss) {
- String path = XModelObjectUtil.expand(o.getAttributeValue("location"), o.getModel(), null); //$NON-NLS-1$
- if("true".equals(o.get(FileSystemsLoader.IS_ADDED_TO_CLASSPATH))) { //$NON-NLS-1$
- o.removeFromParent();
- } else if(!new File(path).exists()) {
- o.removeFromParent();
- }
- }
-
- return true;
+ libsModified = false;
+ return result;
}
- private void createMap() {
- paths2.clear();
- if(paths != null) {
- for (String p : paths) {
- paths2.put(new Path(p), p);
- }
- }
- }
-
/**
* Loads seam components from items recently added to class path.
*/
@@ -293,4 +241,8 @@
validateProjectDependencies();
}
}
+
+ public void pathsChanged(List<String> paths) {
+ libsModified = true;
+ }
}
15 years, 7 months
- 1
- 0
JBoss Tools SVN: r25125 - in trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model: filesystems/impl and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-09-23 10:51:29 -0400 (Thu, 23 Sep 2010)
New Revision: 25125
Added:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/Libs.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/LibsListener.java
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/FileSystemsHelper.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemsImpl.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemsLoader.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/JarAccess.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/JarSystemImpl.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/RegularChildren.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ext/AbstractClassPathMonitor.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java
Log:
JBIDE-7148
https://jira.jboss.org/browse/JBIDE-7148
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/FileSystemsHelper.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/FileSystemsHelper.java 2010-09-23 14:23:22 UTC (rev 25124)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/FileSystemsHelper.java 2010-09-23 14:51:29 UTC (rev 25125)
@@ -11,6 +11,8 @@
package org.jboss.tools.common.model.filesystems;
import org.jboss.tools.common.model.*;
+import org.jboss.tools.common.model.filesystems.impl.FileSystemsImpl;
+import org.jboss.tools.common.model.filesystems.impl.Libs;
public class FileSystemsHelper {
public static final String FILE_SYSTEMS = "FileSystems"; //$NON-NLS-1$
@@ -31,4 +33,16 @@
return model.getByPath(FILE_SYSTEMS + "/WEB-INF"); //$NON-NLS-1$
}
+ public static Libs getLibs(XModel model) {
+ XModelObject fs = getFileSystems(model);
+ return (!(fs instanceof FileSystemsImpl)) ? null : ((FileSystemsImpl)fs).getLibs();
+ }
+
+ public static Libs getLibs(XModelObject object) {
+ if(object instanceof FileSystemsImpl) {
+ return ((FileSystemsImpl)object).getLibs();
+ }
+ return object == null ? null : getLibs(object.getModel());
+ }
+
}
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemsImpl.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemsImpl.java 2010-09-23 14:23:22 UTC (rev 25124)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemsImpl.java 2010-09-23 14:51:29 UTC (rev 25125)
@@ -32,11 +32,17 @@
Ov overlapper = null;
FileSystemsRenameListener fileSystemsRenameListener = new FileSystemsRenameListener(this);
+ Libs libs = new Libs(this);
+
public FileSystemsImpl() {
IWorkspace workspace = ModelPlugin.getWorkspace();
if (workspace != null) workspace.addResourceChangeListener(this);
}
+ public Libs getLibs() {
+ return libs;
+ }
+
public String getPresentationString() {
IProject p = EclipseResourceUtil.getProject(this);
String app = getAttributeValue("application name"); //$NON-NLS-1$
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemsLoader.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemsLoader.java 2010-09-23 14:23:22 UTC (rev 25124)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemsLoader.java 2010-09-23 14:51:29 UTC (rev 25125)
@@ -21,6 +21,7 @@
import org.jboss.tools.common.meta.XAttribute;
import org.jboss.tools.common.meta.XModelEntity;
import org.jboss.tools.common.model.*;
+import org.jboss.tools.common.model.filesystems.FileSystemsHelper;
import org.jboss.tools.common.model.loaders.*;
import org.jboss.tools.common.model.loaders.impl.*;
import org.jboss.tools.common.model.plugin.ModelPlugin;
@@ -158,63 +159,12 @@
IProject project = EclipseResourceUtil.getProject(object);
if(project == null) return;
XModelObject lib = validateLib(object);
- if(lib == null) {
- return;
- }
- List<String> newPaths = null;
- try {
- newPaths = EclipseResourceUtil.getClassPath(project.getProject());
- List<String> jre = EclipseResourceUtil.getJREClassPath(project.getProject());
- if(jre != null) newPaths.removeAll(jre);
- } catch (CoreException e) {
- //TODO
- ModelPlugin.getDefault().logError(e);
- } catch (IOException e) {
- ModelPlugin.getDefault().logError(e);
- }
- if(paths == null && newPaths == null) return;
- if((newPaths == null || paths == null) || (paths.size() != newPaths.size())) {
- paths = newPaths;
- } else {
- boolean b = false;
- for (int i = 0; i < paths.size() && !b; i++) {
- if(!paths.get(i).equals(newPaths.get(i))) b = true;
- }
- if(!b) return;
- paths = newPaths;
- }
- XModelObject[] fs = object.getChildren("FileSystemJar"); //$NON-NLS-1$
- Set<XModelObject> fss = new HashSet<XModelObject>();
- for (int i = 0; i < fs.length; i++) fss.add(fs[i]);
-
- for (int i = 0; i < paths.size(); i++) {
- String path = paths.get(i);
- if(!EclipseResourceUtil.isJar(path)) continue;
- String fileName = new File(path).getName();
- if(EclipseResourceUtil.SYSTEM_JAR_SET.contains(fileName)) continue;
- String jsname = "lib-" + fileName; //$NON-NLS-1$
- XModelObject o = object.getChildByPath(jsname);
- if(o != null) {
- fss.remove(o);
- } else {
- o = object.getModel().createModelObject("FileSystemJar", null); //$NON-NLS-1$
- o.setAttributeValue(XModelObjectConstants.ATTR_NAME, jsname);
- o.setAttributeValue(XModelObjectConstants.ATTR_NAME_LOCATION, path);
- o.set(IS_ADDED_TO_CLASSPATH, XModelObjectConstants.TRUE);
- object.addChild(o);
-// object.setModified(true);
- }
- }
-
- for (XModelObject o: fss) {
- String path = XModelObjectUtil.expand(o.getAttributeValue(XModelObjectConstants.ATTR_NAME_LOCATION), o.getModel(), null);
- if(XModelObjectConstants.TRUE.equals(o.get(FileSystemsLoader.IS_ADDED_TO_CLASSPATH))) {
- o.removeFromParent();
- } else if(!new File(path).exists()) {
- o.removeFromParent();
- }
- }
-
+// if(lib == null) {
+// return;
+// }
+
+ Libs libs = FileSystemsHelper.getLibs(object);
+ if(libs != null) libs.update();
}
private XModelObject validateLib(XModelObject object) {
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/JarAccess.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/JarAccess.java 2010-09-23 14:23:22 UTC (rev 25124)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/JarAccess.java 2010-09-23 14:51:29 UTC (rev 25125)
@@ -289,14 +289,14 @@
public JarSystemImpl getMain() {
IProject p = EclipseResourceUtil.getProject(main);
- if(p == null || !p.isAccessible() || main.getParent() == null) {
+ if(p == null || !p.isAccessible() || !main.isActive()) {
main = null;
synchronized(slaves) {
Iterator<JarSystemImpl> it = slaves.iterator();
while(it.hasNext()) {
JarSystemImpl s = it.next();
p = EclipseResourceUtil.getProject(s);
- if(p == null || !p.isAccessible() || s.getParent() == null) {
+ if(p == null || !p.isAccessible() || !s.isActive()) {
it.remove();
} else if(main == null) {
main = s;
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/JarSystemImpl.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/JarSystemImpl.java 2010-09-23 14:23:22 UTC (rev 25124)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/JarSystemImpl.java 2010-09-23 14:51:29 UTC (rev 25125)
@@ -47,6 +47,9 @@
boolean loaded2 = false;
protected void loadChildren() {
+ if(!isActive()) {
+ return;
+ }
// if(jar.isLoaded()) return;
if(this != getJarAccess().getMain()) return;
Added: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/Libs.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/Libs.java (rev 0)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/Libs.java 2010-09-23 14:51:29 UTC (rev 25125)
@@ -0,0 +1,145 @@
+/*******************************************************************************
+ * Copyright (c) 2009 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.common.model.filesystems.impl;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.jboss.tools.common.model.XModelObject;
+import org.jboss.tools.common.model.XModelObjectConstants;
+import org.jboss.tools.common.model.plugin.ModelPlugin;
+import org.jboss.tools.common.model.util.EclipseResourceUtil;
+import org.jboss.tools.common.model.util.XModelObjectUtil;
+
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+public class Libs {
+ protected FileSystemsImpl object;
+ protected List<String> paths = null;
+ Map<IPath, String> paths2 = new HashMap<IPath, String>();
+
+ List<LibsListener> listeners = new ArrayList<LibsListener>();
+
+ public Libs(FileSystemsImpl object) {
+ this.object = object;
+ }
+
+ private IProject getProjectResource() {
+ return EclipseResourceUtil.getProject(object);
+ }
+
+ public boolean update() {
+ List<String> newPaths = null;
+ try {
+ newPaths = EclipseResourceUtil.getClassPath(getProjectResource());
+ List<String> jre = EclipseResourceUtil.getJREClassPath(getProjectResource());
+ if(jre != null) newPaths.removeAll(jre);
+ } catch (CoreException e) {
+ //TODO
+ ModelPlugin.getDefault().logError(e);
+ } catch(IOException e) {
+ ModelPlugin.getDefault().logError(e);
+ }
+ if(paths == null && newPaths == null) return false;
+ if((newPaths == null || paths == null) || (paths.size() != newPaths.size())) {
+ paths = newPaths;
+ } else {
+ boolean b = false;
+ for (int i = 0; i < paths.size() && !b; i++) {
+ if(!paths.get(i).equals(newPaths.get(i))) b = true;
+ }
+ if(!b) return false;
+ paths = newPaths;
+ }
+ createMap(); if(paths == null) return true;
+ XModelObject[] fs = object.getChildren("FileSystemJar"); //$NON-NLS-1$
+ Set<XModelObject> fss = new HashSet<XModelObject>();
+ for (int i = 0; i < fs.length; i++) fss.add(fs[i]);
+
+ for (int i = 0; i < paths.size(); i++) {
+ String path = paths.get(i);
+ if(!EclipseResourceUtil.isJar(path)) continue;
+ String fileName = new File(path).getName();
+ if(EclipseResourceUtil.SYSTEM_JAR_SET.contains(fileName)) continue;
+ String jsname = "lib-" + fileName; //$NON-NLS-1$
+ XModelObject o = object.getChildByPath(jsname);
+ if(o != null) {
+ fss.remove(o);
+ } else {
+ o = object.getModel().createModelObject("FileSystemJar", null); //$NON-NLS-1$
+ o.setAttributeValue(XModelObjectConstants.ATTR_NAME, jsname);
+ o.setAttributeValue(XModelObjectConstants.ATTR_NAME_LOCATION, path);
+ o.set(FileSystemsLoader.IS_ADDED_TO_CLASSPATH, XModelObjectConstants.TRUE);
+ object.addChild(o);
+// object.setModified(true);
+ }
+ }
+
+ for (XModelObject o: fss) {
+ String path = XModelObjectUtil.expand(o.getAttributeValue(XModelObjectConstants.ATTR_NAME_LOCATION), o.getModel(), null);
+ if(XModelObjectConstants.TRUE.equals(o.get(FileSystemsLoader.IS_ADDED_TO_CLASSPATH))) {
+ o.removeFromParent();
+ } else if(!new File(path).exists()) {
+ o.removeFromParent();
+ }
+ }
+
+ return true;
+ }
+
+ public List<String> getPaths() {
+ return paths;
+ }
+
+ public Map<IPath, String> getPathsAsMap() {
+ return paths2;
+ }
+
+ private void createMap() {
+ paths2.clear();
+ if(paths != null) {
+ for (String p : paths) {
+ paths2.put(new Path(p), p);
+ }
+ }
+ }
+
+ public synchronized void addListener(LibsListener listener) {
+ listeners.add(listener);
+ }
+
+ public synchronized void removeListener(LibsListener listener) {
+ listeners.remove(listener);
+ }
+
+ void fire() {
+ LibsListener[] ls = null;
+ synchronized(this) {
+ ls = listeners.toArray(new LibsListener[0]);
+ }
+ if(ls != null) for (LibsListener listener: ls) {
+ listener.pathsChanged(paths);
+ }
+ }
+}
Property changes on: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/Libs.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/LibsListener.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/LibsListener.java (rev 0)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/LibsListener.java 2010-09-23 14:51:29 UTC (rev 25125)
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2009 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.common.model.filesystems.impl;
+
+import java.util.List;
+
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+public interface LibsListener {
+ public void pathsChanged(List<String> paths);
+}
Property changes on: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/LibsListener.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/RegularChildren.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/RegularChildren.java 2010-09-23 14:23:22 UTC (rev 25124)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/RegularChildren.java 2010-09-23 14:51:29 UTC (rev 25125)
@@ -99,8 +99,9 @@
public Map<String, XModelObject> getObjectsMap() {
Map<String, XModelObject> result = new HashMap<String, XModelObject>();
if (objects != null) {
- synchronized(objects) {
- result.putAll(objects.getMap());
+ Map<String, XModelObject> entries = objects.getMap();
+ synchronized(entries) {
+ result.putAll(entries);
}
}
return result;
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ext/AbstractClassPathMonitor.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ext/AbstractClassPathMonitor.java 2010-09-23 14:23:22 UTC (rev 25124)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ext/AbstractClassPathMonitor.java 2010-09-23 14:51:29 UTC (rev 25125)
@@ -14,7 +14,10 @@
import org.eclipse.core.runtime.Path;
import org.jboss.tools.common.model.XModel;
import org.jboss.tools.common.model.XModelObject;
+import org.jboss.tools.common.model.filesystems.FileSystemsHelper;
import org.jboss.tools.common.model.filesystems.impl.FileSystemsLoader;
+import org.jboss.tools.common.model.filesystems.impl.Libs;
+import org.jboss.tools.common.model.filesystems.impl.LibsListener;
import org.jboss.tools.common.model.plugin.ModelPlugin;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.common.model.util.XModelObjectUtil;
@@ -24,12 +27,13 @@
*
* @author Viacheslav Kabanovich
*/
-public abstract class AbstractClassPathMonitor<P> {
+public abstract class AbstractClassPathMonitor<P> implements LibsListener {
protected XModel model = null;
protected P project;
protected List<String> paths = null;
protected Map<IPath, String> paths2 = new HashMap<IPath, String>();
+ boolean libsModified = false;
protected Set<String> processedPaths = new HashSet<String>();
@@ -44,6 +48,9 @@
* Initialization of inner model.
*/
public void init() {
+ if(model == null) return;
+ Libs libs = FileSystemsHelper.getLibs(model);
+ if(libs != null) libs.addListener(this);
}
public abstract IProject getProjectResource();
@@ -54,74 +61,19 @@
* @return
*/
public boolean update() {
- List<String> newPaths = null;
- try {
- newPaths = EclipseResourceUtil.getClassPath(getProjectResource());
- List<String> jre = EclipseResourceUtil.getJREClassPath(getProjectResource());
- if(jre != null) newPaths.removeAll(jre);
- } catch (CoreException e) {
- //TODO
- ModelPlugin.getDefault().logError(e);
- } catch(IOException e) {
- ModelPlugin.getDefault().logError(e);
+ Libs libs = FileSystemsHelper.getLibs(model);
+ libs.update();
+ List<String> newPaths = libs.getPaths();
+ boolean result = libsModified || paths == null;
+ paths = newPaths;
+ if(result) {
+ paths2.clear();
+ paths2.putAll(libs.getPathsAsMap());
}
- if(paths == null && newPaths == null) return false;
- if((newPaths == null || paths == null) || (paths.size() != newPaths.size())) {
- paths = newPaths;
- } else {
- boolean b = false;
- for (int i = 0; i < paths.size() && !b; i++) {
- if(!paths.get(i).equals(newPaths.get(i))) b = true;
- }
- if(!b) return false;
- paths = newPaths;
- }
- createMap();
- XModelObject object = model.getByPath("FileSystems"); //$NON-NLS-1$
- XModelObject[] fs = object.getChildren("FileSystemJar"); //$NON-NLS-1$
- Set<XModelObject> fss = new HashSet<XModelObject>();
- for (int i = 0; i < fs.length; i++) fss.add(fs[i]);
-
- for (int i = 0; i < paths.size(); i++) {
- String path = paths.get(i);
- if(!EclipseResourceUtil.isJar(path)) continue;
- String fileName = new File(path).getName();
- if(EclipseResourceUtil.SYSTEM_JAR_SET.contains(fileName)) continue;
- String jsname = "lib-" + fileName; //$NON-NLS-1$
- XModelObject o = model.getByPath("FileSystems").getChildByPath(jsname); //$NON-NLS-1$
- if(o != null) {
- fss.remove(o);
- } else {
- o = object.getModel().createModelObject("FileSystemJar", null); //$NON-NLS-1$
- o.setAttributeValue("name", jsname); //$NON-NLS-1$
- o.setAttributeValue("location", path); //$NON-NLS-1$
- o.set(FileSystemsLoader.IS_ADDED_TO_CLASSPATH, "true"); //$NON-NLS-1$
- object.addChild(o);
-// object.setModified(true);
- }
- }
-
- for (XModelObject o: fss) {
- String path = XModelObjectUtil.expand(o.getAttributeValue("location"), o.getModel(), null); //$NON-NLS-1$
- if("true".equals(o.get(FileSystemsLoader.IS_ADDED_TO_CLASSPATH))) { //$NON-NLS-1$
- o.removeFromParent();
- } else if(!new File(path).exists()) {
- o.removeFromParent();
- }
- }
-
- return true;
+ libsModified = false;
+ return result;
}
- private void createMap() {
- paths2.clear();
- if(paths != null) {
- for (String p : paths) {
- paths2.put(new Path(p), p);
- }
- }
- }
-
public void pathLoaded(IPath path) {
String p = paths2.get(path);
if(p != null) {
@@ -139,4 +91,7 @@
processedPaths.clear();
}
+ public void pathsChanged(List<String> paths) {
+ libsModified = true;
+ }
}
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java 2010-09-23 14:23:22 UTC (rev 25124)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java 2010-09-23 14:51:29 UTC (rev 25125)
@@ -515,68 +515,14 @@
}
private static void updateLibs(IProject project, XModelObject object) {
- List<String> paths = new ArrayList<String>();
- XModelObject[] ss = object.getChildren();
- for (int i = 0; i < ss.length; i++) {
- if(ss[i].getModelEntity().getName().equals("FileSystemJar")) {
- paths.add(ss[i].getAttributeValue(XModelObjectConstants.ATTR_NAME_LOCATION));
- }
- }
- List<String> newPaths = null;
- try {
- newPaths = EclipseResourceUtil.getClassPath(project.getProject());
- List<String> jre = EclipseResourceUtil.getJREClassPath(project.getProject());
- if(jre != null) newPaths.removeAll(jre);
- } catch (CoreException e) {
- //TODO
- ModelPlugin.getDefault().logError(e);
- } catch (IOException e) {
- ModelPlugin.getDefault().logError(e);
- }
- if(paths == null && newPaths == null) return;
- if((newPaths == null || paths == null) || (paths.size() != newPaths.size())) {
- paths = newPaths;
- } else {
- boolean b = false;
- for (int i = 0; i < paths.size() && !b; i++) {
- if(!paths.get(i).equals(newPaths.get(i))) b = true;
- }
- if(!b) return;
- paths = newPaths;
- }
- if(paths == null && newPaths == null) return;
- XModelObject[] fs = object.getChildren("FileSystemJar"); //$NON-NLS-1$
- Set<XModelObject> fss = new HashSet<XModelObject>();
- for (int i = 0; i < fs.length; i++) fss.add(fs[i]);
-
- for (int i = 0; i < paths.size(); i++) {
- String path = paths.get(i);
- if(!EclipseResourceUtil.isJar(path)) continue;
- String fileName = new File(path).getName();
- if(SYSTEM_JAR_SET.contains(fileName)) continue;
- String jsname = "lib-" + fileName; //$NON-NLS-1$
- XModelObject o = object.getChildByPath(jsname);
- if(o != null) {
- fss.remove(o);
- } else {
- o = object.getModel().createModelObject("FileSystemJar", null); //$NON-NLS-1$
- o.setAttributeValue(XModelObjectConstants.ATTR_NAME, jsname);
- o.setAttributeValue(XModelObjectConstants.ATTR_NAME_LOCATION, path);
- o.set(FileSystemsLoader.IS_ADDED_TO_CLASSPATH, XModelObjectConstants.TRUE);
- object.addChild(o);
-// object.setModified(true);
- }
- }
-
- for (XModelObject o: fss) {
- String path = XModelObjectUtil.expand(o.getAttributeValue(XModelObjectConstants.ATTR_NAME_LOCATION), o.getModel(), null);
- if(XModelObjectConstants.TRUE.equals(o.get(FileSystemsLoader.IS_ADDED_TO_CLASSPATH))) {
- o.removeFromParent();
- } else if(!new File(path).exists()) {
- o.removeFromParent();
- }
- }
-
+ FileSystemsHelper.getLibs(object).update();
+// List<String> paths = new ArrayList<String>();
+// XModelObject[] ss = object.getChildren();
+// for (int i = 0; i < ss.length; i++) {
+// if(ss[i].getModelEntity().getName().equals("FileSystemJar")) {
+// paths.add(ss[i].getAttributeValue(XModelObjectConstants.ATTR_NAME_LOCATION));
+// }
+// }
}
15 years, 7 months
- 1
- 0
JBoss Tools SVN: r25124 - in trunk: jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/ca/test and 5 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-09-23 10:23:22 -0400 (Thu, 23 Sep 2010)
New Revision: 25124
Added:
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/WebContentAssistProviderTest.java
Removed:
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/ca/test/WebContentAssistProviderTest.java
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/META-INF/MANIFEST.MF
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/list/WebPromptingProvider.java
Log:
JBIDE-7152
https://jira.jboss.org/browse/JBIDE-7152
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF 2010-09-23 12:44:53 UTC (rev 25123)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF 2010-09-23 14:23:22 UTC (rev 25124)
@@ -7,7 +7,6 @@
.
Bundle-Vendor: %Bundle-Vendor.0
Export-Package: org.custommonkey.xmlunit,
- org.jboss.tools.jsf.ca.test,
org.jboss.tools.jsf.kb.test,
org.jboss.tools.jsf.model.pv.test,
org.jboss.tools.jsf.plugin,
Deleted: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/ca/test/WebContentAssistProviderTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/ca/test/WebContentAssistProviderTest.java 2010-09-23 12:44:53 UTC (rev 25123)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/ca/test/WebContentAssistProviderTest.java 2010-09-23 14:23:22 UTC (rev 25124)
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Exadel, Inc. and 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:
- * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.jsf.ca.test;
-
-import java.util.List;
-import java.util.Properties;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.jboss.tools.common.model.XModel;
-import org.jboss.tools.common.model.XModelObject;
-import org.jboss.tools.common.model.project.Watcher;
-import org.jboss.tools.common.model.util.EclipseResourceUtil;
-import org.jboss.tools.jst.web.project.list.WebPromptingProvider;
-import org.jboss.tools.test.util.JobUtils;
-import org.jboss.tools.test.util.TestProjectProvider;
-
-public class WebContentAssistProviderTest extends TestCase {
-
- TestProjectProvider provider = null;
- IProject project = null;
- boolean makeCopy = true;
- XModel projectModel;
- WebPromptingProvider webPromptingProvider;
-
- public static Test suite() {
- return new TestSuite(WebContentAssistProviderTest.class);
- }
-
- public void testTlds() {
- // Wait all the builders to finish
- JobUtils.waitForIdle(2000);
-
- List tldList = webPromptingProvider.getList(projectModel, WebPromptingProvider.JSF_GET_TAGLIBS, "", null);
- assertTrue("TLD list does not contain expected TLD in XModel.", tldList.contains("http://jboss.com/products/seam/taglib"));
- }
-
- public void testJsfBeanPropertyList() {
- // seam beans list
- List beanList = webPromptingProvider.getList(projectModel, WebPromptingProvider.JSF_BEAN_PROPERTIES, "facesManagedBean", new Properties());
- assertTrue("Bean property list does not contain Managed bean property in XModel.", beanList.contains("property1"));
- }
-
- public void testBundles() {
- // bundle name list
- List bundleList = webPromptingProvider.getList(projectModel, WebPromptingProvider.JSF_BUNDLES, "", null);
- assertTrue("Bundle name list does not contain expected name in XModel.", bundleList.contains("org.jboss.seam.example.numberguess.test"));
- // bundle property list
- List bundlePropertyList = webPromptingProvider.getList(projectModel, WebPromptingProvider.JSF_BUNDLE_PROPERTIES, "org.jboss.seam.example.numberguess.test", null);
- assertTrue("Bundle property list does not contain expected property in XModel.", bundlePropertyList.contains("bundleProperty1"));
- }
-
- public void setUp() throws Exception {
- JobUtils.waitForIdle(10000);
- project = ResourcesPlugin.getWorkspace().getRoot().getProject("TestsWebArtefacts");
- if(!project.exists()) {
- provider = new TestProjectProvider("org.jboss.tools.jst.web.test", null, "TestsWebArtefacts", makeCopy);
- project = provider.getProject();
- }
- project.refreshLocal(IResource.DEPTH_INFINITE, null);
- project.build(IncrementalProjectBuilder.FULL_BUILD,null);
- XModelObject xmo = EclipseResourceUtil.getObjectByResource(project);
- assertNotNull("Can't get XModel Object for test project.", xmo);
- projectModel = xmo.getModel();
- Watcher.getInstance(projectModel).forceUpdate();
- projectModel.update();
- assertNotNull("Can't get XModel for test project.", projectModel);
-
- // Wait all the builders to finish
- JobUtils.waitForIdle(2000);
-
- webPromptingProvider = WebPromptingProvider.getInstance();
- }
-
- protected void tearDown() throws Exception {
- if(provider != null) {
- provider.dispose();
- }
- }
-}
\ No newline at end of file
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java 2010-09-23 12:44:53 UTC (rev 25123)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java 2010-09-23 14:23:22 UTC (rev 25124)
@@ -15,8 +15,6 @@
import junit.framework.TestSuite;
import org.eclipse.jdt.internal.core.JavaModelManager;
-import org.jboss.tools.jsf.ca.test.WebContentAssistProviderTest;
-import org.jboss.tools.jsf.kb.test.FaceletsKbModelTest;
import org.jboss.tools.jsf.model.pv.test.JSFPromptingProviderTest;
import org.jboss.tools.jsf.test.refactoring.ELVariableRefactoringTest;
import org.jboss.tools.jsf.test.refactoring.JSF2RefactoringTest;
@@ -33,9 +31,6 @@
old.addTestSuite(JSFModelTest.class);
old.addTestSuite(ModelFormat_2_0_0_Test.class);
old.addTestSuite(JSFBeansTest.class);
- old.addTest(
- new ProjectImportTestSetup(WebContentAssistProviderTest.suite(),
- "org.jboss.tools.jst.web.test", "projects/TestsWebArtefacts","TestsWebArtefacts"));
suite.addTest(new ProjectImportTestSetup(old,
"org.jboss.tools.jsf.test", "projects/JSFKickStartOldFormat", //$NON-NLS-1$ //$NON-NLS-2$
"JSFKickStartOldFormat")); //$NON-NLS-1$
@@ -81,4 +76,4 @@
JavaModelManager.getIndexManager().disable();
}
}
-}
+}
\ No newline at end of file
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/META-INF/MANIFEST.MF 2010-09-23 12:44:53 UTC (rev 25123)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/META-INF/MANIFEST.MF 2010-09-23 14:23:22 UTC (rev 25124)
@@ -15,15 +15,16 @@
org.eclipse.ui.ide,
org.eclipse.ltk.core.refactoring,
org.eclipse.jst.j2ee,
- org.eclipse.jface.text;bundle-version="3.5.2",
+ org.eclipse.jface.text,
org.jboss.tools.jst.jsp.test,
org.jboss.tools.jst.css,
org.jboss.tools.jsf.text.ext,
org.jboss.tools.jsf.text.ext.facelets,
org.jboss.tools.jsf.text.ext.richfaces,
- org.eclipse.wst.server.core;bundle-version="1.1.202",
- org.eclipse.jst.server.tomcat.core;bundle-version="1.1.200",
- org.eclipse.ui;bundle-version="3.6.0",
- org.jboss.tools.common.el.core;bundle-version="3.2.0"
+ org.eclipse.wst.server.core,
+ org.eclipse.jst.server.tomcat.core,
+ org.eclipse.ui,
+ org.jboss.tools.common.el.core,
+ org.jboss.tools.jst.web
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Copied: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/WebContentAssistProviderTest.java (from rev 25118, trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/ca/test/WebContentAssistProviderTest.java)
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/WebContentAssistProviderTest.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/WebContentAssistProviderTest.java 2010-09-23 14:23:22 UTC (rev 25124)
@@ -0,0 +1,94 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Exadel, Inc. and 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:
+ * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.jsf.jsp.ca.test;
+
+import java.util.List;
+import java.util.Properties;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IncrementalProjectBuilder;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.jboss.tools.common.model.XModel;
+import org.jboss.tools.common.model.XModelObject;
+import org.jboss.tools.common.model.project.Watcher;
+import org.jboss.tools.common.model.util.EclipseResourceUtil;
+import org.jboss.tools.jst.web.project.list.WebPromptingProvider;
+import org.jboss.tools.test.util.JobUtils;
+import org.jboss.tools.test.util.TestProjectProvider;
+
+public class WebContentAssistProviderTest extends TestCase {
+
+ TestProjectProvider provider = null;
+ IProject project = null;
+ boolean makeCopy = true;
+ XModel projectModel;
+ WebPromptingProvider webPromptingProvider;
+
+ public static Test suite() {
+ return new TestSuite(WebContentAssistProviderTest.class);
+ }
+
+ public void testTlds() {
+ // Wait all the builders to finish
+ JobUtils.waitForIdle(2000);
+
+ List tldList = webPromptingProvider.getList(projectModel, WebPromptingProvider.JSF_GET_TAGLIBS, "", null);
+ assertTrue("TLD list does not contain expected TLD in XModel.", tldList.contains("http://jboss.com/products/seam/taglib"));
+ }
+
+ public void testJsfBeanPropertyList() {
+ // seam beans list
+ List beanList = webPromptingProvider.getList(projectModel, WebPromptingProvider.JSF_BEAN_PROPERTIES, "facesManagedBean", new Properties());
+ assertTrue("Bean property list does not contain Managed bean property in XModel.", beanList.contains("property1"));
+ }
+
+ public void testBundles() {
+ // bundle name list
+ List bundleList = webPromptingProvider.getList(projectModel, WebPromptingProvider.JSF_BUNDLES, "", null);
+ assertTrue("Bundle name list does not contain expected name in XModel.", bundleList.contains("org.jboss.seam.example.numberguess.test"));
+ // bundle property list
+ List bundlePropertyList = webPromptingProvider.getList(projectModel, WebPromptingProvider.JSF_BUNDLE_PROPERTIES, "org.jboss.seam.example.numberguess.test", null);
+ assertTrue("Bundle property list does not contain expected property in XModel.", bundlePropertyList.contains("bundleProperty1"));
+ }
+
+ public void setUp() throws Exception {
+ JobUtils.waitForIdle(10000);
+ project = ResourcesPlugin.getWorkspace().getRoot().getProject("TestsWebArtefacts");
+ if(!project.exists()) {
+ provider = new TestProjectProvider("org.jboss.tools.jst.web.test", null, "TestsWebArtefacts", makeCopy);
+ project = provider.getProject();
+ }
+ project.refreshLocal(IResource.DEPTH_INFINITE, null);
+ project.build(IncrementalProjectBuilder.FULL_BUILD,null);
+ XModelObject xmo = EclipseResourceUtil.getObjectByResource(project);
+ assertNotNull("Can't get XModel Object for test project.", xmo);
+ projectModel = xmo.getModel();
+ Watcher.getInstance(projectModel).forceUpdate();
+ projectModel.update();
+ assertNotNull("Can't get XModel for test project.", projectModel);
+
+ // Wait all the builders to finish
+ JobUtils.waitForIdle(2000);
+
+ webPromptingProvider = WebPromptingProvider.getInstance();
+ }
+
+ protected void tearDown() throws Exception {
+ if(provider != null) {
+ provider.dispose();
+ }
+ }
+}
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/WebContentAssistProviderTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java 2010-09-23 12:44:53 UTC (rev 25123)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java 2010-09-23 14:23:22 UTC (rev 25124)
@@ -26,10 +26,8 @@
import org.jboss.tools.jsf.jsp.ca.test.JsfJspJbide1704Test;
import org.jboss.tools.jsf.jsp.ca.test.JsfJspJbide1717Test;
import org.jboss.tools.jsf.jsp.ca.test.JsfJspJbide6259Test;
-import org.jboss.tools.jsf.jsp.ca.test.MissingKBBuilderTest;
+import org.jboss.tools.jsf.jsp.ca.test.WebContentAssistProviderTest;
import org.jboss.tools.jsf.ui.test.refactoring.ELReferencesRenameTest;
-import org.jboss.tools.jsf.ui.test.AddJSFCapabilitiesTest;
-import org.jboss.tools.jsf.ui.test.JSPProblemMarkerResolutionTest;
import org.jboss.tools.test.util.ProjectImportTestSetup;
public class JsfUiAllTests {
@@ -56,6 +54,9 @@
suite.addTestSuite(JsfJspJbide1704Test.class);
suite.addTestSuite(JsfJspJbide1717Test.class);
+ suite.addTest(
+ new ProjectImportTestSetup(WebContentAssistProviderTest.suite(),
+ "org.jboss.tools.jst.web.test", "projects/TestsWebArtefacts","TestsWebArtefacts"));
suite.addTest(new ProjectImportTestSetup(new TestSuite(
ELReferencesRenameTest.class), "org.jboss.tools.jsf.ui.test", //$NON-NLS-1$
new String[] { "projects/testJSFProject", }, //$NON-NLS-1$
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/list/WebPromptingProvider.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/list/WebPromptingProvider.java 2010-09-23 12:44:53 UTC (rev 25123)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/list/WebPromptingProvider.java 2010-09-23 14:23:22 UTC (rev 25124)
@@ -10,7 +10,9 @@
******************************************************************************/
package org.jboss.tools.jst.web.project.list;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
import org.eclipse.core.runtime.Platform;
import org.jboss.tools.common.model.XModel;
@@ -18,9 +20,9 @@
import org.jboss.tools.jst.web.WebModelPlugin;
public class WebPromptingProvider implements IWebPromptingProvider {
-
+
static IWebPromptingProvider[] providers;
-
+
static {
String[][] pns = new String[][]{
{"org.jboss.tools.jsf.model.pv.JSFPromptingProvider", "org.jboss.tools.jsf"}, //$NON-NLS-1$ //$NON-NLS-2$
@@ -40,11 +42,11 @@
}
providers = l.toArray(new IWebPromptingProvider[0]);
}
-
+
public static WebPromptingProvider getInstance() {
return WebPromptingProviderHolder.provider;
}
-
+
public boolean isSupporting(String id) {
for (int i = 0; i < providers.length; i++) {
if(providers[i].isSupporting(id)) return true;
@@ -70,9 +72,8 @@
}
return EMPTY_LIST;
}
-
+
static class WebPromptingProviderHolder {
static WebPromptingProvider provider = new WebPromptingProvider();
}
-
-}
+}
\ No newline at end of file
15 years, 7 months
- 1
- 0
JBoss Tools SVN: r25123 - trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test.
by jbosstools-commits＠lists.jboss.org
Author: dvinnichek
Date: 2010-09-23 08:44:53 -0400 (Thu, 23 Sep 2010)
New Revision: 25123
Modified:
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/WebWizardsTest.java
Log:
fix for org.jboss.tools.jst.web.ui.test.WebWizardsTest.testNewXhtmlWizardInstanceIsCreated() (https://jira.jboss.org/browse/JBIDE-7109)
Modified: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/WebWizardsTest.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/WebWizardsTest.java 2010-09-23 12:04:13 UTC (rev 25122)
+++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/WebWizardsTest.java 2010-09-23 12:44:53 UTC (rev 25123)
@@ -87,7 +87,10 @@
assertEquals("The Page should be","HTMLWizardNewFileCreationPage", htmlWizardNewFileCreationPage.getName()); //$NON-NLS-1$//$NON-NLS-2$
IWizardPage newXHTMLTemplatesWizardPage=htmlWizardNewFileCreationPage.getNextPage();
assertEquals("The Page should be","NewXHTMLTemplatesWizardPage", newXHTMLTemplatesWizardPage.getName()); //$NON-NLS-1$//$NON-NLS-2$
- assertTrue("Start page is not loaded",newXHTMLTemplatesWizardPage.getNextPage() instanceof DefaultStandardStep); //$NON-NLS-1$
+ if (newXHTMLTemplatesWizardPage.canFlipToNextPage()) {
+ IWizardPage newXHTMLTagLibrariesWizardPage = newXHTMLTemplatesWizardPage.getNextPage();
+ assertTrue("Start page is not loaded", newXHTMLTagLibrariesWizardPage instanceof DefaultStandardStep); //$NON-NLS-1$
+ }
} finally {
dialog.close();
}
15 years, 7 months
- 1
- 0