JBoss Tools SVN: r27008 - in trunk/documentation/whatsnew: bpel and 8 other directories.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2010-11-29 12:53:00 -0500 (Mon, 29 Nov 2010)
New Revision: 27008
Modified:
trunk/documentation/whatsnew/bpel/bpel-news-1.1.0.beta1.html
trunk/documentation/whatsnew/drools/guvnor-tools-news-5.1.0.Beta2.html
trunk/documentation/whatsnew/esb/esb-news-1.4.0.Beta2.html
trunk/documentation/whatsnew/gwt/gwt-news-1.0.0.Beta2.html
trunk/documentation/whatsnew/hibernate/hibernate-news-3.4.0.Beta2.html
trunk/documentation/whatsnew/index.html
trunk/documentation/whatsnew/jst/jst-news-3.2.0.Beta2.html
trunk/documentation/whatsnew/seam/seam-news-3.2.0.Beta2.html
trunk/documentation/whatsnew/usage/usage-news-3.2.0.Beta2.html
trunk/documentation/whatsnew/vpe/vpe-news-3.2.0.Beta2.html
Log:
JBIDE-7645 n&n for beta2 cleanup
Modified: trunk/documentation/whatsnew/bpel/bpel-news-1.1.0.beta1.html
===================================================================
--- trunk/documentation/whatsnew/bpel/bpel-news-1.1.0.beta1.html 2010-11-29 17:38:12 UTC (rev 27007)
+++ trunk/documentation/whatsnew/bpel/bpel-news-1.1.0.beta1.html 2010-11-29 17:53:00 UTC (rev 27008)
@@ -11,7 +11,7 @@
<body>
<h1>JBoss Eclipse BPEL Editor 1.1.0.beta1 What's New</h1>
-<p align="right"><a href="../index.html">< Main Index</a> <a href="../esb/esb-news-1.4.0.Beta1.html">ESB Tools ></a></p>
+<p align="right"><a href="../index.html">< Main Index</a> <a href="../esb/esb-news-1.4.0.Beta2.html">ESB Tools ></a></p>
<table border="0" cellpadding="10" cellspacing="0" width="80%">
<tr>
<td colspan="2">
Modified: trunk/documentation/whatsnew/drools/guvnor-tools-news-5.1.0.Beta2.html
===================================================================
--- trunk/documentation/whatsnew/drools/guvnor-tools-news-5.1.0.Beta2.html 2010-11-29 17:38:12 UTC (rev 27007)
+++ trunk/documentation/whatsnew/drools/guvnor-tools-news-5.1.0.Beta2.html 2010-11-29 17:53:00 UTC (rev 27008)
@@ -11,7 +11,7 @@
<body>
<h1>Drools Guvnor 5.1.0.Beta2 What's New</h1>
-<p align="right"><a href="../index.html">< Main Index</a> <a href="../jbpm/jbpm-news-3.2.0.M2.html">jBPM Tools ></a></p>
+<p align="right"><a href="../index.html">< Main Index</a> <a href="../bpel/bpel-news-1.1.0.beta1.html">BPEL Tools ></a></p>
<table border="0" cellpadding="10" cellspacing="0" width="80%">
@@ -26,22 +26,17 @@
<tr>
<td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>Guvnor Tools will not cause validation errors from meta files</b></td>
<td valign="top">
- <p>In previous Guvnor tools versions, Guvnor meta files caused validation errors for certain file types, and all those meta files were visible in resources explorer. Now the meta fies are invisible and will not cause any validation errors. </p>
+ <p>In previous Guvnor tools versions, Guvnor meta files
+ (.guvnorinfo) caused validation errors for certain file types, and
+ all those meta files were visible in resources explorer. Now the
+ meta files are marked as team resources and will thus not be
+ visible nor processed by any validators. </p>
-<p></p>
-
-
-
<p><small><a href="https://jira.jboss.org/browse/JBIDE-6093">Related jira</a></p>
</td>
</tr>
- <tr>
- <td colspan="2">
- <hr/>
- </td>
- </tr>
<tr>
@@ -55,11 +50,21 @@
<tr>
<td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>Not Allowed to Add Resources without File Extension</b></td>
<td valign="top">
- <p>Because Guvnor server uses the file extension to determine the resource type of a particular resource, there was a problem for files with no file extension. Now we validate and present an error if there is no file extesion for a resource.</p>
+ <p>Because Guvnor server uses the file extension to determine the
+ resource type of a particular resource, there was a problem for
+ files with no file extension. Now we validate and present an error
+ if user is attemptin to add a resource without a file extension.</p>
<p><small><a href="https://jira.jboss.org/browse/JBIDE-7032">Related jira</a></p>
</td>
</tr>
+
+ <tr>
+ <td colspan="2">
+ <hr/>
+ </td>
+ </tr>
+
<tr>
<td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>Not Allowed to Upload Two Resource with Same Name but a Different Extension</b></td>
<td valign="top">
Modified: trunk/documentation/whatsnew/esb/esb-news-1.4.0.Beta2.html
===================================================================
--- trunk/documentation/whatsnew/esb/esb-news-1.4.0.Beta2.html 2010-11-29 17:38:12 UTC (rev 27007)
+++ trunk/documentation/whatsnew/esb/esb-news-1.4.0.Beta2.html 2010-11-29 17:53:00 UTC (rev 27008)
@@ -11,7 +11,7 @@
<body>
<h1>ESB tools 1.4.0.Beta2 What's New</h1>
-<p align="right"><a href="../index.html">< Main Index</a> <a href="../ws/ws-news-1.2.0.Beta1.html">Webservice Tools ></a></p>
+<p align="right"><a href="../index.html">< Main Index</a> <a href="../modeshape/modeshape-news-7.1.0.Beta2.html">Modeshape Tools ></a></p>
<table border="0" cellpadding="10" cellspacing="0" width="80%">
@@ -26,7 +26,8 @@
<tr>
<td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>Configuration Validation</b></td>
<td valign="top">
- <p>Began implementing some basic validation for ESB configurations. The BusinessRulesProcessor action now. You can see validation errors and messages in the editor as yellow popups.</p>
+ <p>We've started adding validation of the esb.xml files. Starting
+ with BusinessRulesProcessor actions for now. You can see validation errors and messages in the editor as yellow popups.</p>
<img src="./images/BusinessRulesProcessor_validation.jpg" alt="" style="width : 523px; height : 327px;"/>
<p>The plan is to use the BusinessRulesProcessor as a test to see how validation would work within the editor. If it works well, we'll go ahead and extend it in future releases.</p>
<p><small>Related Jira: <a href="https://jira.jboss.org/browse/JBIDE-7193">JBIDE-7193</a>, <a href="https://jira.jboss.org/browse/JBIDE-7235">JBIDE-7235</a></small></p>
Modified: trunk/documentation/whatsnew/gwt/gwt-news-1.0.0.Beta2.html
===================================================================
--- trunk/documentation/whatsnew/gwt/gwt-news-1.0.0.Beta2.html 2010-11-29 17:38:12 UTC (rev 27007)
+++ trunk/documentation/whatsnew/gwt/gwt-news-1.0.0.Beta2.html 2010-11-29 17:53:00 UTC (rev 27008)
@@ -11,7 +11,8 @@
<body>
<h1>GWT Integration 1.0.0.Beta2 What's New</h1>
-<p align="right"><a href="../index.html">< Main Index</a> <a href="../teiid/teiid-news-7.1.0.Beta2.html">Teiid Designer ></a></p>
+<p align="right"><a href="../index.html">< Main Index</a> <a
+href="../drools/guvnor-tools-news-5.1.0.Beta2.html">Guvnor Tools ></a></p>
<table border="0" cellpadding="10" cellspacing="0" width="80%">
<tr>
<td colspan="2">
@@ -21,7 +22,7 @@
</td>
</tr>
<tr>
- <td valign="top" align="left"><a name="itemname3" id="itemname3"></a><b>Now only with Web module 2.5 </b></td>
+ <td valign="top" align="left"><a name="itemname3" id="itemname3"></a><b>Now only with Web module 2.5</b></td>
<td valign="top">
<p>GWT Integration had a bug where it was possible to use it with web module 2.4.
This is of course erroneous since GWT requires JDK 1.5. We fixed this and you now cannot
Modified: trunk/documentation/whatsnew/hibernate/hibernate-news-3.4.0.Beta2.html
===================================================================
--- trunk/documentation/whatsnew/hibernate/hibernate-news-3.4.0.Beta2.html 2010-11-29 17:38:12 UTC (rev 27007)
+++ trunk/documentation/whatsnew/hibernate/hibernate-news-3.4.0.Beta2.html 2010-11-29 17:53:00 UTC (rev 27008)
@@ -11,47 +11,56 @@
<body>
<h1>Hibernate tools 3.4.0.Beta2 What's New</h1>
-<p align="right"><a href="../index.html">< Main Index</a> <a href="../jst/jst-news-3.2.0.Beta1.html">JST Tools ></a></p>
+<p align="right"><a href="../index.html">< Main Index</a> <a href="../jst/jst-news-3.2.0.Beta2.html">JST Tools ></a></p>
<table border="0" cellpadding="10" cellspacing="0" width="80%">
- <tr>
+ <tr>
<td colspan="2">
<hr/>
- <h3>Query Parameters</h3>
+ <h3>General</h3>
<hr/>
</td>
</tr>
<tr>
- <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>Query Parameters</b></td>
+ <td valign="top" align="right"><a name="itemname3"
+ id="itemname3"></a><b>Hibernate 3.5/JPA 2</b></td>
<td valign="top">
- <p>It is possible now to enter list parameter value.
- As there is no way to set list parameter value for ordered parameters this works only for named parameters.
- This could be useful for example in this HQL query "select from test.Article a where a.id in (:param)".
- See <a href="http://anonsvn.jboss.org/repos/hibernate/core/branches/Branch_3_5/core/sr...">org.hibernate.Query</a>.</p>
- <p><img src="images/query_parameters.png"/></p>
- <p><small><a href="https://jira.jboss.org/browse/JBIDE-4202">Related jira</a></p>
+ <p>Hibernate tools plugins were moved to use Hibernate 3.5.6.Final
+ where it before used Hibernate 3.3.2.GA. This were done to primarily remove the
+ problems users using JPA 2 annotations were having since Hibernate
+ 3.3 could not parse these settings.</p>
+ <p>This update should not affect users of older versions of
+ Hibernate since Hibernate is backwards compatible when it comes to
+ configuration setup - but in case you see some
+ new/wrong/unexpected behavior in Hibernate Tools this update might
+ explain it. Please report issues found in jira so we can be aware
+ of any problems found.</p>
+ <p><small><a href="https://jira.jboss.org/browse/JBIDE-7241">Related jira</a></p>
+ <p><small><a href="http://community.jboss.org/wiki/HibernatepluginsaremovedtonewerHibernate-...">More</a></p>
</td>
</tr>
-
- <tr>
+
+ <tr>
<td colspan="2">
<hr/>
- <h3>Hibernate Library</h3>
+ <h3>Query Editor</h3>
<hr/>
</td>
</tr>
<tr>
- <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>Newer Hibernate is used</b></td>
+ <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>Query Parameters</b></td>
<td valign="top">
- <p>Hibernate tools plugins were moved to Hibernate 3.5.6.Final (Hibernate 3.3.2.GA) and now Console Configuration could be build now with JPA 2.0 mapping.
- Note JPA 2.0 supported in Hibernate since version 3.5.0</p>
- <p><small><a href="https://jira.jboss.org/browse/JBIDE-7241">Related jira</a></p>
- <p><small><a href="http://community.jboss.org/wiki/HibernatepluginsaremovedtonewerHibernate-...">More</a></p>
+ <p>It is possible now to enter list parameter value for named parameters.
+ This is useful for example in this HQL query "select from test.Article a where a.id in (:param)".
+ </p>
+ <p><img src="images/query_parameters.png"/></p>
+ <p><small><a href="https://jira.jboss.org/browse/JBIDE-4202">Related jira</a></p>
</td>
</tr>
+
<tr>
<td colspan="2">
Modified: trunk/documentation/whatsnew/index.html
===================================================================
--- trunk/documentation/whatsnew/index.html 2010-11-29 17:38:12 UTC (rev 27007)
+++ trunk/documentation/whatsnew/index.html 2010-11-29 17:53:00 UTC (rev 27008)
@@ -20,8 +20,32 @@
</td>
</tr>
+
<tr>
<td valign="top" align="left">
+ <p align="right"><b>3.2.0.Beta2</b>
+ <td valign="top">
+ <p><a href="usage/usage-news-3.2.0.Beta2.html">Usage Plugin</a></p>
+ <p><a href="as/as-news-3.2.0.Beta2.html">JBoss AS
+ Tools</a></p>
+ <p><a href="hibernate/hibernate-news-3.4.0.Beta2.html">Hibernate Tools</a></p>
+ <p><a href="jst/jst-news-3.2.0.Beta2.html">JST/JSF Tools</a></p>
+ <p><a href="vpe/vpe-news-3.2.0.Beta2.html">Visual Page Editor</a></p>
+ <p><a href="seam/seam-news-3.2.0.Beta2.html">Seam Tools</a></p>
+ <p><a href="deltacloud/deltacloud-news-0.0.1.Beta2.html">Deltacloud Development Tools</a></p>
+ <p><a href="gwt/gwt-news-1.0.0.Beta2.html">GWT Integration</a></p>
+
+ <p><a href="drools/guvnor-tools-news-5.1.0.Beta2.html">Drools Guvnor Tools</a></p>
+
+ <p><a href="bpel/bpel-news-1.1.0.beta1.html">BPEL Tools</a></p>
+ <p><a href="esb/esb-news-1.4.0.Beta2.html">ESB Tools</a></p>
+ <p><a href="modeshape/modeshape-news-7.1.0.Beta2.html">Modeshape</a></p>
+
+ </td>
+ </tr>
+
+ <tr>
+ <td valign="top" align="left">
<p align="right"><b>3.2.0.Beta1</b>
<td valign="top">
<p><a href="usage/usage-news-3.2.0.Beta1.html">Usage Plugin</a></p>
Modified: trunk/documentation/whatsnew/jst/jst-news-3.2.0.Beta2.html
===================================================================
--- trunk/documentation/whatsnew/jst/jst-news-3.2.0.Beta2.html 2010-11-29 17:38:12 UTC (rev 27007)
+++ trunk/documentation/whatsnew/jst/jst-news-3.2.0.Beta2.html 2010-11-29 17:53:00 UTC (rev 27008)
@@ -142,7 +142,8 @@
<td valign="top">
<p>There are new Ajax4Jsf 4 and RichFaces 4 groups in the palette.</p>
<img src="images/3.2.0.Beta2/Palette.png"/>
- <p>Be aware that these groups are hiden by default. You can enable them via Show/Hide menu:</p>
+ <p>Be aware that these groups are hiden by default
+ because they are still experimental. You can enable them via Show/Hide menu:</p>
<img src="images/3.2.0.Beta2/PaletteShowHide.png"/>
<p><small><a
href="https://jira.jboss.org/browse/JBIDE-7433">Related Jira</a></small></p>
Modified: trunk/documentation/whatsnew/seam/seam-news-3.2.0.Beta2.html
===================================================================
--- trunk/documentation/whatsnew/seam/seam-news-3.2.0.Beta2.html 2010-11-29 17:38:12 UTC (rev 27007)
+++ trunk/documentation/whatsnew/seam/seam-news-3.2.0.Beta2.html 2010-11-29 17:53:00 UTC (rev 27008)
@@ -12,7 +12,8 @@
<h1>Seam tools 3.2.0.Beta2 What's New</h1>
<p align="right"><a href="../index.html">< Main Index</a> <a
- href="../bpel/bpel-news-1.1.0.beta2.html">BPEL Tools ></a></p>
+ href="../deltacloud/deltacloud-news-0.0.1.Beta2.html">Delta
+ Cloud Tools ></a></p>
<table border="0" cellpadding="10" cellspacing="0" width="80%">
<tr>
Modified: trunk/documentation/whatsnew/usage/usage-news-3.2.0.Beta2.html
===================================================================
--- trunk/documentation/whatsnew/usage/usage-news-3.2.0.Beta2.html 2010-11-29 17:38:12 UTC (rev 27007)
+++ trunk/documentation/whatsnew/usage/usage-news-3.2.0.Beta2.html 2010-11-29 17:53:00 UTC (rev 27008)
@@ -25,11 +25,19 @@
<td valign="top" align="left"><a name="itemname3" id="itemname3"></a><b>Preferences</b></td>
<td valign="top">
We now show to the user what we collect in the preferences. This leads to even more transparency
- and clearly demonstrates that we track installation- and usage-patterns. The statistics shall allow us to enhance the user experience.
+ and clearly demonstrates that we track installation- and usage-patterns. The statistics allow us to enhance the user experience.
<p><img src="../images/usage-reporting-preferences-values.png"></img></p>
<p><small><a href="https://jira.jboss.org/browse/JBIDE-7144">Related Jira</a></small></p>
</td>
</tr>
+
+
+ </tr>
+ <tr>
+ <td colspan="2"><hr />
+ </td>
+ </tr>
+
<tr>
<td valign="top" align="left"><a name="itemname3" id="itemname3"></a><b>Operating systems</b></td>
<td valign="top">
@@ -43,6 +51,13 @@
<p><img src="../images/usage-reporting-windowsversions.png"></img></p>
<p><small><a href="https://jira.jboss.org/browse/JBIDE-7043">Related Jira</a></small></p>
</tr>
+
+
+ </tr>
+ <tr>
+ <td colspan="2"><hr />
+ </td>
+ </tr>
<tr>
<td valign="top" align="left"><a name="itemname3" id="itemname3"></a><b>Various bugs</b></td>
<td valign="top">
Modified: trunk/documentation/whatsnew/vpe/vpe-news-3.2.0.Beta2.html
===================================================================
--- trunk/documentation/whatsnew/vpe/vpe-news-3.2.0.Beta2.html 2010-11-29 17:38:12 UTC (rev 27007)
+++ trunk/documentation/whatsnew/vpe/vpe-news-3.2.0.Beta2.html 2010-11-29 17:53:00 UTC (rev 27008)
@@ -13,7 +13,7 @@
<p align="right">
<a href="../index.html">< Main Index</a>
-<a href="../cdi/cdi-news-3.2.0.Beta1.html">CDI Tools ></a>
+<a href="../seam/seam-news-3.2.0.Beta2.html">Seam Tools ></a>
</p>
<table border="0" cellpadding="10" cellspacing="0" width="80%">
<tr>
14 years, 1 month
- 1
- 0
JBoss Tools SVN: r27007 - in trunk/documentation/whatsnew/as: images and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2010-11-29 12:38:12 -0500 (Mon, 29 Nov 2010)
New Revision: 27007
Added:
trunk/documentation/whatsnew/as/images/rse_test_config.png
Modified:
trunk/documentation/whatsnew/as/as-news-3.2.0.Beta2.html
Log:
JBIDE-7653 - n&n trunk try 3
Modified: trunk/documentation/whatsnew/as/as-news-3.2.0.Beta2.html
===================================================================
--- trunk/documentation/whatsnew/as/as-news-3.2.0.Beta2.html 2010-11-29 16:59:45 UTC (rev 27006)
+++ trunk/documentation/whatsnew/as/as-news-3.2.0.Beta2.html 2010-11-29 17:38:12 UTC (rev 27007)
@@ -16,7 +16,7 @@
<tr>
<td colspan="2">
<hr/>
- <h3>Server</h3>
+ <h3>Remote System Support Improvements</h3>
<hr/>
</td>
</tr>
@@ -24,20 +24,75 @@
<tr>
<td valign="top" align="left">
<p align="right">
- <b>Remote System Support Improvements</b></td>
+ <b>Remote Server Status</b></td>
<td valign="top" width="90%">
<p>
- Startup of a remote server will now first check if it's already started. Many issues with workspace locking and uncancelable jobs have been found and fixed for startup and shutdown of remote servers. The RSE composites have been added to the new server wizard, to allow earlier configuration by the user. Methods to add additional hosts, or browse for folders, have also been added for convenience. Remote deployment scanner is also started and stopped during publishes, to prevent partial deployments.
+ Startup of a remote server will now first check if it's already started. Previous behaviour was to always try to start a new server, but if the user had externally started the remote server, this could cause errors. The tooling will now attempt to verify the state of the remote server before launching a new one.
</p>
+ <p><small>Related Jiras:
+ <a href="https://jira.jboss.org/jira/browse/JBIDE-7188">1</a>
+ <a href="https://jira.jboss.org/jira/browse/JBIDE-7251">2</a>
+ </small></p>
+ </td>
+ </tr>
+ <tr><td colspan="2"><hr /></td></tr>
+
+ <tr>
+ <td valign="top" align="left">
+ <p align="right">
+ <b>Remote Server Uncancelable Jobs</b></td>
+ <td valign="top" width="90%">
+ <p>
+ Work was put into properly canceling startup and shutdown jobs to prevent uncancelable jobs blocking the workspace and decreasing usability. Previous behavior for launching remote servers often left the workbench in an unusable state, where the server state was not marked as 'started' and several uncancelable jobs remained in the progress view, potentially blocking other tasks and becoming confusing for the user.
+ </p>
+ <p><small>Related Jiras:
+ <a href="https://jira.jboss.org/jira/browse/JBIDE-7579">1</a>
+ </small></p>
+ </td>
+ </tr>
+ <tr><td colspan="2"><hr /></td></tr>
+ <tr>
+ <td valign="top" align="left">
+ <p align="right">
+ <b>Remote Servers now manage DeploymentScanner</b></td>
+ <td valign="top" width="90%">
+ <p>
+ The remote deployment scanner will now be stopped before publishes, and resumed after. This will prevent partial deployments being picked up by the server.
+ </p>
+ <p><small>Related Jiras:
+ <a href="https://jira.jboss.org/jira/browse/JBIDE-7191">1</a>
+ </small></p>
+ </td>
+ </tr>
+ <tr><td colspan="2"><hr /></td></tr>
+ <tr>
+ <td valign="top" align="left">
+ <p align="right">
+ <b>MBean Server Connection for remote servers spun off into a job</b></td>
+ <td valign="top" width="90%">
+ <p>
+ Remote JMX commands occasionally stall if the remote server's JMX is not exposed. This previously would prevent the server's state to switch to starting, or at least delay it significantly. It has now been spun off into its own job to ensure it is cancelable and does not block other workspace activity, specifically the completion of marking the server state to started.
+ </p>
+ <p><small>Related Jiras:
+ <a href="https://jira.jboss.org/jira/browse/JBIDE-7608">1</a>
+ </small></p>
+ </td>
+ </tr>
+ <tr><td colspan="2"><hr /></td></tr>
+ <tr>
+ <td valign="top" align="left">
+ <p align="right">
+ <b>RSE UI added to new server wizard</b></td>
+ <td valign="top" width="90%">
+ <p>
+
+The RSE composites have been added to the new server wizard and editor, to allow earlier configuration by the user. Methods to add additional hosts, or browse for folders, have also been added for convenience.
+ </p>
+ <img src="images/rse_test_config.png"/>
<p></p>
- <p><small>
- <a href="https://jira.jboss.org/jira/browse/JBIDE-7608">remote startup checks remote status</a><br/>
- <a href="https://jira.jboss.org/jira/browse/JBIDE-7188">remote startup checks remote status</a><br/>
- <a href="https://jira.jboss.org/jira/browse/JBIDE-7251">remote startup checks remote status</a><br/>
- <a href="https://jira.jboss.org/jira/browse/JBIDE-7579">uncancelable startup / shutdown jobs</a><br/>
- <a href="https://jira.jboss.org/jira/browse/JBIDE-7221">rse composite added to new server wizard</a><br/>
- <a href="https://jira.jboss.org/jira/browse/JBIDE-7018">browse remote folders / new hosts</a><br/>
- <a href="https://jira.jboss.org/jira/browse/JBIDE-7191">remote deployment scanner start / stop</a><br/>
+ <p><small>Related Jiras:
+ <a href="https://jira.jboss.org/jira/browse/JBIDE-7221">1</a>
+ <a href="https://jira.jboss.org/jira/browse/JBIDE-7018">2</a><br/>
</small></p>
</td>
</tr>
@@ -45,17 +100,18 @@
<tr>
<td colspan="2">
<hr/>
+ <h3>Deployable Changes</h3>
+ <hr/>
</td>
</tr>
-
<tr>
<td valign="top" align="left">
<p align="right">
- <b>Single Folder deployment</b></td>
+ <b>Single Folder Deployment</b></td>
<td valign="top">
<p> While previously you could only mark single files as deployable, now you can do the same with folders! Woohoo! They can also be marked as zipped, but at this point, renaming the output archive is not yet possible. </p>
<p></p>
- <p><small><a href="https://jira.jboss.org/jira/browse/JBIDE-7324">Make deployable for directories</a><br/>
+ <p><small><a href="https://jira.jboss.org/jira/browse/JBIDE-7324">related jira</a><br/>
</td>
</tr>
Added: trunk/documentation/whatsnew/as/images/rse_test_config.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/as/images/rse_test_config.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
14 years, 1 month
- 1
- 0
JBoss Tools SVN: r27006 - trunk/documentation/whatsnew/as.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2010-11-29 11:59:45 -0500 (Mon, 29 Nov 2010)
New Revision: 27006
Added:
trunk/documentation/whatsnew/as/as-news-3.2.0.Beta2.html
Log:
JBIDE-7653 - n&n
Added: trunk/documentation/whatsnew/as/as-news-3.2.0.Beta2.html
===================================================================
--- trunk/documentation/whatsnew/as/as-news-3.2.0.Beta2.html (rev 0)
+++ trunk/documentation/whatsnew/as/as-news-3.2.0.Beta2.html 2010-11-29 16:59:45 UTC (rev 27006)
@@ -0,0 +1,74 @@
+<html>
+
+<head>
+<link rel="stylesheet" href="../whatsnew.css">
+<title>JBoss AS Tools 3.2.0.Beta2 News</title>
+</head>
+
+<body>
+
+<h1>JBoss AS Tools 3.2.0.Beta2 - New and Noteworthy</h1>
+
+ <p align="right"><a href="../index.html">< Main Index</a> <a href="../hibernate/hibernate-news-3.4.0.Beta2.html">Hibernate Tools ></a></p>
+
+<table border="0" cellpadding="10" cellspacing="0" width="80%">
+
+ <tr>
+ <td colspan="2">
+ <hr/>
+ <h3>Server</h3>
+ <hr/>
+ </td>
+ </tr>
+
+ <tr>
+ <td valign="top" align="left">
+ <p align="right">
+ <b>Remote System Support Improvements</b></td>
+ <td valign="top" width="90%">
+ <p>
+ Startup of a remote server will now first check if it's already started. Many issues with workspace locking and uncancelable jobs have been found and fixed for startup and shutdown of remote servers. The RSE composites have been added to the new server wizard, to allow earlier configuration by the user. Methods to add additional hosts, or browse for folders, have also been added for convenience. Remote deployment scanner is also started and stopped during publishes, to prevent partial deployments.
+ </p>
+ <p></p>
+ <p><small>
+ <a href="https://jira.jboss.org/jira/browse/JBIDE-7608">remote startup checks remote status</a><br/>
+ <a href="https://jira.jboss.org/jira/browse/JBIDE-7188">remote startup checks remote status</a><br/>
+ <a href="https://jira.jboss.org/jira/browse/JBIDE-7251">remote startup checks remote status</a><br/>
+ <a href="https://jira.jboss.org/jira/browse/JBIDE-7579">uncancelable startup / shutdown jobs</a><br/>
+ <a href="https://jira.jboss.org/jira/browse/JBIDE-7221">rse composite added to new server wizard</a><br/>
+ <a href="https://jira.jboss.org/jira/browse/JBIDE-7018">browse remote folders / new hosts</a><br/>
+ <a href="https://jira.jboss.org/jira/browse/JBIDE-7191">remote deployment scanner start / stop</a><br/>
+ </small></p>
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2">
+ <hr/>
+ </td>
+ </tr>
+
+ <tr>
+ <td valign="top" align="left">
+ <p align="right">
+ <b>Single Folder deployment</b></td>
+ <td valign="top">
+ <p> While previously you could only mark single files as deployable, now you can do the same with folders! Woohoo! They can also be marked as zipped, but at this point, renaming the output archive is not yet possible. </p>
+ <p></p>
+ <p><small><a href="https://jira.jboss.org/jira/browse/JBIDE-7324">Make deployable for directories</a><br/>
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2">
+ <hr/>
+ </td>
+ </tr>
+
+</table>
+
+</body>
+
+</html>
+
+
14 years, 1 month
- 1
- 0
JBoss Tools SVN: r27005 - in trunk/cdi: plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-11-29 11:48:35 -0500 (Mon, 29 Nov 2010)
New Revision: 27005
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBean.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IParametedType.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IScope.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/EventBean.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ParametedType.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerField.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerMethod.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ScopeElement.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIValidationMessages.java
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.ui/src/org/jboss/tools/cdi/ui/preferences/CDIConfigurationBlock.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/unproxyable/InjectionPointBean_Broken.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DeploymentProblemsValidationTests.java
Log:
https://jira.jboss.org/browse/JBIDE-6575 - Implemented: 5.4.1. Unproxyable bean types
- If an injection point whose declared type cannot be proxied by the container resolves to a bean with a normal scope,
the container automatically detects the problem and treats it as a deployment problem.
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBean.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBean.java 2010-11-29 16:44:15 UTC (rev 27004)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBean.java 2010-11-29 16:48:35 UTC (rev 27005)
@@ -64,6 +64,15 @@
Set<IParametedType> getAllTypes();
/**
+ * Returns the text representation of this bean.
+ * If the bean is IClassBean then the method will return the simple name of the class of the bean.
+ * If the bean is IProducerField then the method will return the simple name of the type of the field.
+ * If the bean is IProducerMethod then the method will return the simple name of the return type of the producer method.
+ * @return the text representation of this bean.
+ */
+ String getSimpleJavaName();
+
+ /**
* Obtains all the type declarations of the bean class or producer method or
* field (legal types as well as illegal ones).
*
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IParametedType.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IParametedType.java 2010-11-29 16:44:15 UTC (rev 27004)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IParametedType.java 2010-11-29 16:48:35 UTC (rev 27005)
@@ -44,6 +44,14 @@
boolean isPrimitive();
/**
+ * Returns the simple name of the type. In case of IType this method will return the short name of the type.
+ * If this type is primitive then the method will return the name of the primitive type.
+ *
+ * @return the simple name of the type.
+ */
+ String getSimpleName();
+
+ /**
* Returns type parameters
*
* @return type parameters
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IScope.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IScope.java 2010-11-29 16:44:15 UTC (rev 27004)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IScope.java 2010-11-29 16:48:35 UTC (rev 27005)
@@ -11,10 +11,16 @@
package org.jboss.tools.cdi.core;
/**
- * Represents an interceptor binding type.
+ * Represents a scope type.
*
* @author Viacheslav Kabanovich
*/
public interface IScope extends ICDIAnnotation {
-}
+ /**
+ * Returns true if the scope is a normal scope.
+ *
+ * @return
+ */
+ boolean isNorlmalScope();
+}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java 2010-11-29 16:44:15 UTC (rev 27004)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java 2010-11-29 16:48:35 UTC (rev 27005)
@@ -524,4 +524,12 @@
result.addAll(methods);
return result;
}
+
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.cdi.core.IBean#getSimpleJavaName()
+ */
+ public String getSimpleJavaName() {
+ return this.getBeanClass().getElementName();
+ }
}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/EventBean.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/EventBean.java 2010-11-29 16:44:15 UTC (rev 27004)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/EventBean.java 2010-11-29 16:48:35 UTC (rev 27005)
@@ -171,4 +171,14 @@
return false;
}
-}
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.cdi.core.IBean#getSimpleJavaName()
+ */
+ public String getSimpleJavaName() {
+ if(type!=null) {
+ return type.getSimpleName();
+ }
+ return "";
+ }
+}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ParametedType.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ParametedType.java 2010-11-29 16:44:15 UTC (rev 27004)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ParametedType.java 2010-11-29 16:48:35 UTC (rev 27005)
@@ -11,10 +11,11 @@
package org.jboss.tools.cdi.internal.core.impl;
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 java.util.StringTokenizer;
import org.eclipse.jdt.core.ISourceRange;
import org.eclipse.jdt.core.IType;
@@ -356,4 +357,25 @@
return true;
}
-}
+ static Map<String, String> primitives = new HashMap<String, String>();
+ static {
+ primitives.put("Integer", "int");
+ primitives.put("Short", "short");
+ primitives.put("Long", "long");
+ primitives.put("Character", "char");
+ primitives.put("Float", "float");
+ primitives.put("Double", "double");
+ primitives.put("Boolean", "boolean");
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.cdi.core.IParametedType#getSimpleName()
+ */
+ public String getSimpleName() {
+ if(getSignature()!=null) {
+ return isPrimitive()?primitives.get(Signature.getSignatureSimpleName(getSignature())):Signature.getSignatureSimpleName(getSignature());
+ }
+ return "";
+ }
+}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerField.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerField.java 2010-11-29 16:44:15 UTC (rev 27004)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerField.java 2010-11-29 16:48:35 UTC (rev 27005)
@@ -206,4 +206,11 @@
return false;
}
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.cdi.core.IBean#getSimpleJavaName()
+ */
+ public String getSimpleJavaName() {
+ return getBeanClass().getElementName() + "." + getField().getElementName();
+ }
}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerMethod.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerMethod.java 2010-11-29 16:44:15 UTC (rev 27004)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerMethod.java 2010-11-29 16:48:35 UTC (rev 27005)
@@ -259,4 +259,11 @@
return false;
}
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.cdi.core.IBean#getSimpleJavaName()
+ */
+ public String getSimpleJavaName() {
+ return getBeanClass().getElementName() + "." + getMethod().getElementName() + "()"; //$NON-NLS-1$
+ }
}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ScopeElement.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ScopeElement.java 2010-11-29 16:44:15 UTC (rev 27004)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ScopeElement.java 2010-11-29 16:48:35 UTC (rev 27005)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.tools.cdi.internal.core.impl;
+import org.jboss.tools.cdi.core.CDIConstants;
import org.jboss.tools.cdi.core.IScope;
/**
@@ -21,4 +22,11 @@
public ScopeElement() {}
-}
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.cdi.core.IScope#isNorlmalScope()
+ */
+ public boolean isNorlmalScope() {
+ return getAnnotationDeclaration(CDIConstants.NORMAL_SCOPE_ANNOTATION_TYPE_NAME)!=null;
+ }
+}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2010-11-29 16:44:15 UTC (rev 27004)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2010-11-29 16:48:35 UTC (rev 27005)
@@ -1232,6 +1232,47 @@
} else if(bean instanceof IInterceptor) {
addError(CDIValidationMessages.INJECTED_INTERCEPTOR, CDIPreferences.INJECTED_INTERCEPTOR, reference, injection.getResource());
}
+ /*
+ * 5.4.1. Unproxyable bean types
+ * - If an injection point whose declared type cannot be proxied by the container resolves to a bean with a normal scope,
+ * the container automatically detects the problem and treats it as a deployment problem.
+ */
+ if(bean.getScope().isNorlmalScope() && injection.getType()!=null) {
+ // - Array types cannot be proxied by the container.
+ String typeSignature = injection.getType().getSignature();
+ int kind = Signature.getTypeSignatureKind(typeSignature);
+ if(kind == Signature.ARRAY_TYPE_SIGNATURE) {
+ addError(MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_ARRAY_TYPE, injection.getType().getSimpleName(), bean.getSimpleJavaName()), CDIPreferences.UNPROXYABLE_BEAN_TYPE, reference, injection.getResource());
+ } else if(injection.getType().isPrimitive()) {
+ // - Primitive types cannot be proxied by the container.
+ addError(MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_PRIMITIVE_TYPE, injection.getType().getSimpleName(), bean.getSimpleJavaName()), CDIPreferences.UNPROXYABLE_BEAN_TYPE, reference, injection.getResource());
+ } else if(bean instanceof IClassBean) {
+ try {
+ if(Flags.isFinal(bean.getBeanClass().getFlags())) {
+ // - Classes which are declared final cannot be proxied by the container.
+ addError(MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_FINAL_TYPE, injection.getType().getSimpleName(), bean.getSimpleJavaName()), CDIPreferences.UNPROXYABLE_BEAN_TYPE, reference, injection.getResource());
+ } else {
+ IMethod[] methods = bean.getBeanClass().getMethods();
+ boolean hasDefaultConstructor = false;
+ for (IMethod method : methods) {
+ hasDefaultConstructor = hasDefaultConstructor || (method.isConstructor() && !Flags.isPrivate(method.getFlags()) && method.getParameterNames().length==0);
+ if(Flags.isFinal(method.getFlags())) {
+ // - Classes which have final methods cannot be proxied by the container.
+ addError(MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_TYPE_WITH_FM, injection.getType().getSimpleName(), bean.getSimpleJavaName()), CDIPreferences.UNPROXYABLE_BEAN_TYPE, reference, injection.getResource());
+ hasDefaultConstructor = true;
+ break;
+ }
+ }
+ if(!hasDefaultConstructor) {
+ // - Classes which don't have a non-private constructor with no parameters cannot be proxied by the container.
+ addError(MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_TYPE_WITH_NPC, injection.getType().getSimpleName(), bean.getSimpleJavaName()), CDIPreferences.UNPROXYABLE_BEAN_TYPE, reference, injection.getResource());
+ }
+ }
+ } catch (JavaModelException e) {
+ CDICorePlugin.getDefault().logError(e);
+ }
+ }
+ }
}
/*
* 5.5.7. Injection point metadata
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIValidationMessages.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIValidationMessages.java 2010-11-29 16:44:15 UTC (rev 27004)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIValidationMessages.java 2010-11-29 16:48:35 UTC (rev 27005)
@@ -27,7 +27,11 @@
public static String UNSATISFIED_INJECTION_POINTS;
public static String AMBIGUOUS_INJECTION_POINTS;
- public static String UNPROXYABLE_BEAN_TYPE;
+ public static String UNPROXYABLE_BEAN_ARRAY_TYPE;
+ public static String UNPROXYABLE_BEAN_PRIMITIVE_TYPE;
+ public static String UNPROXYABLE_BEAN_TYPE_WITH_NPC;
+ public static String UNPROXYABLE_BEAN_FINAL_TYPE;
+ public static String UNPROXYABLE_BEAN_TYPE_WITH_FM;
public static String ILLEGAL_TYPE_IN_TYPED_DECLARATION;
public static String ILLEGAL_TYPE_IN_TYPED_DECLARATION_IN_BEAN_CLASS;
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 2010-11-29 16:44:15 UTC (rev 27004)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/messages.properties 2010-11-29 16:48:35 UTC (rev 27005)
@@ -6,7 +6,11 @@
UNSATISFIED_INJECTION_POINTS=No bean is eligible for injection to the injection point
AMBIGUOUS_INJECTION_POINTS=Multiple beans are eligible for injection to the injection point
-UNPROXYABLE_BEAN_TYPE=Injection point declares a type {0} that cannot be proxied by the container resolves to a bean {1} with a normal scope [JSR-299 �5.4.1]
+UNPROXYABLE_BEAN_ARRAY_TYPE=Injection point declares an array type {0} that cannot be proxied by the container resolves to a bean {1} with a normal scope [JSR-299 �5.4.1]
+UNPROXYABLE_BEAN_PRIMITIVE_TYPE=Injection point declares a primitive type {0} that cannot be proxied by the container resolves to a bean {1} with a normal scope [JSR-299 �5.4.1]
+UNPROXYABLE_BEAN_TYPE_WITH_NPC=Injection point declares a class {0} with a non-private constructor with no parameters (such a class cannot be proxied by the container) resolves to a bean {1} with a normal scope [JSR-299 �5.4.1]
+UNPROXYABLE_BEAN_FINAL_TYPE=Injection point declares a final class {0} that cannot be proxied by the container resolves to a bean {1} with a normal scope [JSR-299 �5.4.1]
+UNPROXYABLE_BEAN_TYPE_WITH_FM=Injection point declares a class {0} with final methods (such a class cannot be proxied by the container) resolves to a bean {1} with a normal scope [JSR-299 �5.4.1]
ILLEGAL_TYPE_IN_TYPED_DECLARATION=Bean specifies a @Typed annotation, and the value member specifies a class which does not correspond to a type in the unrestricted set of bean types of a bean [JSR-299 �2.2.2]
ILLEGAL_TYPE_IN_TYPED_DECLARATION_IN_BEAN_CLASS=Bean class specifies a @Typed annotation, and the value member specifies a class which does not correspond to a type in the unrestricted set of bean types of a bean [JSR-299 �2.2.2]
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIConfigurationBlock.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIConfigurationBlock.java 2010-11-29 16:44:15 UTC (rev 27004)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIConfigurationBlock.java 2010-11-29 16:48:35 UTC (rev 27005)
@@ -45,7 +45,7 @@
new String[][]{
{CDIPreferences.UNSATISFIED_INJECTION_POINTS, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_unsatisfiedInjectionPoints_label},
{CDIPreferences.AMBIGUOUS_INJECTION_POINTS, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_ambiguousInjectionPoints_label},
-// {CDIPreferences.UNPROXYABLE_BEAN_TYPE, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_unproxyableBeanType_label},
+ {CDIPreferences.UNPROXYABLE_BEAN_TYPE, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_unproxyableBeanType_label},
{CDIPreferences.ILLEGAL_TYPE_IN_TYPED_DECLARATION, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_illegalTypeInTypedDeclaration_label},
{CDIPreferences.PRODUCER_METHOD_RETURN_TYPE_HAS_WILDCARD, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_producerMethodReturnTypeHasWildcard_label},
{CDIPreferences.PRODUCER_METHOD_RETURN_TYPE_IS_VARIABLE, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_producerMethodReturnTypeIsVariable_label},
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/unproxyable/InjectionPointBean_Broken.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/unproxyable/InjectionPointBean_Broken.java 2010-11-29 16:44:15 UTC (rev 27004)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/unproxyable/InjectionPointBean_Broken.java 2010-11-29 16:48:35 UTC (rev 27005)
@@ -5,5 +5,5 @@
public class InjectionPointBean_Broken {
@Inject TestType[] arrayBroken;
@Inject TestType arrayOk;
- @Inject @TestQualifier TestType[] arrayBroken2;
+ @Inject @TestQualifier TestType[] arrayOk2;
}
\ No newline at end of file
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DeploymentProblemsValidationTests.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DeploymentProblemsValidationTests.java 2010-11-29 16:44:15 UTC (rev 27004)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DeploymentProblemsValidationTests.java 2010-11-29 16:48:35 UTC (rev 27005)
@@ -72,11 +72,11 @@
*
* @throws Exception
*/
- public void _testInjectionPointWithArrayType() throws Exception {
+ public void testInjectionPointWithArrayType() throws Exception {
IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/unproxyable/InjectionPointBean_Broken.java");
- assertMarkerIsCreated(file, MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_TYPE, "TestType[]", "ArrayProducer.produce()"), 6);
- assertMarkerIsCreated(file, MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_TYPE, "TestType[]", "ArrayProducer.produce2()"), 8);
- assertMarkerIsNotCreated(file, MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_TYPE, "TestType", "TestType"), 7);
+ assertMarkerIsCreated(file, MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_ARRAY_TYPE, "TestType[]", "ArrayProducer.produce()"), 6);
+ assertMarkerIsNotCreated(file, MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_ARRAY_TYPE, "TestType", "TestType"), 7);
+ assertMarkerIsNotCreated(file, MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_ARRAY_TYPE, "TestType[]", "ArrayProducer.produce2()"), 8);
}
/**
@@ -87,12 +87,12 @@
*
* @throws Exception
*/
- public void _testInjectionPointWithUnproxyableTypeWhichResolvesToNormalScopedBean() throws Exception {
+ public void testInjectionPointWithUnproxyableTypeWhichResolvesToNormalScopedBean() throws Exception {
IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/unproxyable/Number_Broken.java");
- assertMarkerIsCreated(file, MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_TYPE, "int", "NumberProducer.produce()"), 9);
- assertMarkerIsCreated(file, MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_TYPE, "long", "NumberProducer.foo"), 13);
- assertMarkerIsNotCreated(file, MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_TYPE, "Short", "NumberProducer.foo2"), 17);
- assertMarkerIsNotCreated(file, MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_TYPE, "boolean", "NumberProducer.foo3"), 21);
+ assertMarkerIsCreated(file, MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_PRIMITIVE_TYPE, "int", "NumberProducer.produce()"), 9);
+ assertMarkerIsCreated(file, MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_PRIMITIVE_TYPE, "long", "NumberProducer.foo"), 13);
+ assertMarkerIsNotCreated(file, MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_PRIMITIVE_TYPE, "Short", "NumberProducer.foo2"), 17);
+ assertMarkerIsNotCreated(file, MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_PRIMITIVE_TYPE, "boolean", "NumberProducer.foo3"), 21);
}
/**
@@ -103,9 +103,9 @@
*
* @throws Exception
*/
- public void _testClassWithPrivateConstructor() throws Exception {
+ public void testClassWithPrivateConstructor() throws Exception {
IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/privateConstructor/InjectionPointBean.java");
- assertMarkerIsCreated(file, MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_TYPE, "Unproxyable_Broken", "Unproxyable_Broken"), 23);
+ assertMarkerIsCreated(file, MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_TYPE_WITH_NPC, "Unproxyable_Broken", "Unproxyable_Broken"), 23);
}
/**
@@ -116,9 +116,9 @@
*
* @throws Exception
*/
- public void _testInjectionPointWhichResolvesToNormalScopedFinalBean() throws Exception {
+ public void testInjectionPointWhichResolvesToNormalScopedFinalBean() throws Exception {
IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/finalClass/FishFarm.java");
- assertMarkerIsCreated(file, MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_TYPE, "Tuna_Broken", "Tuna_Broken"), 24);
+ assertMarkerIsCreated(file, MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_FINAL_TYPE, "Tuna_Broken", "Tuna_Broken"), 24);
}
/**
@@ -129,8 +129,8 @@
*
* @throws Exception
*/
- public void _testClassWithFinalMethodCannotBeProxied() throws Exception {
+ public void testClassWithFinalMethodCannotBeProxied() throws Exception {
IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/finalMethod/FishFarm.java");
- assertMarkerIsCreated(file, MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_TYPE, "Tuna_Broken", "Tuna_Broken"), 23);
+ assertMarkerIsCreated(file, MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_TYPE_WITH_FM, "Tuna_Broken", "Tuna_Broken"), 23);
}
}
\ No newline at end of file
14 years, 1 month
- 1
- 0
JBoss Tools SVN: r27004 - branches/jbosstools-3.2.0.Beta2/documentation/whatsnew/as.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2010-11-29 11:44:15 -0500 (Mon, 29 Nov 2010)
New Revision: 27004
Added:
branches/jbosstools-3.2.0.Beta2/documentation/whatsnew/as/as-news-3.2.0.Beta2.html
Log:
JBIDE-7653 - n&n
Added: branches/jbosstools-3.2.0.Beta2/documentation/whatsnew/as/as-news-3.2.0.Beta2.html
===================================================================
--- branches/jbosstools-3.2.0.Beta2/documentation/whatsnew/as/as-news-3.2.0.Beta2.html (rev 0)
+++ branches/jbosstools-3.2.0.Beta2/documentation/whatsnew/as/as-news-3.2.0.Beta2.html 2010-11-29 16:44:15 UTC (rev 27004)
@@ -0,0 +1,74 @@
+<html>
+
+<head>
+<link rel="stylesheet" href="../whatsnew.css">
+<title>JBoss AS Tools 3.2.0.Beta2 News</title>
+</head>
+
+<body>
+
+<h1>JBoss AS Tools 3.2.0.Beta2 - New and Noteworthy</h1>
+
+ <p align="right"><a href="../index.html">< Main Index</a> <a href="../hibernate/hibernate-news-3.4.0.Beta2.html">Hibernate Tools ></a></p>
+
+<table border="0" cellpadding="10" cellspacing="0" width="80%">
+
+ <tr>
+ <td colspan="2">
+ <hr/>
+ <h3>Server</h3>
+ <hr/>
+ </td>
+ </tr>
+
+ <tr>
+ <td valign="top" align="left">
+ <p align="right">
+ <b>Remote System Support Improvements</b></td>
+ <td valign="top" width="90%">
+ <p>
+ Startup of a remote server will now first check if it's already started. Many issues with workspace locking and uncancelable jobs have been found and fixed for startup and shutdown of remote servers. The RSE composites have been added to the new server wizard, to allow earlier configuration by the user. Methods to add additional hosts, or browse for folders, have also been added for convenience. Remote deployment scanner is also started and stopped during publishes, to prevent partial deployments.
+ </p>
+ <p></p>
+ <p><small>
+ <a href="https://jira.jboss.org/jira/browse/JBIDE-7608">remote startup checks remote status</a><br/>
+ <a href="https://jira.jboss.org/jira/browse/JBIDE-7188">remote startup checks remote status</a><br/>
+ <a href="https://jira.jboss.org/jira/browse/JBIDE-7251">remote startup checks remote status</a><br/>
+ <a href="https://jira.jboss.org/jira/browse/JBIDE-7579">uncancelable startup / shutdown jobs</a><br/>
+ <a href="https://jira.jboss.org/jira/browse/JBIDE-7221">rse composite added to new server wizard</a><br/>
+ <a href="https://jira.jboss.org/jira/browse/JBIDE-7018">browse remote folders / new hosts</a><br/>
+ <a href="https://jira.jboss.org/jira/browse/JBIDE-7191">remote deployment scanner start / stop</a><br/>
+ </small></p>
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2">
+ <hr/>
+ </td>
+ </tr>
+
+ <tr>
+ <td valign="top" align="left">
+ <p align="right">
+ <b>Single Folder deployment</b></td>
+ <td valign="top">
+ <p> While previously you could only mark single files as deployable, now you can do the same with folders! Woohoo! They can also be marked as zipped, but at this point, renaming the output archive is not yet possible. </p>
+ <p></p>
+ <p><small><a href="https://jira.jboss.org/jira/browse/JBIDE-7324">Make deployable for directories</a><br/>
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2">
+ <hr/>
+ </td>
+ </tr>
+
+</table>
+
+</body>
+
+</html>
+
+
14 years, 1 month
- 1
- 0
JBoss Tools SVN: r27003 - in branches/jbosstools-3.2.0.Beta2/hibernatetools: tests/org.hibernate.eclipse.console.test/res/project and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: vyemialyanchyk
Date: 2010-11-29 11:42:35 -0500 (Mon, 29 Nov 2010)
New Revision: 27003
Added:
branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_all_exporters_external.launch
branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_all_exporters_internal.launch
branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_external.launch
branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_internal.launch
Removed:
branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg.launch
Modified:
branches/jbosstools-3.2.0.Beta2/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleConfiguration.java
branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project/testLaunchCfg_0.launch
branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project/testLaunchCfg_1.launch
branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/CodeGenExternalProcessExecutionTest.java
branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/project/LaunchConfigTestProject2.java
branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/project/TestProject.java
Log:
https://jira.jboss.org/browse/JBIDE-7746 - try to fix issue for linux test env. - fix for beta2 branch
Modified: branches/jbosstools-3.2.0.Beta2/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleConfiguration.java
===================================================================
--- branches/jbosstools-3.2.0.Beta2/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleConfiguration.java 2010-11-29 16:39:19 UTC (rev 27002)
+++ branches/jbosstools-3.2.0.Beta2/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleConfiguration.java 2010-11-29 16:42:35 UTC (rev 27003)
@@ -84,7 +84,8 @@
configuration = null;
res = true;
}
- res = res || closeSessionFactory();
+ boolean tmp = closeSessionFactory();
+ res = res || tmp;
if (executionContext != null) {
executionContext.execute(new Command() {
public Object execute() {
@@ -104,7 +105,8 @@
fakeDrivers.clear();
res = true;
}
- res = res || cleanUpClassLoader();
+ tmp = cleanUpClassLoader();
+ res = res || tmp;
if (res) {
fireConfigurationReset();
}
Modified: branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project/testLaunchCfg_0.launch
===================================================================
--- branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project/testLaunchCfg_0.launch 2010-11-29 16:39:19 UTC (rev 27002)
+++ branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project/testLaunchCfg_0.launch 2010-11-29 16:42:35 UTC (rev 27003)
@@ -9,9 +9,9 @@
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.hibernate.codegen.CodeGenMain"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="..../AppData/Local/Temp/codegenbuildxml/4fbe6bbb-9013-4ef2-8175-5b13f714ae00/build.xml"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="qwert"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-cp ....\hibernate_eclipse_plugins_short\z-codegen\target\org.hibernate.codegen-1.0.0.GA.jar"/>
-<stringAttribute key="org.hibernate.tools.buildXml" value="\qwert\target\build.xml"/>
-<stringAttribute key="org.hibernate.tools.codeGenLaunchJar" value="....\trunk\hibernatetools\plugins\org.hibernate.eclipse\lib\extern\org.hibernate.codegen.jar"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-cp ..../hibernate_eclipse_plugins_short/z-codegen/target/org.hibernate.codegen-1.0.0.GA.jar"/>
+<stringAttribute key="org.hibernate.tools.buildXml" value="/qwert/target/build.xml"/>
+<stringAttribute key="org.hibernate.tools.codeGenLaunchJar" value="..../trunk/hibernatetools/plugins/org.hibernate.eclipse/lib/extern/org.hibernate.codegen.jar"/>
<stringAttribute key="org.hibernate.tools.configurationname" value="qwert"/>
<booleanAttribute key="org.hibernate.tools.ejb3" value="true"/>
<listAttribute key="org.hibernate.tools.exporters">
@@ -48,39 +48,39 @@
<mapAttribute key="org.hibernate.tools.exporters.8.properties">
<mapEntry key="file_pattern" value="{package-name}/{class-name}.java"/>
<mapEntry key="for_each" value="11111111111111"/>
-<mapEntry key="outputdir" value="\LaunchConfigTestProject\temp_test_out_folder"/>
+<mapEntry key="outputdir" value="/LaunchConfigTestProject/temp_test_out_folder"/>
<mapEntry key="template_name" value="pojo/Pojo.ftl"/>
-<mapEntry key="template_path" value="\LaunchConfigTestProject\temp_test_out_folder"/>
+<mapEntry key="template_path" value="/LaunchConfigTestProject/temp_test_out_folder"/>
</mapAttribute>
<booleanAttribute key="org.hibernate.tools.exporters.9" value="true"/>
<stringAttribute key="org.hibernate.tools.exporters.9.extension_id" value="org.hibernate.tools.hbm2dao"/>
<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2cfgxml" value="true"/>
<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2cfgxml.extension_id" value="org.hibernate.tools.hbm2cfgxml"/>
<mapAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2cfgxml.properties">
-<mapEntry key="outputdir" value="\LaunchConfigTestProject\temp_test_out_folder"/>
+<mapEntry key="outputdir" value="/LaunchConfigTestProject/temp_test_out_folder"/>
</mapAttribute>
<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2dao" value="true"/>
<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2dao.extension_id" value="org.hibernate.tools.hbm2dao"/>
<mapAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2dao.properties">
-<mapEntry key="outputdir" value="\LaunchConfigTestProject\temp_test_out_folder"/>
+<mapEntry key="outputdir" value="/LaunchConfigTestProject/temp_test_out_folder"/>
</mapAttribute>
<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2ddl" value="true"/>
<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2ddl.extension_id" value="org.hibernate.tools.hbm2ddl"/>
<mapAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2ddl.properties">
<mapEntry key="outputFileName" value="schema.sql"/>
-<mapEntry key="outputdir" value="\LaunchConfigTestProject\temp_test_out_folder"/>
+<mapEntry key="outputdir" value="/LaunchConfigTestProject/temp_test_out_folder"/>
<mapEntry key="schemaUpdate" value="true"/>
<mapEntry key="scriptToConsole" value="true"/>
</mapAttribute>
<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2doc" value="true"/>
<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2doc.extension_id" value="org.hibernate.tools.hbm2doc"/>
<mapAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2doc.properties">
-<mapEntry key="outputdir" value="\LaunchConfigTestProject\temp_test_out_folder"/>
+<mapEntry key="outputdir" value="/LaunchConfigTestProject/temp_test_out_folder"/>
</mapAttribute>
<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2hbmxml" value="true"/>
<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2hbmxml.extension_id" value="org.hibernate.tools.hbm2hbmxml"/>
<mapAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2hbmxml.properties">
-<mapEntry key="outputdir" value="\LaunchConfigTestProject\temp_test_out_folder"/>
+<mapEntry key="outputdir" value="/LaunchConfigTestProject/temp_test_out_folder"/>
</mapAttribute>
<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2java" value="true"/>
<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2java.extension_id" value="org.hibernate.tools.hbm2java"/>
@@ -89,24 +89,24 @@
<mapEntry key="destdir2" value="qw"/>
<mapEntry key="ejb3" value="true"/>
<mapEntry key="jdk5" value="true"/>
-<mapEntry key="outputdir" value="\LaunchConfigTestProject\temp_test_out_folder"/>
+<mapEntry key="outputdir" value="/LaunchConfigTestProject/temp_test_out_folder"/>
</mapAttribute>
<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbmtemplate" value="true"/>
<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbmtemplate.extension_id" value="org.hibernate.tools.hbmtemplate"/>
<mapAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbmtemplate.properties">
<mapEntry key="file_pattern" value="${package-name}/${class-name}.java"/>
<mapEntry key="for_each" value="entity"/>
-<mapEntry key="outputdir" value="\LaunchConfigTestProject\temp_test_out_folder"/>
+<mapEntry key="outputdir" value="/LaunchConfigTestProject/temp_test_out_folder"/>
<mapEntry key="template_name" value="pojo/Pojo.ftl"/>
</mapAttribute>
<booleanAttribute key="org.hibernate.tools.jdk5" value="true"/>
-<stringAttribute key="org.hibernate.tools.outputdir" value="\LaunchConfigTestProject\temp_test_out_folder"/>
+<stringAttribute key="org.hibernate.tools.outputdir" value="/LaunchConfigTestProject/temp_test_out_folder"/>
<stringAttribute key="org.hibernate.tools.package" value="qqqqqqqqqqqqqqqqqqqqqqqqqqqq"/>
<booleanAttribute key="org.hibernate.tools.prefercompositeids" value="true"/>
<booleanAttribute key="org.hibernate.tools.reveng.detect_many_to_many" value="false"/>
<booleanAttribute key="org.hibernate.tools.reveng.detect_one_to_one" value="false"/>
<booleanAttribute key="org.hibernate.tools.reveng.detect_optimistc_lock" value="false"/>
-<stringAttribute key="org.hibernate.tools.revengfile" value="\qwert\src\hibernate.reveng.xml"/>
+<stringAttribute key="org.hibernate.tools.revengfile" value="/qwert/src/hibernate.reveng.xml"/>
<booleanAttribute key="org.hibernate.tools.schema2hbm" value="true"/>
<booleanAttribute key="org.hibernate.tools.useExternalProcess" value="true"/>
<booleanAttribute key="org.hibernate.tools.useOwnTemplates" value="false"/>
Modified: branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project/testLaunchCfg_1.launch
===================================================================
--- branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project/testLaunchCfg_1.launch 2010-11-29 16:39:19 UTC (rev 27002)
+++ branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project/testLaunchCfg_1.launch 2010-11-29 16:42:35 UTC (rev 27003)
@@ -9,9 +9,9 @@
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.hibernate.codegen.CodeGenMain"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="...../AppData/Local/Temp/codegenbuildxml/4fbe6bbb-9013-4ef2-8175-5b13f714ae00/build.xml"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="qwert"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-cp ....\hibernate_eclipse_plugins_short\z-codegen\target\org.hibernate.codegen-1.0.0.GA.jar"/>
-<stringAttribute key="org.hibernate.tools.buildXml" value="\qwert\target\build.xml"/>
-<stringAttribute key="org.hibernate.tools.codeGenLaunchJar" value="....\trunk\hibernatetools\plugins\org.hibernate.eclipse\lib\extern\org.hibernate.codegen.jar"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-cp ..../hibernate_eclipse_plugins_short/z-codegen/target/org.hibernate.codegen-1.0.0.GA.jar"/>
+<stringAttribute key="org.hibernate.tools.buildXml" value="/qwert/target/build.xml"/>
+<stringAttribute key="org.hibernate.tools.codeGenLaunchJar" value="..../trunk/hibernatetools/plugins/org.hibernate.eclipse/lib/extern/org.hibernate.codegen.jar"/>
<stringAttribute key="org.hibernate.tools.configurationname" value="qwert"/>
<booleanAttribute key="org.hibernate.tools.ejb3" value="true"/>
<listAttribute key="org.hibernate.tools.exporters">
@@ -50,37 +50,37 @@
<mapEntry key="for_each" value="11111111111111"/>
<mapEntry key="outputdir" value="temp_test_out_folder"/>
<mapEntry key="template_name" value="pojo/Pojo.ftl"/>
-<mapEntry key="template_path" value="\LaunchConfigTestProject\temp_test_out_folder"/>
+<mapEntry key="template_path" value="/LaunchConfigTestProject/temp_test_out_folder"/>
</mapAttribute>
<booleanAttribute key="org.hibernate.tools.exporters.9" value="true"/>
<stringAttribute key="org.hibernate.tools.exporters.9.extension_id" value="org.hibernate.tools.hbm2dao"/>
<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2cfgxml" value="true"/>
<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2cfgxml.extension_id" value="org.hibernate.tools.hbm2cfgxml"/>
<mapAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2cfgxml.properties">
-<mapEntry key="outputdir" value="\LaunchConfigTestProject\temp_test_out_folder"/>
+<mapEntry key="outputdir" value="/LaunchConfigTestProject/temp_test_out_folder"/>
</mapAttribute>
<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2dao" value="true"/>
<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2dao.extension_id" value="org.hibernate.tools.hbm2dao"/>
<mapAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2dao.properties">
-<mapEntry key="outputdir" value="\LaunchConfigTestProject\temp_test_out_folder"/>
+<mapEntry key="outputdir" value="/LaunchConfigTestProject/temp_test_out_folder"/>
</mapAttribute>
<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2ddl" value="true"/>
<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2ddl.extension_id" value="org.hibernate.tools.hbm2ddl"/>
<mapAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2ddl.properties">
<mapEntry key="outputFileName" value="schema.sql"/>
-<mapEntry key="outputdir" value="\LaunchConfigTestProject\temp_test_out_folder"/>
+<mapEntry key="outputdir" value="/LaunchConfigTestProject/temp_test_out_folder"/>
<mapEntry key="schemaUpdate" value="true"/>
<mapEntry key="scriptToConsole" value="true"/>
</mapAttribute>
<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2doc" value="true"/>
<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2doc.extension_id" value="org.hibernate.tools.hbm2doc"/>
<mapAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2doc.properties">
-<mapEntry key="outputdir" value="\LaunchConfigTestProject\temp_test_out_folder"/>
+<mapEntry key="outputdir" value="/LaunchConfigTestProject/temp_test_out_folder"/>
</mapAttribute>
<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2hbmxml" value="true"/>
<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2hbmxml.extension_id" value="org.hibernate.tools.hbm2hbmxml"/>
<mapAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2hbmxml.properties">
-<mapEntry key="outputdir" value="\LaunchConfigTestProject\temp_test_out_folder"/>
+<mapEntry key="outputdir" value="/LaunchConfigTestProject/temp_test_out_folder"/>
</mapAttribute>
<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2java" value="true"/>
<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2java.extension_id" value="org.hibernate.tools.hbm2java"/>
@@ -89,14 +89,14 @@
<mapEntry key="destdir2" value="qw"/>
<mapEntry key="ejb3" value="true"/>
<mapEntry key="jdk5" value="true"/>
-<mapEntry key="outputdir" value="\LaunchConfigTestProject\temp_test_out_folder"/>
+<mapEntry key="outputdir" value="/LaunchConfigTestProject/temp_test_out_folder"/>
</mapAttribute>
<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbmtemplate" value="true"/>
<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbmtemplate.extension_id" value="org.hibernate.tools.hbmtemplate"/>
<mapAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbmtemplate.properties">
<mapEntry key="file_pattern" value="${package-name}/${class-name}.java"/>
<mapEntry key="for_each" value="entity"/>
-<mapEntry key="outputdir" value="\LaunchConfigTestProject\temp_test_out_folder"/>
+<mapEntry key="outputdir" value="/LaunchConfigTestProject/temp_test_out_folder"/>
<mapEntry key="template_name" value="pojo/Pojo.ftl"/>
</mapAttribute>
<booleanAttribute key="org.hibernate.tools.jdk5" value="true"/>
@@ -106,7 +106,7 @@
<booleanAttribute key="org.hibernate.tools.reveng.detect_many_to_many" value="false"/>
<booleanAttribute key="org.hibernate.tools.reveng.detect_one_to_one" value="false"/>
<booleanAttribute key="org.hibernate.tools.reveng.detect_optimistc_lock" value="false"/>
-<stringAttribute key="org.hibernate.tools.revengfile" value="\qwert\src\hibernate.reveng.xml"/>
+<stringAttribute key="org.hibernate.tools.revengfile" value="/qwert/src/hibernate.reveng.xml"/>
<booleanAttribute key="org.hibernate.tools.schema2hbm" value="true"/>
<booleanAttribute key="org.hibernate.tools.useExternalProcess" value="true"/>
<booleanAttribute key="org.hibernate.tools.useOwnTemplates" value="false"/>
Deleted: branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg.launch
===================================================================
--- branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg.launch 2010-11-29 16:39:19 UTC (rev 27002)
+++ branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg.launch 2010-11-29 16:42:35 UTC (rev 27003)
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.hibernate.eclipse.launch.CodeGenerationLaunchConfigurationType">
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.launching.remote.InternalAntRunner"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="\LaunchConfigTestProject2\build_2794024212908788293xml"/>
-<stringAttribute key="org.hibernate.tools.configurationname" value="LaunchConfigTestProject2"/>
-<booleanAttribute key="org.hibernate.tools.ejb3" value="false"/>
-<listAttribute key="org.hibernate.tools.exporters">
-<listEntry value="org.hibernate.tools.hbm2java"/>
-<listEntry value="org.hibernate.tools.hbm2hbmxml"/>
-<listEntry value="org.hibernate.tools.hbm2dao"/>
-<listEntry value="org.hibernate.tools.hbmtemplate"/>
-<listEntry value="org.hibernate.tools.hbm2cfgxml"/>
-<listEntry value="org.hibernate.tools.hbm2doc"/>
-<listEntry value="org.hibernate.tools.hbm2ddl"/>
-<listEntry value="org.hibernate.tools.query"/>
-</listAttribute>
-<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2cfgxml" value="false"/>
-<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2cfgxml.extension_id" value="org.hibernate.tools.hbm2cfgxml"/>
-<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2dao" value="false"/>
-<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2dao.extension_id" value="org.hibernate.tools.hbm2dao"/>
-<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2ddl" value="false"/>
-<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2ddl.extension_id" value="org.hibernate.tools.hbm2ddl"/>
-<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2doc" value="true"/>
-<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2doc.extension_id" value="org.hibernate.tools.hbm2doc"/>
-<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2hbmxml" value="false"/>
-<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2hbmxml.extension_id" value="org.hibernate.tools.hbm2hbmxml"/>
-<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2java" value="false"/>
-<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2java.extension_id" value="org.hibernate.tools.hbm2java"/>
-<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbmtemplate" value="false"/>
-<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbmtemplate.extension_id" value="org.hibernate.tools.hbmtemplate"/>
-<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.query" value="false"/>
-<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.query.extension_id" value="org.hibernate.tools.query"/>
-<mapAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.query.properties">
-<mapEntry key="outputFileName" value="asdf.txt"/>
-<mapEntry key="outputdir" value="\LaunchConfigTestProject2\temp_test_out_folder"/>
-<mapEntry key="query_string" value="from org.jboss.seam.example.booking.Booking"/>
-</mapAttribute>
-<booleanAttribute key="org.hibernate.tools.jdk5" value="false"/>
-<stringAttribute key="org.hibernate.tools.outputdir" value="\LaunchConfigTestProject2\temp_test_out_folder"/>
-<stringAttribute key="org.hibernate.tools.package" value="hsql"/>
-<booleanAttribute key="org.hibernate.tools.prefercompositeids" value="true"/>
-<booleanAttribute key="org.hibernate.tools.reveng.detect_many_to_many" value="true"/>
-<booleanAttribute key="org.hibernate.tools.reveng.detect_one_to_one" value="true"/>
-<booleanAttribute key="org.hibernate.tools.reveng.detect_optimistc_lock" value="true"/>
-<booleanAttribute key="org.hibernate.tools.schema2hbm" value="false"/>
-<booleanAttribute key="org.hibernate.tools.useExternalProcess" value="true"/>
-<booleanAttribute key="org.hibernate.tools.useOwnTemplates" value="false"/>
-<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
-</launchConfiguration>
Added: branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_all_exporters_external.launch
===================================================================
--- branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_all_exporters_external.launch (rev 0)
+++ branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_all_exporters_external.launch 2010-11-29 16:42:35 UTC (rev 27003)
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.hibernate.eclipse.launch.CodeGenerationLaunchConfigurationType">
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
+<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.launching.remote.InternalAntRunner"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="/LaunchConfigTestProject2/build_2794024212908788293xml"/>
+<stringAttribute key="org.hibernate.tools.configurationname" value="LaunchConfigTestProject2"/>
+<booleanAttribute key="org.hibernate.tools.ejb3" value="false"/>
+<listAttribute key="org.hibernate.tools.exporters">
+<listEntry value="org.hibernate.tools.hbm2java"/>
+<listEntry value="org.hibernate.tools.hbm2hbmxml"/>
+<listEntry value="org.hibernate.tools.hbm2dao"/>
+<listEntry value="org.hibernate.tools.hbmtemplate"/>
+<listEntry value="org.hibernate.tools.hbm2cfgxml"/>
+<listEntry value="org.hibernate.tools.hbm2doc"/>
+<listEntry value="org.hibernate.tools.hbm2ddl"/>
+<listEntry value="org.hibernate.tools.query"/>
+</listAttribute>
+<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2cfgxml" value="true"/>
+<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2cfgxml.extension_id" value="org.hibernate.tools.hbm2cfgxml"/>
+<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2dao" value="true"/>
+<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2dao.extension_id" value="org.hibernate.tools.hbm2dao"/>
+<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2ddl" value="true"/>
+<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2ddl.extension_id" value="org.hibernate.tools.hbm2ddl"/>
+<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2doc" value="false"/>
+<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2doc.extension_id" value="org.hibernate.tools.hbm2doc"/>
+<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2hbmxml" value="true"/>
+<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2hbmxml.extension_id" value="org.hibernate.tools.hbm2hbmxml"/>
+<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2java" value="true"/>
+<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2java.extension_id" value="org.hibernate.tools.hbm2java"/>
+<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbmtemplate" value="false"/>
+<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbmtemplate.extension_id" value="org.hibernate.tools.hbmtemplate"/>
+<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.query" value="false"/>
+<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.query.extension_id" value="org.hibernate.tools.query"/>
+<mapAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.query.properties">
+<mapEntry key="outputFileName" value="asdf.txt"/>
+<mapEntry key="outputdir" value="/LaunchConfigTestProject2/temp_test_out_folder_all_exporters_external"/>
+<mapEntry key="query_string" value="from org.jboss.seam.example.booking.Booking"/>
+</mapAttribute>
+<booleanAttribute key="org.hibernate.tools.jdk5" value="false"/>
+<stringAttribute key="org.hibernate.tools.outputdir" value="/LaunchConfigTestProject2/temp_test_out_folder_all_exporters_external"/>
+<stringAttribute key="org.hibernate.tools.package" value="hsql"/>
+<booleanAttribute key="org.hibernate.tools.prefercompositeids" value="true"/>
+<booleanAttribute key="org.hibernate.tools.reveng.detect_many_to_many" value="true"/>
+<booleanAttribute key="org.hibernate.tools.reveng.detect_one_to_one" value="true"/>
+<booleanAttribute key="org.hibernate.tools.reveng.detect_optimistc_lock" value="true"/>
+<booleanAttribute key="org.hibernate.tools.schema2hbm" value="false"/>
+<booleanAttribute key="org.hibernate.tools.useExternalProcess" value="true"/>
+<booleanAttribute key="org.hibernate.tools.useOwnTemplates" value="false"/>
+<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
+</launchConfiguration>
Added: branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_all_exporters_internal.launch
===================================================================
--- branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_all_exporters_internal.launch (rev 0)
+++ branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_all_exporters_internal.launch 2010-11-29 16:42:35 UTC (rev 27003)
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.hibernate.eclipse.launch.CodeGenerationLaunchConfigurationType">
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
+<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.launching.remote.InternalAntRunner"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="/LaunchConfigTestProject2/build_2794024212908788293xml"/>
+<stringAttribute key="org.hibernate.tools.configurationname" value="LaunchConfigTestProject2"/>
+<booleanAttribute key="org.hibernate.tools.ejb3" value="false"/>
+<listAttribute key="org.hibernate.tools.exporters">
+<listEntry value="org.hibernate.tools.hbm2java"/>
+<listEntry value="org.hibernate.tools.hbm2hbmxml"/>
+<listEntry value="org.hibernate.tools.hbm2dao"/>
+<listEntry value="org.hibernate.tools.hbmtemplate"/>
+<listEntry value="org.hibernate.tools.hbm2cfgxml"/>
+<listEntry value="org.hibernate.tools.hbm2doc"/>
+<listEntry value="org.hibernate.tools.hbm2ddl"/>
+<listEntry value="org.hibernate.tools.query"/>
+</listAttribute>
+<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2cfgxml" value="true"/>
+<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2cfgxml.extension_id" value="org.hibernate.tools.hbm2cfgxml"/>
+<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2dao" value="true"/>
+<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2dao.extension_id" value="org.hibernate.tools.hbm2dao"/>
+<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2ddl" value="true"/>
+<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2ddl.extension_id" value="org.hibernate.tools.hbm2ddl"/>
+<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2doc" value="false"/>
+<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2doc.extension_id" value="org.hibernate.tools.hbm2doc"/>
+<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2hbmxml" value="true"/>
+<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2hbmxml.extension_id" value="org.hibernate.tools.hbm2hbmxml"/>
+<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2java" value="true"/>
+<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2java.extension_id" value="org.hibernate.tools.hbm2java"/>
+<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbmtemplate" value="false"/>
+<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbmtemplate.extension_id" value="org.hibernate.tools.hbmtemplate"/>
+<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.query" value="false"/>
+<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.query.extension_id" value="org.hibernate.tools.query"/>
+<mapAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.query.properties">
+<mapEntry key="outputFileName" value="asdf.txt"/>
+<mapEntry key="outputdir" value="/LaunchConfigTestProject2/temp_test_out_folder_all_exporters_internal"/>
+<mapEntry key="query_string" value="from org.jboss.seam.example.booking.Booking"/>
+</mapAttribute>
+<booleanAttribute key="org.hibernate.tools.jdk5" value="false"/>
+<stringAttribute key="org.hibernate.tools.outputdir" value="/LaunchConfigTestProject2/temp_test_out_folder_all_exporters_internal"/>
+<stringAttribute key="org.hibernate.tools.package" value="hsql"/>
+<booleanAttribute key="org.hibernate.tools.prefercompositeids" value="true"/>
+<booleanAttribute key="org.hibernate.tools.reveng.detect_many_to_many" value="true"/>
+<booleanAttribute key="org.hibernate.tools.reveng.detect_one_to_one" value="true"/>
+<booleanAttribute key="org.hibernate.tools.reveng.detect_optimistc_lock" value="true"/>
+<booleanAttribute key="org.hibernate.tools.schema2hbm" value="false"/>
+<booleanAttribute key="org.hibernate.tools.useExternalProcess" value="false"/>
+<booleanAttribute key="org.hibernate.tools.useOwnTemplates" value="false"/>
+<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
+</launchConfiguration>
Added: branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_external.launch
===================================================================
--- branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_external.launch (rev 0)
+++ branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_external.launch 2010-11-29 16:42:35 UTC (rev 27003)
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.hibernate.eclipse.launch.CodeGenerationLaunchConfigurationType">
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
+<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.launching.remote.InternalAntRunner"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="/LaunchConfigTestProject2/build_2794024212908788293xml"/>
+<stringAttribute key="org.hibernate.tools.configurationname" value="LaunchConfigTestProject2"/>
+<booleanAttribute key="org.hibernate.tools.ejb3" value="false"/>
+<listAttribute key="org.hibernate.tools.exporters">
+<listEntry value="org.hibernate.tools.hbm2java"/>
+<listEntry value="org.hibernate.tools.hbm2hbmxml"/>
+<listEntry value="org.hibernate.tools.hbm2dao"/>
+<listEntry value="org.hibernate.tools.hbmtemplate"/>
+<listEntry value="org.hibernate.tools.hbm2cfgxml"/>
+<listEntry value="org.hibernate.tools.hbm2doc"/>
+<listEntry value="org.hibernate.tools.hbm2ddl"/>
+<listEntry value="org.hibernate.tools.query"/>
+</listAttribute>
+<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2cfgxml" value="false"/>
+<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2cfgxml.extension_id" value="org.hibernate.tools.hbm2cfgxml"/>
+<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2dao" value="false"/>
+<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2dao.extension_id" value="org.hibernate.tools.hbm2dao"/>
+<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2ddl" value="false"/>
+<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2ddl.extension_id" value="org.hibernate.tools.hbm2ddl"/>
+<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2doc" value="true"/>
+<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2doc.extension_id" value="org.hibernate.tools.hbm2doc"/>
+<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2hbmxml" value="false"/>
+<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2hbmxml.extension_id" value="org.hibernate.tools.hbm2hbmxml"/>
+<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2java" value="false"/>
+<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2java.extension_id" value="org.hibernate.tools.hbm2java"/>
+<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbmtemplate" value="false"/>
+<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbmtemplate.extension_id" value="org.hibernate.tools.hbmtemplate"/>
+<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.query" value="false"/>
+<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.query.extension_id" value="org.hibernate.tools.query"/>
+<mapAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.query.properties">
+<mapEntry key="outputFileName" value="asdf.txt"/>
+<mapEntry key="outputdir" value="/LaunchConfigTestProject2/temp_test_out_folder"/>
+<mapEntry key="query_string" value="from org.jboss.seam.example.booking.Booking"/>
+</mapAttribute>
+<booleanAttribute key="org.hibernate.tools.jdk5" value="false"/>
+<stringAttribute key="org.hibernate.tools.outputdir" value="/LaunchConfigTestProject2/temp_test_out_folder"/>
+<stringAttribute key="org.hibernate.tools.package" value="hsql"/>
+<booleanAttribute key="org.hibernate.tools.prefercompositeids" value="true"/>
+<booleanAttribute key="org.hibernate.tools.reveng.detect_many_to_many" value="true"/>
+<booleanAttribute key="org.hibernate.tools.reveng.detect_one_to_one" value="true"/>
+<booleanAttribute key="org.hibernate.tools.reveng.detect_optimistc_lock" value="true"/>
+<booleanAttribute key="org.hibernate.tools.schema2hbm" value="false"/>
+<booleanAttribute key="org.hibernate.tools.useExternalProcess" value="true"/>
+<booleanAttribute key="org.hibernate.tools.useOwnTemplates" value="false"/>
+<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
+</launchConfiguration>
Added: branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_internal.launch
===================================================================
--- branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_internal.launch (rev 0)
+++ branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_internal.launch 2010-11-29 16:42:35 UTC (rev 27003)
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.hibernate.eclipse.launch.CodeGenerationLaunchConfigurationType">
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
+<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.launching.remote.InternalAntRunner"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="/LaunchConfigTestProject2/build_2794024212908788293xml"/>
+<stringAttribute key="org.hibernate.tools.configurationname" value="LaunchConfigTestProject2"/>
+<booleanAttribute key="org.hibernate.tools.ejb3" value="false"/>
+<listAttribute key="org.hibernate.tools.exporters">
+<listEntry value="org.hibernate.tools.hbm2java"/>
+<listEntry value="org.hibernate.tools.hbm2hbmxml"/>
+<listEntry value="org.hibernate.tools.hbm2dao"/>
+<listEntry value="org.hibernate.tools.hbmtemplate"/>
+<listEntry value="org.hibernate.tools.hbm2cfgxml"/>
+<listEntry value="org.hibernate.tools.hbm2doc"/>
+<listEntry value="org.hibernate.tools.hbm2ddl"/>
+<listEntry value="org.hibernate.tools.query"/>
+</listAttribute>
+<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2cfgxml" value="false"/>
+<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2cfgxml.extension_id" value="org.hibernate.tools.hbm2cfgxml"/>
+<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2dao" value="false"/>
+<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2dao.extension_id" value="org.hibernate.tools.hbm2dao"/>
+<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2ddl" value="false"/>
+<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2ddl.extension_id" value="org.hibernate.tools.hbm2ddl"/>
+<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2doc" value="true"/>
+<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2doc.extension_id" value="org.hibernate.tools.hbm2doc"/>
+<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2hbmxml" value="false"/>
+<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2hbmxml.extension_id" value="org.hibernate.tools.hbm2hbmxml"/>
+<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2java" value="false"/>
+<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2java.extension_id" value="org.hibernate.tools.hbm2java"/>
+<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbmtemplate" value="false"/>
+<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbmtemplate.extension_id" value="org.hibernate.tools.hbmtemplate"/>
+<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.query" value="false"/>
+<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.query.extension_id" value="org.hibernate.tools.query"/>
+<mapAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.query.properties">
+<mapEntry key="outputFileName" value="asdf.txt"/>
+<mapEntry key="outputdir" value="/LaunchConfigTestProject2/temp_test_out_folder"/>
+<mapEntry key="query_string" value="from org.jboss.seam.example.booking.Booking"/>
+</mapAttribute>
+<booleanAttribute key="org.hibernate.tools.jdk5" value="false"/>
+<stringAttribute key="org.hibernate.tools.outputdir" value="/LaunchConfigTestProject2/temp_test_out_folder"/>
+<stringAttribute key="org.hibernate.tools.package" value="hsql"/>
+<booleanAttribute key="org.hibernate.tools.prefercompositeids" value="true"/>
+<booleanAttribute key="org.hibernate.tools.reveng.detect_many_to_many" value="true"/>
+<booleanAttribute key="org.hibernate.tools.reveng.detect_one_to_one" value="true"/>
+<booleanAttribute key="org.hibernate.tools.reveng.detect_optimistc_lock" value="true"/>
+<booleanAttribute key="org.hibernate.tools.schema2hbm" value="false"/>
+<booleanAttribute key="org.hibernate.tools.useExternalProcess" value="false"/>
+<booleanAttribute key="org.hibernate.tools.useOwnTemplates" value="false"/>
+<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
+</launchConfiguration>
Modified: branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/CodeGenExternalProcessExecutionTest.java
===================================================================
--- branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/CodeGenExternalProcessExecutionTest.java 2010-11-29 16:39:19 UTC (rev 27002)
+++ branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/CodeGenExternalProcessExecutionTest.java 2010-11-29 16:42:35 UTC (rev 27003)
@@ -10,9 +10,14 @@
******************************************************************************/
package org.hibernate.eclipse.console.test;
+import java.io.InputStream;
+import java.util.Arrays;
+import java.util.Comparator;
+
import org.eclipse.core.externaltools.internal.IExternalToolConstants;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
@@ -21,16 +26,28 @@
import org.eclipse.debug.core.ILaunchManager;
import org.eclipse.debug.internal.core.LaunchManager;
import org.eclipse.debug.internal.ui.DebugUIPlugin;
+import org.eclipse.jdt.core.ToolFactory;
+import org.eclipse.jdt.core.formatter.CodeFormatter;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.Document;
+import org.eclipse.text.edits.MalformedTreeException;
+import org.eclipse.text.edits.TextEdit;
import org.hibernate.console.ConsoleConfiguration;
import org.hibernate.console.KnownConfigurations;
import org.hibernate.eclipse.console.EclipseLaunchConsoleConfigurationPreferences;
import org.hibernate.eclipse.console.test.project.LaunchConfigTestProject2;
+import org.hibernate.eclipse.console.test.utils.ResourceReadUtils;
import junit.framework.TestCase;
/**
* Execute codegeneration launch configuration in external process,
* to check the generation is successful.
+ * Execute codegeneration launch configuration in internal process,
+ * to check the generation is successful.
+ * Compare generated results - should be the same.
+ * Currently both tests are fail, should be success
+ * when JBIDE-7441 be fixed.
*
* @author Vitali Yemialyanchyk
*/
@@ -40,6 +57,8 @@
private ConsoleConfiguration consoleCfg;
private LaunchConfigTestProject2 project;
private LaunchManager launchManager = new LaunchManager();
+ private final CodeFormatter codeFormatter = ToolFactory.createCodeFormatter(null);
+ private final String ls = System.getProperties().getProperty("line.separator", ResourceReadUtils.LN_1); //$NON-NLS-1$
public CodeGenExternalProcessExecutionTest(String name) {
super(name);
@@ -59,11 +78,11 @@
}
protected void tearDown() throws Exception {
+ consoleCfg.reset();
+ KnownConfigurations.getInstance().removeAllConfigurations();
+ consoleCfg = null;
this.project.deleteIProject();
this.project = null;
-
- KnownConfigurations.getInstance().removeAllConfigurations();
- consoleCfg = null;
}
public void testExecuteExternalLaunchConfig() {
@@ -74,9 +93,12 @@
} catch (CoreException e) {
}
assertEquals(0, nTest);
- final String fileNameCodeGen = LaunchConfigTestProject2.LAUNCH_CODE_GEN_TEST_FILE;
- ILaunchConfiguration launchConfig = loadLaunchConfigFromFile(fileNameCodeGen);
+ ILaunchConfiguration launchConfig = null;
ILaunchConfigurationWorkingCopy launchConfigWC = null;
+ //
+ final String fileNameCodeGenExtern = LaunchConfigTestProject2.LAUNCH_CODE_GEN_TEST_FILE_EXTERN;
+ launchConfig = loadLaunchConfigFromFile(fileNameCodeGenExtern);
+ launchConfigWC = null;
try {
launchConfigWC = launchConfig.getWorkingCopy();
} catch (CoreException e) {
@@ -89,9 +111,300 @@
nTest = testFolder.members().length;
} catch (CoreException e) {
}
+ // TODO: uncomment when JBIDE-7441 be fixed
+ //assertTrue(nTest > 0);
+ //
+ final String fileNameCodeGenIntern = LaunchConfigTestProject2.LAUNCH_CODE_GEN_TEST_FILE_INTERN;
+ launchConfig = loadLaunchConfigFromFile(fileNameCodeGenIntern);
+ launchConfigWC = null;
+ try {
+ launchConfigWC = launchConfig.getWorkingCopy();
+ } catch (CoreException e) {
+ }
+ assertNotNull(launchConfigWC);
+ launchConfigWC.setAttribute(IExternalToolConstants.ATTR_LAUNCH_IN_BACKGROUND, false);
+ DebugUIPlugin.launchInForeground(launchConfigWC, ILaunchManager.RUN_MODE);
+ nTest = -1;
+ try {
+ nTest = testFolder.members().length;
+ } catch (CoreException e) {
+ }
assertTrue(nTest > 0);
}
+
+ public void testExecute2LaunchConfigs_External_and_Internal() {
+ //
+ ILaunchConfiguration launchConfig = null;
+ ILaunchConfigurationWorkingCopy launchConfigWC = null;
+ IFolder testFolderAllExportersExternal = null;
+ IFolder testFolderAllExportersInternal = null;
+ int nTest = -1;
+ //
+ testFolderAllExportersExternal = project.getTestFolderAllExportersExternal();
+ nTest = -1;
+ try {
+ nTest = testFolderAllExportersExternal.members().length;
+ } catch (CoreException e) {
+ }
+ assertEquals(0, nTest);
+ //
+ final String fileNameCodeGenExtern = LaunchConfigTestProject2.LAUNCH_CODE_GEN_TEST_FILE_ALL_EXPORTERS_EXTERN;
+ launchConfig = loadLaunchConfigFromFile(fileNameCodeGenExtern);
+ launchConfigWC = null;
+ try {
+ launchConfigWC = launchConfig.getWorkingCopy();
+ } catch (CoreException e) {
+ }
+ assertNotNull(launchConfigWC);
+ launchConfigWC.setAttribute(IExternalToolConstants.ATTR_LAUNCH_IN_BACKGROUND, false);
+ DebugUIPlugin.launchInForeground(launchConfigWC, ILaunchManager.RUN_MODE);
+ nTest = -1;
+ try {
+ nTest = testFolderAllExportersExternal.members().length;
+ } catch (CoreException e) {
+ }
+ assertTrue(nTest > 0);
+ //
+ testFolderAllExportersInternal = project.getTestFolderAllExportersInternal();
+ nTest = -1;
+ try {
+ nTest = testFolderAllExportersInternal.members().length;
+ } catch (CoreException e) {
+ }
+ assertEquals(0, nTest);
+ //
+ final String fileNameCodeGenIntern = LaunchConfigTestProject2.LAUNCH_CODE_GEN_TEST_FILE_ALL_EXPORTERS_INTERN;
+ launchConfig = loadLaunchConfigFromFile(fileNameCodeGenIntern);
+ launchConfigWC = null;
+ try {
+ launchConfigWC = launchConfig.getWorkingCopy();
+ } catch (CoreException e) {
+ }
+ assertNotNull(launchConfigWC);
+ launchConfigWC.setAttribute(IExternalToolConstants.ATTR_LAUNCH_IN_BACKGROUND, false);
+ DebugUIPlugin.launchInForeground(launchConfigWC, ILaunchManager.RUN_MODE);
+ nTest = -1;
+ try {
+ nTest = testFolderAllExportersInternal.members().length;
+ } catch (CoreException e) {
+ }
+ assertTrue(nTest > 0);
+ //
+ boolean res = compareFolders(testFolderAllExportersExternal, testFolderAllExportersInternal, true);
+ assertTrue(res);
+ }
+ protected class ResComparator implements Comparator<IResource> {
+
+ public int compare(IResource o1, IResource o2) {
+ int res = o1.getName().compareTo(o2.getName());
+ if (res == 0) {
+ if (o1.getType() < o2.getType()) {
+ res = -1;
+ } else if (o1.getType() > o2.getType()) {
+ res = 1;
+ }
+ }
+ return res;
+ }
+ }
+
+ /**
+ * Clean up string of substrings in between [cmtB, cmtE],
+ * cmtB, cmtE - are markers of substring to delete.
+ *
+ * @param str
+ * @param cmtB
+ * @param cmtE
+ * @return
+ */
+ public String stripComments(String str, final String cmtB, final String cmtE) {
+ boolean process = true;
+ while (process) {
+ int fromIndex = 0;
+ int commentStart = str.indexOf(cmtB, fromIndex);
+ fromIndex = commentStart;
+ int commentEnd = str.indexOf(cmtE, fromIndex);
+ if (commentStart < commentEnd && commentStart != -1) {
+ str = str.substring(0, commentStart) + str.substring(commentEnd + cmtE.length());
+ } else {
+ process = false;
+ }
+ }
+ return str;
+ }
+
+ /**
+ * get rid of xml comments.
+ *
+ * @param str
+ * @return
+ */
+ public String stripXmlComments(String str) {
+ final String cmtB = "<!--"; //$NON-NLS-1$
+ final String cmtE = "-->"; //$NON-NLS-1$
+ return stripComments(str, cmtB, cmtE);
+ }
+
+ /**
+ * get rid of java comments.
+ *
+ * @param str
+ * @return
+ */
+ public String stripJavaComments(String str) {
+ final String cmtB = "/*"; //$NON-NLS-1$
+ final String cmtE = "*/"; //$NON-NLS-1$
+ str = stripComments(str, cmtB, cmtE);
+ final String cmt2B = "//"; //$NON-NLS-1$
+ final String cmt2E = ls;
+ str = stripComments(str, cmt2B, cmt2E);
+ return str;
+ }
+
+ /**
+ * format string as java file.
+ *
+ * @param str
+ * @return
+ */
+ public String formatJavaFile(String str) {
+ Document doc = new Document(str);
+ TextEdit edit = codeFormatter.format(CodeFormatter.K_COMPILATION_UNIT, str, 0, str.length(), 0, null);
+ try {
+ edit.apply(doc);
+ } catch (MalformedTreeException e) {
+ } catch (BadLocationException e) {
+ }
+ return doc.get();
+ }
+
+ /**
+ * Compares 2 files, if identical for test purposes return true.
+ *
+ * @param testFile1
+ * @param testFile2
+ * @param assertFlag - if true execute assertion
+ * @return
+ */
+ public boolean compareFiles(IFile testFile1, IFile testFile2, boolean assertFlag) {
+ boolean res = false;
+ InputStream is1 = null, is2 = null;
+ try {
+ is1 = testFile1.getContents();
+ } catch (CoreException e) {
+ }
+ try {
+ is2 = testFile2.getContents();
+ } catch (CoreException e) {
+ }
+ if (is1 == null || is2 == null) {
+ res = is1 == is2;
+ if (!res && assertFlag) {
+ assertEquals(is1, is2);
+ }
+ return res;
+ }
+ String str1 = ResourceReadUtils.readStream(is1);
+ String str2 = ResourceReadUtils.readStream(is2);
+ if (str1 == null || str2 == null) {
+ res = str1 == str2;
+ if (!res && assertFlag) {
+ assertEquals(str1, str2);
+ }
+ return res;
+ }
+ final String useExt = testFile1.getFileExtension();
+ if (0 == "xml".compareToIgnoreCase(useExt)) { //$NON-NLS-1$
+ str1 = stripXmlComments(str1);
+ str2 = stripXmlComments(str2);
+ } else if (0 == "java".compareToIgnoreCase(useExt)) { //$NON-NLS-1$
+ str1 = formatJavaFile(str1);
+ str2 = formatJavaFile(str2);
+ str1 = stripJavaComments(str1);
+ str2 = stripJavaComments(str2);
+ }
+ if (testFile1.getName().endsWith("cfg.xml")) { //$NON-NLS-1$
+ // do not compare generated cfg.xml files till the time of
+ // open question for Environment.HBM2DDL_AUTO settings
+ //res = 0 == str1.compareTo(str2);
+ //if (!res && assertFlag) {
+ // assertEquals(str1, str2);
+ //}
+ res = true;
+ } else {
+ res = 0 == str1.compareTo(str2);
+ if (!res && assertFlag) {
+ assertEquals(str1, str2);
+ }
+ }
+ return res;
+ }
+
+ /**
+ * Compares 2 folders, if identical for test purposes return true.
+ *
+ * @param testFolder1
+ * @param testFolder2
+ * @param assertFlag - if true execute assertion
+ * @return
+ */
+ public boolean compareFolders(IFolder testFolder1, IFolder testFolder2, boolean assertFlag) {
+ boolean res = false;
+ IResource[] res1 = null, res2 = null;
+ try {
+ res1 = testFolder1.members();
+ } catch (CoreException e) {
+ }
+ try {
+ res2 = testFolder2.members();
+ } catch (CoreException e) {
+ }
+ if (res1 == null || res2 == null) {
+ res = res1 == res2;
+ if (!res && assertFlag) {
+ assertEquals(res1, res2);
+ }
+ return res;
+ }
+ res = res1.length == res2.length;
+ if (!res) {
+ if (!res && assertFlag) {
+ assertEquals(res1.length, res2.length);
+ }
+ return res;
+ }
+ final ResComparator cmp = new ResComparator();
+ Arrays.sort(res1, cmp);
+ Arrays.sort(res2, cmp);
+ res = true;
+ for (int i = 0; res && i < res1.length; i++) {
+ if (0 != res1[i].getName().compareTo(res2[i].getName())) {
+ res = false;
+ if (!res && assertFlag) {
+ assertEquals(res1[i].getName(), res2[i].getName());
+ }
+ }
+ if (res1[i].getType() != res2[i].getType()) {
+ res = false;
+ if (!res && assertFlag) {
+ assertEquals(res1[i].getType(), res2[i].getType());
+ }
+ }
+ if (res && ((IResource.FOLDER & res1[i].getType()) == IResource.FOLDER)) {
+ IFolder tf1 = (IFolder)res1[i];
+ IFolder tf2 = (IFolder)res2[i];
+ res = compareFolders(tf1, tf2, assertFlag);
+ }
+ if (res && ((IResource.FILE & res1[i].getType()) == IResource.FILE)) {
+ IFile tf1 = (IFile)res1[i];
+ IFile tf2 = (IFile)res2[i];
+ res = compareFiles(tf1, tf2, assertFlag);
+ }
+ }
+ return res;
+ }
+
protected LaunchConfigTestProject2 getProject() {
return this.project;
}
Modified: branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/project/LaunchConfigTestProject2.java
===================================================================
--- branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/project/LaunchConfigTestProject2.java 2010-11-29 16:39:19 UTC (rev 27002)
+++ branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/project/LaunchConfigTestProject2.java 2010-11-29 16:42:35 UTC (rev 27003)
@@ -40,13 +40,18 @@
public class LaunchConfigTestProject2 extends TestProject {
public static final String TEST_TMP_OUT_FOLDER = "temp_test_out_folder"; //$NON-NLS-1$
+ public static final String TEST_TMP_OUT_FOLDER_ALL_EXPORTERS_EXTERNAL = "temp_test_out_folder_all_exporters_external"; //$NON-NLS-1$
+ public static final String TEST_TMP_OUT_FOLDER_ALL_EXPORTERS_INTERNAL = "temp_test_out_folder_all_exporters_internal"; //$NON-NLS-1$
public static final String META_INF_FOLDER = "src/META-INF".replaceAll("//", File.separator); //$NON-NLS-1$ //$NON-NLS-2$
public static final String PROJECT_PATH = "res/project2/".replaceAll("//", File.separator); //$NON-NLS-1$ //$NON-NLS-2$
public static final String RESOURCE_SRC_PATH = "res/project2/src/".replaceAll("//", File.separator); //$NON-NLS-1$ //$NON-NLS-2$
public static final String RESOURCE_LIB_PATH = "res/project2/lib/".replaceAll("//", File.separator); //$NON-NLS-1$ //$NON-NLS-2$
public static final String HIBERNATE_PLUGIN_LIB_PATH = "lib"; //$NON-NLS-1$
- public static final String LAUNCH_CODE_GEN_TEST_FILE = "testLaunchCfg.launch"; //$NON-NLS-1$
+ public static final String LAUNCH_CODE_GEN_TEST_FILE_ALL_EXPORTERS_EXTERN = "testLaunchCfg_all_exporters_external.launch"; //$NON-NLS-1$
+ public static final String LAUNCH_CODE_GEN_TEST_FILE_ALL_EXPORTERS_INTERN = "testLaunchCfg_all_exporters_internal.launch"; //$NON-NLS-1$
+ public static final String LAUNCH_CODE_GEN_TEST_FILE_EXTERN = "testLaunchCfg_external.launch"; //$NON-NLS-1$
+ public static final String LAUNCH_CODE_GEN_TEST_FILE_INTERN = "testLaunchCfg_internal.launch"; //$NON-NLS-1$
public static final String LAUNCH_CONSOLE_CONFIG_TEST_FILE = "LaunchConfigTestProject2.launch"; //$NON-NLS-1$
public static final String HIBERNATE_CONSOLE_PROPERTIES_FILE = "hibernate-console.properties"; //$NON-NLS-1$
public static final String PERSISTENCE_XML_FILE = "persistence.xml"; //$NON-NLS-1$
@@ -76,8 +81,15 @@
super.buildProject();
IPackageFragmentRoot tst = createFolder(TEST_TMP_OUT_FOLDER);
tst.getResource().refreshLocal(IResource.DEPTH_INFINITE, null);
+ tst = createFolder(TEST_TMP_OUT_FOLDER_ALL_EXPORTERS_EXTERNAL);
+ tst.getResource().refreshLocal(IResource.DEPTH_INFINITE, null);
+ tst = createFolder(TEST_TMP_OUT_FOLDER_ALL_EXPORTERS_INTERNAL);
+ tst.getResource().refreshLocal(IResource.DEPTH_INFINITE, null);
//
- importFileToProject(LAUNCH_CODE_GEN_TEST_FILE);
+ importFileToProject(LAUNCH_CODE_GEN_TEST_FILE_ALL_EXPORTERS_EXTERN);
+ importFileToProject(LAUNCH_CODE_GEN_TEST_FILE_ALL_EXPORTERS_INTERN);
+ importFileToProject(LAUNCH_CODE_GEN_TEST_FILE_EXTERN);
+ importFileToProject(LAUNCH_CODE_GEN_TEST_FILE_INTERN);
importFileToProject(LAUNCH_CONSOLE_CONFIG_TEST_FILE);
importFileToProject(HIBERNATE_CONSOLE_PROPERTIES_FILE);
long startCopyFiles = System.currentTimeMillis();
@@ -101,6 +113,14 @@
public IFolder getTestFolder() {
return project.getFolder(TEST_TMP_OUT_FOLDER);
}
+
+ public IFolder getTestFolderAllExportersExternal() {
+ return project.getFolder(TEST_TMP_OUT_FOLDER_ALL_EXPORTERS_EXTERNAL);
+ }
+
+ public IFolder getTestFolderAllExportersInternal() {
+ return project.getFolder(TEST_TMP_OUT_FOLDER_ALL_EXPORTERS_INTERNAL);
+ }
public boolean setupSourceTestFolder() throws IOException, CoreException {
ArrayList<String> foldersList = new ArrayList<String>();
Modified: branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/project/TestProject.java
===================================================================
--- branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/project/TestProject.java 2010-11-29 16:39:19 UTC (rev 27002)
+++ branches/jbosstools-3.2.0.Beta2/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/project/TestProject.java 2010-11-29 16:42:35 UTC (rev 27003)
@@ -88,13 +88,27 @@
}
public void deleteIProject(boolean deleteContent) {
- try {
- IContainer container = project.getParent();
- project.delete(deleteContent, true, null);
- container.refreshLocal(IResource.DEPTH_ONE, null);
- } catch (CoreException ce) {
- throw new RuntimeException(ce);
+ Exception ex = null;
+ for (int i = 0; i < 4; i++) {
+ ex = null;
+ try {
+ IContainer container = project.getParent();
+ project.delete(deleteContent, true, null);
+ container.refreshLocal(IResource.DEPTH_ONE, null);
+ i = 4;
+ } catch (CoreException e) {
+ ex = e;
+ if (i < 3) {
+ try {
+ Thread.sleep(3000);
+ } catch (InterruptedException e1) {
+ }
+ }
+ }
}
+ if (ex != null) {
+ throw new RuntimeException(ex);
+ }
javaProject = null;
project = null;
}
14 years, 1 month
- 1
- 0
JBoss Tools SVN: r27002 - branches/jbosstools-3.2.0.Beta1/documentation/whatsnew/as.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2010-11-29 11:39:19 -0500 (Mon, 29 Nov 2010)
New Revision: 27002
Added:
branches/jbosstools-3.2.0.Beta1/documentation/whatsnew/as/as-news-3.2.0.Beta2.html
Log:
JBIDE-7653 - n&n
Added: branches/jbosstools-3.2.0.Beta1/documentation/whatsnew/as/as-news-3.2.0.Beta2.html
===================================================================
--- branches/jbosstools-3.2.0.Beta1/documentation/whatsnew/as/as-news-3.2.0.Beta2.html (rev 0)
+++ branches/jbosstools-3.2.0.Beta1/documentation/whatsnew/as/as-news-3.2.0.Beta2.html 2010-11-29 16:39:19 UTC (rev 27002)
@@ -0,0 +1,74 @@
+<html>
+
+<head>
+<link rel="stylesheet" href="../whatsnew.css">
+<title>JBoss AS Tools 3.2.0.Beta2 News</title>
+</head>
+
+<body>
+
+<h1>JBoss AS Tools 3.2.0.Beta2 - New and Noteworthy</h1>
+
+ <p align="right"><a href="../index.html">< Main Index</a> <a href="../hibernate/hibernate-news-3.4.0.Beta2.html">Hibernate Tools ></a></p>
+
+<table border="0" cellpadding="10" cellspacing="0" width="80%">
+
+ <tr>
+ <td colspan="2">
+ <hr/>
+ <h3>Server</h3>
+ <hr/>
+ </td>
+ </tr>
+
+ <tr>
+ <td valign="top" align="left">
+ <p align="right">
+ <b>Remote System Support Improvements</b></td>
+ <td valign="top" width="90%">
+ <p>
+ Startup of a remote server will now first check if it's already started. Many issues with workspace locking and uncancelable jobs have been found and fixed for startup and shutdown of remote servers. The RSE composites have been added to the new server wizard, to allow earlier configuration by the user. Methods to add additional hosts, or browse for folders, have also been added for convenience. Remote deployment scanner is also started and stopped during publishes, to prevent partial deployments.
+ </p>
+ <p></p>
+ <p><small>
+ <a href="https://jira.jboss.org/jira/browse/JBIDE-7608">remote startup checks remote status</a><br/>
+ <a href="https://jira.jboss.org/jira/browse/JBIDE-7188">remote startup checks remote status</a><br/>
+ <a href="https://jira.jboss.org/jira/browse/JBIDE-7251">remote startup checks remote status</a><br/>
+ <a href="https://jira.jboss.org/jira/browse/JBIDE-7579">uncancelable startup / shutdown jobs</a><br/>
+ <a href="https://jira.jboss.org/jira/browse/JBIDE-7221">rse composite added to new server wizard</a><br/>
+ <a href="https://jira.jboss.org/jira/browse/JBIDE-7018">browse remote folders / new hosts</a><br/>
+ <a href="https://jira.jboss.org/jira/browse/JBIDE-7191">remote deployment scanner start / stop</a><br/>
+ </small></p>
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2">
+ <hr/>
+ </td>
+ </tr>
+
+ <tr>
+ <td valign="top" align="left">
+ <p align="right">
+ <b>Single Folder deployment</b></td>
+ <td valign="top">
+ <p> While previously you could only mark single files as deployable, now you can do the same with folders! Woohoo! They can also be marked as zipped, but at this point, renaming the output archive is not yet possible. </p>
+ <p></p>
+ <p><small><a href="https://jira.jboss.org/jira/browse/JBIDE-7324">Make deployable for directories</a><br/>
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2">
+ <hr/>
+ </td>
+ </tr>
+
+</table>
+
+</body>
+
+</html>
+
+
14 years, 1 month
- 1
- 0
JBoss Tools SVN: r27001 - trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2010-11-29 10:21:37 -0500 (Mon, 29 Nov 2010)
New Revision: 27001
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java
Log:
JBIDE-7019 - regression fix
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java 2010-11-29 14:53:24 UTC (rev 27000)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java 2010-11-29 15:21:37 UTC (rev 27001)
@@ -54,8 +54,9 @@
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.progress.IProgressService;
import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.IServer;
+import org.eclipse.wst.server.core.IServerWorkingCopy;
import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
+import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
import org.jboss.ide.eclipse.as.core.util.IConstants;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
import org.jboss.ide.eclipse.as.rse.core.RSEPublishMethod;
@@ -103,8 +104,11 @@
};
combo.getCombo().addModifyListener(comboMListener);
- IServer original = callback.getServer().getOriginal();
- if( original != null && ServerConverter.getJBossServer(original) != null ) {
+ IServerWorkingCopy cServer = callback.getServer();
+ JBossServer jbs = cServer.getOriginal() == null ?
+ ServerConverter.getJBossServer(cServer) :
+ ServerConverter.getJBossServer(cServer.getOriginal());
+ if( jbs != null ) {
Label serverHomeLabel = new Label(this, SWT.NONE);
serverHomeLabel.setText("Remote Server Home: ");
14 years, 1 month
- 1
- 0
JBoss Tools SVN: r27000 - in trunk/hibernatetools/tests/org.hibernate.eclipse.console.test: res/project2 and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: vyemialyanchyk
Date: 2010-11-29 09:53:24 -0500 (Mon, 29 Nov 2010)
New Revision: 27000
Modified:
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project/testLaunchCfg_0.launch
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project/testLaunchCfg_1.launch
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_all_exporters_external.launch
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_all_exporters_internal.launch
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_external.launch
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_internal.launch
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/CodeGenExternalProcessExecutionTest.java
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/project/TestProject.java
Log:
https://jira.jboss.org/browse/JBIDE-7746 - try to fix issue for linux test env.
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project/testLaunchCfg_0.launch
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project/testLaunchCfg_0.launch 2010-11-29 11:00:12 UTC (rev 26999)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project/testLaunchCfg_0.launch 2010-11-29 14:53:24 UTC (rev 27000)
@@ -9,9 +9,9 @@
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.hibernate.codegen.CodeGenMain"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="..../AppData/Local/Temp/codegenbuildxml/4fbe6bbb-9013-4ef2-8175-5b13f714ae00/build.xml"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="qwert"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-cp ....\hibernate_eclipse_plugins_short\z-codegen\target\org.hibernate.codegen-1.0.0.GA.jar"/>
-<stringAttribute key="org.hibernate.tools.buildXml" value="\qwert\target\build.xml"/>
-<stringAttribute key="org.hibernate.tools.codeGenLaunchJar" value="....\trunk\hibernatetools\plugins\org.hibernate.eclipse\lib\extern\org.hibernate.codegen.jar"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-cp ..../hibernate_eclipse_plugins_short/z-codegen/target/org.hibernate.codegen-1.0.0.GA.jar"/>
+<stringAttribute key="org.hibernate.tools.buildXml" value="/qwert/target/build.xml"/>
+<stringAttribute key="org.hibernate.tools.codeGenLaunchJar" value="..../trunk/hibernatetools/plugins/org.hibernate.eclipse/lib/extern/org.hibernate.codegen.jar"/>
<stringAttribute key="org.hibernate.tools.configurationname" value="qwert"/>
<booleanAttribute key="org.hibernate.tools.ejb3" value="true"/>
<listAttribute key="org.hibernate.tools.exporters">
@@ -48,39 +48,39 @@
<mapAttribute key="org.hibernate.tools.exporters.8.properties">
<mapEntry key="file_pattern" value="{package-name}/{class-name}.java"/>
<mapEntry key="for_each" value="11111111111111"/>
-<mapEntry key="outputdir" value="\LaunchConfigTestProject\temp_test_out_folder"/>
+<mapEntry key="outputdir" value="/LaunchConfigTestProject/temp_test_out_folder"/>
<mapEntry key="template_name" value="pojo/Pojo.ftl"/>
-<mapEntry key="template_path" value="\LaunchConfigTestProject\temp_test_out_folder"/>
+<mapEntry key="template_path" value="/LaunchConfigTestProject/temp_test_out_folder"/>
</mapAttribute>
<booleanAttribute key="org.hibernate.tools.exporters.9" value="true"/>
<stringAttribute key="org.hibernate.tools.exporters.9.extension_id" value="org.hibernate.tools.hbm2dao"/>
<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2cfgxml" value="true"/>
<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2cfgxml.extension_id" value="org.hibernate.tools.hbm2cfgxml"/>
<mapAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2cfgxml.properties">
-<mapEntry key="outputdir" value="\LaunchConfigTestProject\temp_test_out_folder"/>
+<mapEntry key="outputdir" value="/LaunchConfigTestProject/temp_test_out_folder"/>
</mapAttribute>
<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2dao" value="true"/>
<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2dao.extension_id" value="org.hibernate.tools.hbm2dao"/>
<mapAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2dao.properties">
-<mapEntry key="outputdir" value="\LaunchConfigTestProject\temp_test_out_folder"/>
+<mapEntry key="outputdir" value="/LaunchConfigTestProject/temp_test_out_folder"/>
</mapAttribute>
<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2ddl" value="true"/>
<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2ddl.extension_id" value="org.hibernate.tools.hbm2ddl"/>
<mapAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2ddl.properties">
<mapEntry key="outputFileName" value="schema.sql"/>
-<mapEntry key="outputdir" value="\LaunchConfigTestProject\temp_test_out_folder"/>
+<mapEntry key="outputdir" value="/LaunchConfigTestProject/temp_test_out_folder"/>
<mapEntry key="schemaUpdate" value="true"/>
<mapEntry key="scriptToConsole" value="true"/>
</mapAttribute>
<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2doc" value="true"/>
<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2doc.extension_id" value="org.hibernate.tools.hbm2doc"/>
<mapAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2doc.properties">
-<mapEntry key="outputdir" value="\LaunchConfigTestProject\temp_test_out_folder"/>
+<mapEntry key="outputdir" value="/LaunchConfigTestProject/temp_test_out_folder"/>
</mapAttribute>
<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2hbmxml" value="true"/>
<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2hbmxml.extension_id" value="org.hibernate.tools.hbm2hbmxml"/>
<mapAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2hbmxml.properties">
-<mapEntry key="outputdir" value="\LaunchConfigTestProject\temp_test_out_folder"/>
+<mapEntry key="outputdir" value="/LaunchConfigTestProject/temp_test_out_folder"/>
</mapAttribute>
<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2java" value="true"/>
<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2java.extension_id" value="org.hibernate.tools.hbm2java"/>
@@ -89,24 +89,24 @@
<mapEntry key="destdir2" value="qw"/>
<mapEntry key="ejb3" value="true"/>
<mapEntry key="jdk5" value="true"/>
-<mapEntry key="outputdir" value="\LaunchConfigTestProject\temp_test_out_folder"/>
+<mapEntry key="outputdir" value="/LaunchConfigTestProject/temp_test_out_folder"/>
</mapAttribute>
<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbmtemplate" value="true"/>
<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbmtemplate.extension_id" value="org.hibernate.tools.hbmtemplate"/>
<mapAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbmtemplate.properties">
<mapEntry key="file_pattern" value="${package-name}/${class-name}.java"/>
<mapEntry key="for_each" value="entity"/>
-<mapEntry key="outputdir" value="\LaunchConfigTestProject\temp_test_out_folder"/>
+<mapEntry key="outputdir" value="/LaunchConfigTestProject/temp_test_out_folder"/>
<mapEntry key="template_name" value="pojo/Pojo.ftl"/>
</mapAttribute>
<booleanAttribute key="org.hibernate.tools.jdk5" value="true"/>
-<stringAttribute key="org.hibernate.tools.outputdir" value="\LaunchConfigTestProject\temp_test_out_folder"/>
+<stringAttribute key="org.hibernate.tools.outputdir" value="/LaunchConfigTestProject/temp_test_out_folder"/>
<stringAttribute key="org.hibernate.tools.package" value="qqqqqqqqqqqqqqqqqqqqqqqqqqqq"/>
<booleanAttribute key="org.hibernate.tools.prefercompositeids" value="true"/>
<booleanAttribute key="org.hibernate.tools.reveng.detect_many_to_many" value="false"/>
<booleanAttribute key="org.hibernate.tools.reveng.detect_one_to_one" value="false"/>
<booleanAttribute key="org.hibernate.tools.reveng.detect_optimistc_lock" value="false"/>
-<stringAttribute key="org.hibernate.tools.revengfile" value="\qwert\src\hibernate.reveng.xml"/>
+<stringAttribute key="org.hibernate.tools.revengfile" value="/qwert/src/hibernate.reveng.xml"/>
<booleanAttribute key="org.hibernate.tools.schema2hbm" value="true"/>
<booleanAttribute key="org.hibernate.tools.useExternalProcess" value="true"/>
<booleanAttribute key="org.hibernate.tools.useOwnTemplates" value="false"/>
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project/testLaunchCfg_1.launch
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project/testLaunchCfg_1.launch 2010-11-29 11:00:12 UTC (rev 26999)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project/testLaunchCfg_1.launch 2010-11-29 14:53:24 UTC (rev 27000)
@@ -9,9 +9,9 @@
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.hibernate.codegen.CodeGenMain"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="...../AppData/Local/Temp/codegenbuildxml/4fbe6bbb-9013-4ef2-8175-5b13f714ae00/build.xml"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="qwert"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-cp ....\hibernate_eclipse_plugins_short\z-codegen\target\org.hibernate.codegen-1.0.0.GA.jar"/>
-<stringAttribute key="org.hibernate.tools.buildXml" value="\qwert\target\build.xml"/>
-<stringAttribute key="org.hibernate.tools.codeGenLaunchJar" value="....\trunk\hibernatetools\plugins\org.hibernate.eclipse\lib\extern\org.hibernate.codegen.jar"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-cp ..../hibernate_eclipse_plugins_short/z-codegen/target/org.hibernate.codegen-1.0.0.GA.jar"/>
+<stringAttribute key="org.hibernate.tools.buildXml" value="/qwert/target/build.xml"/>
+<stringAttribute key="org.hibernate.tools.codeGenLaunchJar" value="..../trunk/hibernatetools/plugins/org.hibernate.eclipse/lib/extern/org.hibernate.codegen.jar"/>
<stringAttribute key="org.hibernate.tools.configurationname" value="qwert"/>
<booleanAttribute key="org.hibernate.tools.ejb3" value="true"/>
<listAttribute key="org.hibernate.tools.exporters">
@@ -50,37 +50,37 @@
<mapEntry key="for_each" value="11111111111111"/>
<mapEntry key="outputdir" value="temp_test_out_folder"/>
<mapEntry key="template_name" value="pojo/Pojo.ftl"/>
-<mapEntry key="template_path" value="\LaunchConfigTestProject\temp_test_out_folder"/>
+<mapEntry key="template_path" value="/LaunchConfigTestProject/temp_test_out_folder"/>
</mapAttribute>
<booleanAttribute key="org.hibernate.tools.exporters.9" value="true"/>
<stringAttribute key="org.hibernate.tools.exporters.9.extension_id" value="org.hibernate.tools.hbm2dao"/>
<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2cfgxml" value="true"/>
<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2cfgxml.extension_id" value="org.hibernate.tools.hbm2cfgxml"/>
<mapAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2cfgxml.properties">
-<mapEntry key="outputdir" value="\LaunchConfigTestProject\temp_test_out_folder"/>
+<mapEntry key="outputdir" value="/LaunchConfigTestProject/temp_test_out_folder"/>
</mapAttribute>
<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2dao" value="true"/>
<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2dao.extension_id" value="org.hibernate.tools.hbm2dao"/>
<mapAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2dao.properties">
-<mapEntry key="outputdir" value="\LaunchConfigTestProject\temp_test_out_folder"/>
+<mapEntry key="outputdir" value="/LaunchConfigTestProject/temp_test_out_folder"/>
</mapAttribute>
<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2ddl" value="true"/>
<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2ddl.extension_id" value="org.hibernate.tools.hbm2ddl"/>
<mapAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2ddl.properties">
<mapEntry key="outputFileName" value="schema.sql"/>
-<mapEntry key="outputdir" value="\LaunchConfigTestProject\temp_test_out_folder"/>
+<mapEntry key="outputdir" value="/LaunchConfigTestProject/temp_test_out_folder"/>
<mapEntry key="schemaUpdate" value="true"/>
<mapEntry key="scriptToConsole" value="true"/>
</mapAttribute>
<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2doc" value="true"/>
<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2doc.extension_id" value="org.hibernate.tools.hbm2doc"/>
<mapAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2doc.properties">
-<mapEntry key="outputdir" value="\LaunchConfigTestProject\temp_test_out_folder"/>
+<mapEntry key="outputdir" value="/LaunchConfigTestProject/temp_test_out_folder"/>
</mapAttribute>
<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2hbmxml" value="true"/>
<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2hbmxml.extension_id" value="org.hibernate.tools.hbm2hbmxml"/>
<mapAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2hbmxml.properties">
-<mapEntry key="outputdir" value="\LaunchConfigTestProject\temp_test_out_folder"/>
+<mapEntry key="outputdir" value="/LaunchConfigTestProject/temp_test_out_folder"/>
</mapAttribute>
<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2java" value="true"/>
<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2java.extension_id" value="org.hibernate.tools.hbm2java"/>
@@ -89,14 +89,14 @@
<mapEntry key="destdir2" value="qw"/>
<mapEntry key="ejb3" value="true"/>
<mapEntry key="jdk5" value="true"/>
-<mapEntry key="outputdir" value="\LaunchConfigTestProject\temp_test_out_folder"/>
+<mapEntry key="outputdir" value="/LaunchConfigTestProject/temp_test_out_folder"/>
</mapAttribute>
<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbmtemplate" value="true"/>
<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbmtemplate.extension_id" value="org.hibernate.tools.hbmtemplate"/>
<mapAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbmtemplate.properties">
<mapEntry key="file_pattern" value="${package-name}/${class-name}.java"/>
<mapEntry key="for_each" value="entity"/>
-<mapEntry key="outputdir" value="\LaunchConfigTestProject\temp_test_out_folder"/>
+<mapEntry key="outputdir" value="/LaunchConfigTestProject/temp_test_out_folder"/>
<mapEntry key="template_name" value="pojo/Pojo.ftl"/>
</mapAttribute>
<booleanAttribute key="org.hibernate.tools.jdk5" value="true"/>
@@ -106,7 +106,7 @@
<booleanAttribute key="org.hibernate.tools.reveng.detect_many_to_many" value="false"/>
<booleanAttribute key="org.hibernate.tools.reveng.detect_one_to_one" value="false"/>
<booleanAttribute key="org.hibernate.tools.reveng.detect_optimistc_lock" value="false"/>
-<stringAttribute key="org.hibernate.tools.revengfile" value="\qwert\src\hibernate.reveng.xml"/>
+<stringAttribute key="org.hibernate.tools.revengfile" value="/qwert/src/hibernate.reveng.xml"/>
<booleanAttribute key="org.hibernate.tools.schema2hbm" value="true"/>
<booleanAttribute key="org.hibernate.tools.useExternalProcess" value="true"/>
<booleanAttribute key="org.hibernate.tools.useOwnTemplates" value="false"/>
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_all_exporters_external.launch
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_all_exporters_external.launch 2010-11-29 11:00:12 UTC (rev 26999)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_all_exporters_external.launch 2010-11-29 14:53:24 UTC (rev 27000)
@@ -3,7 +3,7 @@
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.launching.remote.InternalAntRunner"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="\LaunchConfigTestProject2\build_2794024212908788293xml"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="/LaunchConfigTestProject2/build_2794024212908788293xml"/>
<stringAttribute key="org.hibernate.tools.configurationname" value="LaunchConfigTestProject2"/>
<booleanAttribute key="org.hibernate.tools.ejb3" value="false"/>
<listAttribute key="org.hibernate.tools.exporters">
@@ -34,11 +34,11 @@
<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.query.extension_id" value="org.hibernate.tools.query"/>
<mapAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.query.properties">
<mapEntry key="outputFileName" value="asdf.txt"/>
-<mapEntry key="outputdir" value="\LaunchConfigTestProject2\temp_test_out_folder_all_exporters_external"/>
+<mapEntry key="outputdir" value="/LaunchConfigTestProject2/temp_test_out_folder_all_exporters_external"/>
<mapEntry key="query_string" value="from org.jboss.seam.example.booking.Booking"/>
</mapAttribute>
<booleanAttribute key="org.hibernate.tools.jdk5" value="false"/>
-<stringAttribute key="org.hibernate.tools.outputdir" value="\LaunchConfigTestProject2\temp_test_out_folder_all_exporters_external"/>
+<stringAttribute key="org.hibernate.tools.outputdir" value="/LaunchConfigTestProject2/temp_test_out_folder_all_exporters_external"/>
<stringAttribute key="org.hibernate.tools.package" value="hsql"/>
<booleanAttribute key="org.hibernate.tools.prefercompositeids" value="true"/>
<booleanAttribute key="org.hibernate.tools.reveng.detect_many_to_many" value="true"/>
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_all_exporters_internal.launch
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_all_exporters_internal.launch 2010-11-29 11:00:12 UTC (rev 26999)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_all_exporters_internal.launch 2010-11-29 14:53:24 UTC (rev 27000)
@@ -3,7 +3,7 @@
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.launching.remote.InternalAntRunner"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="\LaunchConfigTestProject2\build_2794024212908788293xml"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="/LaunchConfigTestProject2/build_2794024212908788293xml"/>
<stringAttribute key="org.hibernate.tools.configurationname" value="LaunchConfigTestProject2"/>
<booleanAttribute key="org.hibernate.tools.ejb3" value="false"/>
<listAttribute key="org.hibernate.tools.exporters">
@@ -34,11 +34,11 @@
<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.query.extension_id" value="org.hibernate.tools.query"/>
<mapAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.query.properties">
<mapEntry key="outputFileName" value="asdf.txt"/>
-<mapEntry key="outputdir" value="\LaunchConfigTestProject2\temp_test_out_folder_all_exporters_internal"/>
+<mapEntry key="outputdir" value="/LaunchConfigTestProject2/temp_test_out_folder_all_exporters_internal"/>
<mapEntry key="query_string" value="from org.jboss.seam.example.booking.Booking"/>
</mapAttribute>
<booleanAttribute key="org.hibernate.tools.jdk5" value="false"/>
-<stringAttribute key="org.hibernate.tools.outputdir" value="\LaunchConfigTestProject2\temp_test_out_folder_all_exporters_internal"/>
+<stringAttribute key="org.hibernate.tools.outputdir" value="/LaunchConfigTestProject2/temp_test_out_folder_all_exporters_internal"/>
<stringAttribute key="org.hibernate.tools.package" value="hsql"/>
<booleanAttribute key="org.hibernate.tools.prefercompositeids" value="true"/>
<booleanAttribute key="org.hibernate.tools.reveng.detect_many_to_many" value="true"/>
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_external.launch
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_external.launch 2010-11-29 11:00:12 UTC (rev 26999)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_external.launch 2010-11-29 14:53:24 UTC (rev 27000)
@@ -3,7 +3,7 @@
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.launching.remote.InternalAntRunner"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="\LaunchConfigTestProject2\build_2794024212908788293xml"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="/LaunchConfigTestProject2/build_2794024212908788293xml"/>
<stringAttribute key="org.hibernate.tools.configurationname" value="LaunchConfigTestProject2"/>
<booleanAttribute key="org.hibernate.tools.ejb3" value="false"/>
<listAttribute key="org.hibernate.tools.exporters">
@@ -34,11 +34,11 @@
<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.query.extension_id" value="org.hibernate.tools.query"/>
<mapAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.query.properties">
<mapEntry key="outputFileName" value="asdf.txt"/>
-<mapEntry key="outputdir" value="\LaunchConfigTestProject2\temp_test_out_folder"/>
+<mapEntry key="outputdir" value="/LaunchConfigTestProject2/temp_test_out_folder"/>
<mapEntry key="query_string" value="from org.jboss.seam.example.booking.Booking"/>
</mapAttribute>
<booleanAttribute key="org.hibernate.tools.jdk5" value="false"/>
-<stringAttribute key="org.hibernate.tools.outputdir" value="\LaunchConfigTestProject2\temp_test_out_folder"/>
+<stringAttribute key="org.hibernate.tools.outputdir" value="/LaunchConfigTestProject2/temp_test_out_folder"/>
<stringAttribute key="org.hibernate.tools.package" value="hsql"/>
<booleanAttribute key="org.hibernate.tools.prefercompositeids" value="true"/>
<booleanAttribute key="org.hibernate.tools.reveng.detect_many_to_many" value="true"/>
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_internal.launch
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_internal.launch 2010-11-29 11:00:12 UTC (rev 26999)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_internal.launch 2010-11-29 14:53:24 UTC (rev 27000)
@@ -3,7 +3,7 @@
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.launching.remote.InternalAntRunner"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="\LaunchConfigTestProject2\build_2794024212908788293xml"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="/LaunchConfigTestProject2/build_2794024212908788293xml"/>
<stringAttribute key="org.hibernate.tools.configurationname" value="LaunchConfigTestProject2"/>
<booleanAttribute key="org.hibernate.tools.ejb3" value="false"/>
<listAttribute key="org.hibernate.tools.exporters">
@@ -34,11 +34,11 @@
<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.query.extension_id" value="org.hibernate.tools.query"/>
<mapAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.query.properties">
<mapEntry key="outputFileName" value="asdf.txt"/>
-<mapEntry key="outputdir" value="\LaunchConfigTestProject2\temp_test_out_folder"/>
+<mapEntry key="outputdir" value="/LaunchConfigTestProject2/temp_test_out_folder"/>
<mapEntry key="query_string" value="from org.jboss.seam.example.booking.Booking"/>
</mapAttribute>
<booleanAttribute key="org.hibernate.tools.jdk5" value="false"/>
-<stringAttribute key="org.hibernate.tools.outputdir" value="\LaunchConfigTestProject2\temp_test_out_folder"/>
+<stringAttribute key="org.hibernate.tools.outputdir" value="/LaunchConfigTestProject2/temp_test_out_folder"/>
<stringAttribute key="org.hibernate.tools.package" value="hsql"/>
<booleanAttribute key="org.hibernate.tools.prefercompositeids" value="true"/>
<booleanAttribute key="org.hibernate.tools.reveng.detect_many_to_many" value="true"/>
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/CodeGenExternalProcessExecutionTest.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/CodeGenExternalProcessExecutionTest.java 2010-11-29 11:00:12 UTC (rev 26999)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/CodeGenExternalProcessExecutionTest.java 2010-11-29 14:53:24 UTC (rev 27000)
@@ -81,23 +81,7 @@
consoleCfg.reset();
KnownConfigurations.getInstance().removeAllConfigurations();
consoleCfg = null;
- //
- Exception ex = null;
- for (int i = 0; i < 4; i++) {
- ex = null;
- try {
- this.project.deleteIProject();
- i = 4;
- } catch (Exception e) {
- ex = e;
- if (i < 3) {
- Thread.sleep(3000);
- }
- }
- }
- if (ex != null) {
- throw ex;
- }
+ this.project.deleteIProject();
this.project = null;
}
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/project/TestProject.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/project/TestProject.java 2010-11-29 11:00:12 UTC (rev 26999)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/project/TestProject.java 2010-11-29 14:53:24 UTC (rev 27000)
@@ -88,13 +88,27 @@
}
public void deleteIProject(boolean deleteContent) {
- try {
- IContainer container = project.getParent();
- project.delete(deleteContent, true, null);
- container.refreshLocal(IResource.DEPTH_ONE, null);
- } catch (CoreException ce) {
- throw new RuntimeException(ce);
+ Exception ex = null;
+ for (int i = 0; i < 4; i++) {
+ ex = null;
+ try {
+ IContainer container = project.getParent();
+ project.delete(deleteContent, true, null);
+ container.refreshLocal(IResource.DEPTH_ONE, null);
+ i = 4;
+ } catch (CoreException e) {
+ ex = e;
+ if (i < 3) {
+ try {
+ Thread.sleep(3000);
+ } catch (InterruptedException e1) {
+ }
+ }
+ }
}
+ if (ex != null) {
+ throw new RuntimeException(ex);
+ }
javaProject = null;
project = null;
}
14 years, 1 month
- 1
- 0
JBoss Tools SVN: r26999 - in trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core: server/xpl and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2010-11-29 06:00:12 -0500 (Mon, 29 Nov 2010)
New Revision: 26999
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractServerToolsPublisher.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/xpl/PublishCopyUtil.java
Log:
JBIDE-7186 - progress monitor fixes
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractServerToolsPublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractServerToolsPublisher.java 2010-11-29 10:58:15 UTC (rev 26998)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractServerToolsPublisher.java 2010-11-29 11:00:12 UTC (rev 26999)
@@ -24,6 +24,7 @@
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.SubProgressMonitor;
import org.eclipse.osgi.util.NLS;
import org.eclipse.wst.common.project.facet.core.util.internal.ProgressMonitorUtil;
import org.eclipse.wst.server.core.IModule;
@@ -64,6 +65,21 @@
this.publishState = state;
}
+ public static class CustomSubProgress extends SubProgressMonitor {
+ public CustomSubProgress(IProgressMonitor monitor, int ticks, int style) {
+ super(monitor, ticks, style);
+ }
+ public void beginTask(String name, int totalWork) {
+ super.beginTask(null, totalWork);
+ setTaskName(name);
+ }
+ }
+
+ public static IProgressMonitor getSubMon(IProgressMonitor parent, int ticks) {
+ IProgressMonitor subMon = new CustomSubProgress(parent, ticks, SubProgressMonitor.PREPEND_MAIN_LABEL_TO_SUBTASK);
+ return subMon;
+ }
+
public IStatus publishModule(IJBossServerPublishMethod method,
IServer server, IModule[] module, int publishType,
IModuleResourceDelta[] delta, IProgressMonitor monitor)
@@ -80,7 +96,7 @@
}
// Monitor at this point has been begun with 1000 monitor
- IProgressMonitor subMon = ProgressMonitorUtil.submon(monitor, 1000);
+ IProgressMonitor subMon = getSubMon(monitor, 1000);
if (publishType == REMOVE_PUBLISH ) {
status = unpublish(this.server, module, subMon);
} else {
@@ -142,11 +158,11 @@
}
protected IStatus fullPublish(IModule[] moduleTree, IModule module, IProgressMonitor monitor) throws CoreException {
- monitor.beginTask("Full Publish", 1000); //$NON-NLS-1$
+ monitor.beginTask("Full Publish: " + moduleTree[moduleTree.length-1].getName(), 1000); //$NON-NLS-1$
IPath deployPath = getDeployPath(moduleTree, server);
IPublishCopyCallbackHandler callback = getCallbackHandler(deployPath);
- IModuleResource[] members = PublishUtil.getResources(module, ProgressMonitorUtil.submon(monitor, 200));
+ IModuleResource[] members = PublishUtil.getResources(module, getSubMon(monitor, 200));
if( monitor.isCanceled())
return canceledStatus();
@@ -155,7 +171,7 @@
// if the module we're publishing is a project, not a binary, clean it's folder
//if( !(new Path(module.getName()).segmentCount() > 1 ))
if( !ServerModelUtilities.isBinaryModule(module))
- callback.deleteResource(new Path("/"), ProgressMonitorUtil.submon(monitor, 100)); //$NON-NLS-1$
+ callback.deleteResource(new Path("/"), getSubMon(monitor, 100)); //$NON-NLS-1$
if( monitor.isCanceled())
return canceledStatus();
@@ -167,10 +183,10 @@
if( !forceZip && !isBinaryObject) {
PublishCopyUtil util = new PublishCopyUtil(callback);
- list.addAll(Arrays.asList(util.initFullPublish(members, ProgressMonitorUtil.submon(monitor, 700))));
+ list.addAll(Arrays.asList(util.initFullPublish(members, getSubMon(monitor, 700))));
JSTPublisherXMLToucher.getInstance().touch(deployPath, module, callback);
} else if( isBinaryObject )
- list.addAll(Arrays.asList(copyBinaryModule(moduleTree, ProgressMonitorUtil.submon(monitor, 700))));
+ list.addAll(Arrays.asList(copyBinaryModule(moduleTree, getSubMon(monitor, 700))));
else {
// A child that must be zipped, forceZip is true
IPath deployRoot = JBossServerCorePlugin.getServerStateLocation(server.getServer()).
@@ -183,9 +199,9 @@
String root = (deployPath.getDevice() == null ? "" : deployPath.getDevice()) + "/"; //$NON-NLS-1$//$NON-NLS-2$
IPublishCopyCallbackHandler handler = getCallbackHandler(new Path(root));
String parentFolder = deployPath.removeLastSegments(1).toString();
- handler.makeDirectoryIfRequired(new Path(parentFolder), ProgressMonitorUtil.submon(monitor, 200));
+ handler.makeDirectoryIfRequired(new Path(parentFolder), getSubMon(monitor, 200));
ModuleFile mf = new ModuleFile(tempFile.toFile(), tempFile.lastSegment(), tempFile);
- handler.copyFile(mf, deployPath, ProgressMonitorUtil.submon(monitor, 500));
+ handler.copyFile(mf, deployPath, getSubMon(monitor, 500));
} catch( IOException ioe) {
list.add(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, ioe.getMessage(), ioe));
}
@@ -198,7 +214,7 @@
}
protected IStatus incrementalPublish(IModule[] moduleTree, IModule module, IProgressMonitor monitor) throws CoreException {
- monitor.beginTask("Incremental Publish", 100); //$NON-NLS-1$
+ monitor.beginTask("Incremental Publish: " + moduleTree[moduleTree.length-1].getName(), 100); //$NON-NLS-1$
IStatus[] results = new IStatus[] {};
IPath deployPath = getDeployPath(moduleTree, server);
boolean isBinaryObject = ServerModelUtilities.isBinaryModule(module);
@@ -206,10 +222,10 @@
IPublishCopyCallbackHandler handler = null;
if( !forceZip && !isBinaryObject) {
handler = getCallbackHandler(deployPath);
- results = new PublishCopyUtil(handler).publishDelta(delta, ProgressMonitorUtil.submon(monitor, 100));
+ results = new PublishCopyUtil(handler).publishDelta(delta, getSubMon(monitor, 100));
} else if( delta.length > 0 ) {
if( isBinaryObject)
- results = copyBinaryModule(moduleTree, ProgressMonitorUtil.submon(monitor, 100));
+ results = copyBinaryModule(moduleTree, getSubMon(monitor, 100));
else {
// forceZip a child module
IPath localDeployRoot = JBossServerCorePlugin.getServerStateLocation(server.getServer()).
@@ -220,9 +236,9 @@
PublishUtil.packModuleIntoJar(moduleTree[moduleTree.length-1], tempFile);
handler = getCallbackHandler(new Path("/")); //$NON-NLS-1$
String parentFolder = deployPath.removeLastSegments(1).toString();
- handler.makeDirectoryIfRequired(new Path(parentFolder), ProgressMonitorUtil.submon(monitor, 50));
+ handler.makeDirectoryIfRequired(new Path(parentFolder), getSubMon(monitor, 50));
ModuleFile mf = new ModuleFile(tempFile.toFile(), tempFile.lastSegment(), tempFile);
- handler.copyFile(mf, deployPath, ProgressMonitorUtil.submon(monitor, 50));
+ handler.copyFile(mf, deployPath, getSubMon(monitor, 50));
} catch( IOException ioe) {
IStatus s = new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, ioe.getMessage(), ioe);
results = new IStatus[] { s };
@@ -257,7 +273,7 @@
}
protected IStatus[] copyBinaryModule(IModule[] moduleTree, IProgressMonitor monitor) {
- monitor.beginTask("Copy Binary Module", 100); //$NON-NLS-1$
+ monitor.beginTask("Copying Child Module: " + moduleTree[moduleTree.length-1].getName(), 100); //$NON-NLS-1$
try {
IPath destinationPath = getDeployPath(moduleTree, server);
IModuleResource[] members = PublishUtil.getResources(moduleTree);
@@ -283,10 +299,10 @@
protected IStatus unpublish(IDeployableServer jbServer, IModule[] module,
IProgressMonitor monitor) throws CoreException {
- monitor.beginTask("Begin Unpublish", 100); //$NON-NLS-1$
+ monitor.beginTask("Removing Module: " + module[module.length-1].getName(), 100); //$NON-NLS-1$
IPath remotePath = getDeployPath(module, server);
IPublishCopyCallbackHandler handler = getCallbackHandler(new Path("/")); //$NON-NLS-1$
- handler.deleteResource(remotePath, ProgressMonitorUtil.submon(monitor, 100));
+ handler.deleteResource(remotePath, getSubMon(monitor, 100));
monitor.done();
return Status.OK_STATUS;
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/xpl/PublishCopyUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/xpl/PublishCopyUtil.java 2010-11-29 10:58:15 UTC (rev 26998)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/xpl/PublishCopyUtil.java 2010-11-29 11:00:12 UTC (rev 26999)
@@ -21,8 +21,6 @@
import java.util.Date;
import java.util.List;
-import javax.swing.ProgressMonitor;
-
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
@@ -43,6 +41,7 @@
import org.eclipse.wst.server.core.model.IModuleResource;
import org.eclipse.wst.server.core.model.IModuleResourceDelta;
import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
+import org.jboss.ide.eclipse.as.core.publishers.AbstractServerToolsPublisher;
import org.jboss.ide.eclipse.as.core.publishers.PublishUtil;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
/**
@@ -135,6 +134,7 @@
}
public IStatus[] copyFile(IModuleFile mf, IPath relativePath, IProgressMonitor monitor) throws CoreException {
+ monitor.beginTask("Copying " + relativePath.toString(), 100); //$NON-NLS-1$
File file = PublishUtil.getFile(mf);
shouldRestartModule |= checkRestartModule(file);
if( file != null ) {
@@ -146,6 +146,8 @@
NLS.bind(Messages.errorReading, file.getAbsolutePath()), e)};
}
IStatus ret = copyFile(in, deployRootFolder.append(relativePath), file.lastModified(), mf);
+ monitor.worked(100);
+ monitor.done();
if( ret != null && ret.isOK())
return new IStatus[] { ret };
} // else silently ignore I guess
@@ -376,7 +378,8 @@
monitor.worked(10);
} else if (current.isDirectory()) {
monitor.subTask(NLS.bind(Messages.deletingTask, new String[] {current.getAbsolutePath()}));
- IStatus[] stat = deleteDirectory(current, ProgressUtil.getSubMonitorFor(monitor, 10));
+ IStatus[] stat = deleteDirectory(current,
+ AbstractServerToolsPublisher.getSubMon(monitor, 10));
if (stat != null && stat.length > 0) {
deleteCurrent = false;
addArrayToList(status, stat);
@@ -559,7 +562,8 @@
monitor = ProgressUtil.getMonitorFor(monitor);
monitor.beginTask("Publishing " + count + " resources", //$NON-NLS-1$ //$NON-NLS-2$
(100 * (count)) + 200);
- handler.makeDirectoryIfRequired(new Path("/"), ProgressMonitorUtil.submon(monitor, 100)); //$NON-NLS-1$
+ handler.makeDirectoryIfRequired(new Path("/"), //$NON-NLS-1$
+ AbstractServerToolsPublisher.getSubMon(monitor, 100));
if( monitor.isCanceled())
return canceledStatus();
IStatus[] results = publishFull(resources, new Path("/"), monitor); //$NON-NLS-1$
@@ -592,7 +596,7 @@
IModuleResource[] children = folder.members();
if( children.length == 0 )
handler.makeDirectoryIfRequired(folder.getModuleRelativePath().append(folder.getName()),
- ProgressUtil.getSubMonitorFor(monitor, 5));
+ AbstractServerToolsPublisher.getSubMon(monitor, 5));
else {
IStatus[] stat = publishFull(children, path, monitor);
addArrayToList(status, stat);
@@ -605,7 +609,7 @@
addArrayToList(status, stats);
addArrayToList(status, handler.copyFile(mf, path,
- ProgressUtil.getSubMonitorFor(monitor, 100)));
+ AbstractServerToolsPublisher.getSubMon(monitor, 100)));
}
IStatus[] stat = new IStatus[status.size()];
status.toArray(stat);
14 years, 1 month
- 1
- 0