JBoss Tools SVN: r18350 - trunk/jsf/docs/userguide/en/modules.
by jbosstools-commits＠lists.jboss.org
Author: smukhina
Date: 2009-10-29 09:57:01 -0400 (Thu, 29 Oct 2009)
New Revision: 18350
Modified:
trunk/jsf/docs/userguide/en/modules/palette.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-886
described the changes basing on developer task and compared two palettes.
Modified: trunk/jsf/docs/userguide/en/modules/palette.xml
===================================================================
--- trunk/jsf/docs/userguide/en/modules/palette.xml 2009-10-29 13:45:54 UTC (rev 18349)
+++ trunk/jsf/docs/userguide/en/modules/palette.xml 2009-10-29 13:57:01 UTC (rev 18350)
@@ -58,11 +58,29 @@
</imageobject>
</mediaobject>
</figure>
- <para>By default the Palette is represented in Web Development Perspective with five groups. If
- you can't see it, select <emphasis>
- <property>Window > Show View Other... > JBoss Tools Web > JBoss
- Tools Palette</property>
- </emphasis> from the menu bar.</para>
+ <para> By default <property>JBoss Tools Palette</property> is not displayed. If you want to use it select
+ <emphasis><property>Window > Show View Other... > JBoss Tools Web > JBoss Tools
+ Palette</property></emphasis> from the menu bar. </para>
+ <para>The standard <property>Eclipse Palette</property> is displayed by default in both Web Development and Seam
+ perspectives. Now, the standard <property>Eclipse Palette</property> is featured with all <property>JBoss Tools Palette</property>
+ options and capabilities. </para>
+ <para>To open the standard <property>Eclipse Palette</property> navigate to <emphasis><property>Window->Show
+ View->Others->General->Palette</property></emphasis>. </para>
+ <para>The differences between the two palettes are as follows:</para>
+ <itemizedlist>
+ <listitem>
+ <para>The standard <property>Eclipse Palette</property> is blank by default; the content of the palette
+ is available only if Visual Page Editor is open and active, while JBoss Tools
+ Palette always contains a predefined set of components.</para>
+ </listitem>
+ <listitem>
+ <para>The Expanded/Collapsed state of components in the standard Eclipse Palette is
+ not global as in JBoss Tools Palette: the state is associated with an instance
+ of Visual Page Editor. It means that the state can be different for various
+ files, and each new file opened in Visual Page Editor will have the default
+ state of Palette with all components collapsed. </para>
+ </listitem>
+ </itemizedlist>
<section id="PaletteOptions">
<?dbhtml filename="PaletteOptions.html"?>
15 years, 1 month
- 1
- 0
JBoss Tools SVN: r18349 - in trunk/documentation/whatsnew: jst/images and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2009-10-29 09:45:54 -0400 (Thu, 29 Oct 2009)
New Revision: 18349
Added:
trunk/documentation/whatsnew/jst/images/javadocforel.jpg
Modified:
trunk/documentation/whatsnew/jst/jst-news-3.1.0.M4.html
trunk/documentation/whatsnew/seam/seam-news-3.1.0.M4.html
trunk/documentation/whatsnew/vpe/vpe-news-3.1.0.M4.html
Log:
What's new was updated
Added: trunk/documentation/whatsnew/jst/images/javadocforel.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/jst/images/javadocforel.jpg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/documentation/whatsnew/jst/jst-news-3.1.0.M4.html
===================================================================
--- trunk/documentation/whatsnew/jst/jst-news-3.1.0.M4.html 2009-10-29 13:43:36 UTC (rev 18348)
+++ trunk/documentation/whatsnew/jst/jst-news-3.1.0.M4.html 2009-10-29 13:45:54 UTC (rev 18349)
@@ -74,6 +74,20 @@
<tr>
<td colspan="2">
<hr />
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left"><a name="itemname3" id="itemname3"></a><b>Resource Bundle Content Assist</b></td>
+ <td valign="top">
+ <p>Content assist in template clients now includes proposals loaded from resource bundles declared in template.</p>
+ <p><small><a
+ href="https://jira.jboss.org/jira/browse/JBIDE-816">Related Jira</a></small></p>
+
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <hr />
<h3>CSS Style Editing</h3>
<hr />
</td>
@@ -99,7 +113,6 @@
<td valign="top" align="left"><a name="itemname3" id="itemname3"></a><b>Search EL references to Java Method or Property</b></td>
<td valign="top">
<ul>Find references and rename now supported through context menu or Ctr+Shift+G for:
- <li>Seam Context Variable's property/method</li>
<li>Manage Bean's property/method</li>
<li>JavaBean property/method</li>
<li>Message Bundle property</li>
@@ -134,6 +147,37 @@
<hr />
</td>
</tr>
+
+ <tr>
+ <td valign="top" align="left"><a name="itemname3" id="itemname3"></a><b>Content Navigation</b></td>
+ <td valign="top">
+ <p>Open-on now supports EL substitution to make it working even for strings with El inside</p>
+ <p><small><a
+ href="https://jira.jboss.org/jira/browse/JBIDE-2806">Related Jira</a></small></p>
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2">
+ <hr />
+ </td>
+ </tr>
+
+ <tr>
+ <td valign="top" align="left"><a name="itemname3" id="itemname3"></a><b>Content Navigation</b></td>
+ <td valign="top">
+ <p>Content assists for expression language shows hoovers with Java documentation</p>
+ <img src="images/javadocforel.jpg">
+ <p><small><a
+ href="https://jira.jboss.org/jira/browse/JBIDE-2806">Related Jira</a></small></p>
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2">
+ <hr />
+ </td>
+ </tr>
</table>
</body>
Modified: trunk/documentation/whatsnew/seam/seam-news-3.1.0.M4.html
===================================================================
--- trunk/documentation/whatsnew/seam/seam-news-3.1.0.M4.html 2009-10-29 13:43:36 UTC (rev 18348)
+++ trunk/documentation/whatsnew/seam/seam-news-3.1.0.M4.html 2009-10-29 13:45:54 UTC (rev 18349)
@@ -5,52 +5,82 @@
<head>
<meta http-equiv="Content-Language" content="en-us" />
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-<link rel="stylesheet" href="../whatsnew.css"/>
+<link rel="stylesheet" href="../whatsnew.css" />
<title>Seam tools 3.1.0.M4 What's New</title>
</head>
<body>
<h1>Seam tools 3.1.0.M4 What's New</h1>
-<p align="right"><a href="../index.html">< Main Index</a> <a href="../jst/jst-news-3.1.0.M4.html">JST/JSF Tools News ></a></p>
+<p align="right"><a href="../index.html">< Main Index</a> <a
+ href="../jst/jst-news-3.1.0.M4.html">JST/JSF Tools News ></a></p>
<table border="0" cellpadding="10" cellspacing="0" width="80%">
- <tr>
- <td colspan="2">
- <hr/>
- <h3>New Wizards</h3>
- <hr/>
- </td>
- </tr>
- <tr>
- <td valign="top" align="left">
- <p><b>Validation Improvements</b></p></td>
- <td valign="top">
- <p>Seam artifacts generation were improved. Now it warns if the resources are going to be created conflict with existing ones.</p>
+ <tr>
+ <td colspan="2">
+ <hr />
+ <h3>New Wizards</h3>
+ <hr />
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left">
+ <p><b>Validation Improvements</b></p>
+ </td>
+ <td valign="top">
+ <p>Seam artifacts generation were improved. Now it warns if the
+ resources are going to be created conflict with existing ones.</p>
- <p><small><a href="https://jira.jboss.org/jira/browse/JBIDE-4944">Related Jira</a></small></p>
- </td>
- </tr>
- <tr>
- <td colspan="2">
- <hr/>
- </td>
- </tr>
+ <p><small><a
+ href="https://jira.jboss.org/jira/browse/JBIDE-4944">Related Jira</a></small></p>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <hr />
+ </td>
+ </tr>
- <tr>
- <td valign="top" align="left">
- <p><b>New Seam 2 EJB Project Wizard</b></p></td>
- <td valign="top">
- <p>Now Seam EAR Project is created according Seam recommendation to use /lib directory in EAR. That helps to fix many issues related to JBoss AS classloaders. </p>
+ <tr>
+ <td valign="top" align="left">
+ <p><b>New Seam 2 EJB Project Wizard</b></p>
+ </td>
+ <td valign="top">
+ <p>Now Seam EAR Project is created according Seam recommendation
+ to use /lib directory in EAR. That helps to fix many issues related to
+ JBoss AS classloaders.</p>
- <p><small><a href="https://jira.jboss.org/jira/browse/JBIDE-4136">Related Jira</a></small></p>
- </td>
- </tr>
- <tr>
- <td colspan="2">
- <hr/>
- </td>
- </tr>
-
+ <p><small><a
+ href="https://jira.jboss.org/jira/browse/JBIDE-4136">Related Jira</a></small></p>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <hr />
+ <h3>Refactoring</h3>
+ <hr />
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left">
+ <p><b>Rename action for Seam Components/Methods/Properties</b></p>
+ </td>
+ <td valign="top">
+ <p>Rename action for Seam Components/Methods/Properties also shows
+ all resources that has references renamed element in EL</p>
+ <p>Rename actions are available:</p>
+ <ul>
+ <li>from context menu on a Seam component inside Seam Components View</li>
+ <li style="FONT-FAMILY: 'AlArabiya';">from context menu on a method/property in Java Source editor</li>
+ </ul>
+ <p><small><a
+ href="https://jira.jboss.org/jira/browse/JBIDE-4856">Related Jira</a></small></p>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <hr />
+ </td>
+ </tr>
</table>
</body>
Modified: trunk/documentation/whatsnew/vpe/vpe-news-3.1.0.M4.html
===================================================================
--- trunk/documentation/whatsnew/vpe/vpe-news-3.1.0.M4.html 2009-10-29 13:43:36 UTC (rev 18348)
+++ trunk/documentation/whatsnew/vpe/vpe-news-3.1.0.M4.html 2009-10-29 13:45:54 UTC (rev 18349)
@@ -17,35 +17,34 @@
<tr>
<td colspan="2">
<hr />
- <h3>JSF2 Composite UI Components Support</h3>
+ <h3>General</h3>
<hr />
</td>
</tr>
+
<tr>
- <td valign="top" align="left"><a name="itemname3" id="itemname3"></a><b>Composite UI Component Rendering</b></td>
- <td valign="top"><p>Visual Editor can render Composite UI components from CLASSPATH jar's an Web root 'resources' folder.</p>
- <p>It also supports rendering for parameters in custom tags.</p>
+ <td valign="top" align="left"><a name="itemname3" id="itemname3"></a><b>XULRunner
+ 1.9</b></td>
+ <td valign="top">
+ <p>Now Visual Editor based on Mozilla Xulrunner 1.9.1.2</p>
- <p><img src="images/jsf2composition1.png"/></p>
-
<p><small><a
- href="https://jira.jboss.org/jira/browse/JBIDE-5091">Related Jira</a></small></p>
+ href="https://jira.jboss.org/jira/browse/JBIDE-2248">Related Jira</a></small></p>
</td>
</tr>
-
<tr>
<td colspan="2">
<hr />
- <h3>General</h3>
- <hr />
</td>
</tr>
<tr>
- <td valign="top" align="left"><a name="itemname3" id="itemname3"></a><b>Selection bar</b></td>
+ <td valign="top" align="left"><a name="itemname3" id="itemname3"></a><b>Selection
+ bar</b></td>
<td valign="top">
- <p>Selection bar now always shows all tags in selected nodes hierarchy, so you can iterate it back and forth.</p>
+ <p>Selection bar now always shows all tags in selected nodes
+ hierarchy, so you can iterate it back and forth.</p>
- <p><img src="images/selection-bar1.png"/></p>
+ <p><img src="images/selection-bar1.png" /></p>
<p><small><a
href="https://jira.jboss.org/jira/browse/JBIDE-4945">Related Jira</a></small></p>
@@ -57,7 +56,8 @@
</td>
</tr>
<tr>
- <td valign="top" align="left"><a name="itemname3" id="itemname3"></a><b>Internal toolbar</b></td>
+ <td valign="top" align="left"><a name="itemname3" id="itemname3"></a><b>Internal
+ toolbar</b></td>
<td valign="top">
<p>Visual editor toolbar was extended by three new tools:</p>
<ul>
@@ -73,12 +73,35 @@
<tr>
<td colspan="2">
<hr />
+ <h3>JSF2 Composite UI Components Support</h3>
+ <hr />
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left"><a name="itemname3" id="itemname3"></a><b>Composite
+ UI Component Rendering</b></td>
+ <td valign="top">
+ <p>Visual Editor can render Composite UI components from CLASSPATH
+ jar's an Web root 'resources' folder.</p>
+ <p>It also supports rendering for parameters in custom tags.</p>
+
+ <p><img src="images/jsf2composition1.png" /></p>
+
+ <p><small><a
+ href="https://jira.jboss.org/jira/browse/JBIDE-5091">Related Jira</a></small></p>
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2">
+ <hr />
<h3>Facelets</h3>
<hr />
</td>
</tr>
<tr>
- <td valign="top" align="left"><a name="itemname3" id="itemname3"></a><b>Facelets taglib import to Palette</b></td>
+ <td valign="top" align="left"><a name="itemname3" id="itemname3"></a><b>Facelets
+ taglib import to Palette</b></td>
<td valign="top">
<p>Now Facelets taglib can be imported to Palette View</p>
15 years, 1 month
- 1
- 0
JBoss Tools SVN: r18348 - in trunk/hibernatetools/plugins: org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2009-10-29 09:43:36 -0400 (Thu, 29 Oct 2009)
New Revision: 18348
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.properties
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingFilePage.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5052
Set warning
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.properties
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.properties 2009-10-29 13:42:40 UTC (rev 18347)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.properties 2009-10-29 13:43:36 UTC (rev 18348)
@@ -199,7 +199,7 @@
NewHibernateMappingFilePage_file_name_column=File name
NewHibernateMappingFilePage_hibernate_xml_mapping_file=Hibernate XML Mapping file
NewHibernateMappingFilePage_project_name_column=Project name
-NewHibernateMappingFilePage_this_wizard_creates=This wizard creates a new Hibernate XML Mapping file
+NewHibernateMappingFilePage_this_wizard_creates=This wizard creates a new Hibernate XML Mapping file skeletons
NewHibernateMappingFileWizard_create_hibernate_xml_mapping_file=Create Hibernate XML Mapping file (hbm.xml)
NewHibernateMappingFileWizard_create_new_xml_mapping_file=Create new XML Mapping files.
NewHibernateMappingFileWizard_finding_dependent_cu=Search for dependent compilation units...
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingFilePage.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingFilePage.java 2009-10-29 13:42:40 UTC (rev 18347)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingFilePage.java 2009-10-29 13:43:36 UTC (rev 18348)
@@ -56,7 +56,7 @@
protected NewHibernateMappingFilePage() {
super(""); //$NON-NLS-1$
setTitle(HibernateConsoleMessages.NewHibernateMappingFilePage_hibernate_xml_mapping_file);
- setDescription(HibernateConsoleMessages.NewHibernateMappingFilePage_this_wizard_creates);
+ setMessage(HibernateConsoleMessages.NewHibernateMappingFilePage_this_wizard_creates, WARNING);
}
public void createControl(Composite parent) {
15 years, 1 month
- 1
- 0
JBoss Tools SVN: r18347 - trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2009-10-29 09:42:40 -0400 (Thu, 29 Oct 2009)
New Revision: 18347
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/JdtUiMessages.properties
Log:
Set right message
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/JdtUiMessages.properties
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/JdtUiMessages.properties 2009-10-29 12:49:22 UTC (rev 18346)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/JdtUiMessages.properties 2009-10-29 13:42:40 UTC (rev 18347)
@@ -46,4 +46,4 @@
AddRemoveTableComposite_java_select_types=Select types to be mapped
AddRemoveTableComposite_java_select_packages=Select packages to search for java types
NewHibernateMappingElementsSelectionPage2_description=Add classes and packages to create mapping files for
-NewHibernateMappingElementsSelectionPage2_createEmpty=fix_to_make_sources_in_trunk_compilable
\ No newline at end of file
+NewHibernateMappingElementsSelectionPage2_createEmpty=Create empty file (hbm.xml)
\ No newline at end of file
15 years, 1 month
- 1
- 0
JBoss Tools SVN: r18346 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2009-10-29 08:49:22 -0400 (Thu, 29 Oct 2009)
New Revision: 18346
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5107, check if the visual editor could be null was added.
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java 2009-10-29 01:10:48 UTC (rev 18345)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java 2009-10-29 12:49:22 UTC (rev 18346)
@@ -1167,7 +1167,9 @@
/*
* Update MozillaEditor's toolbar items
*/
- visualEditor.updateToolbarItemsAccordingToPreferences();
+ if (visualEditor != null) {
+ visualEditor.updateToolbarItemsAccordingToPreferences();
+ }
/*
* When switching from Source view to Visual/Source controller could be null.
*/
15 years, 1 month
- 1
- 0
JBoss Tools SVN: r18345 - in trunk/as/plugins/org.jboss.ide.eclipse.as.ssh: src/org/jboss/ide/eclipse/as/ssh/server and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-10-28 21:10:48 -0400 (Wed, 28 Oct 2009)
New Revision: 18345
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/plugin.xml
trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/server/SSHPackagesPublisher.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/ui/editor/SSHDeploymentModuleTab.java
Log:
JBIDE-5048 - step something, trying to get project archives to publish remotely
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/plugin.xml 2009-10-29 00:14:48 UTC (rev 18344)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/plugin.xml 2009-10-29 01:10:48 UTC (rev 18345)
@@ -78,6 +78,11 @@
priority="3"
zipDelegate="false">
</publisher>
+ <publisher
+ class="org.jboss.ide.eclipse.as.ssh.server.SSHPackagesPublisher"
+ priority="3"
+ zipDelegate="false">
+ </publisher>
</extension>
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/server/SSHPackagesPublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/server/SSHPackagesPublisher.java 2009-10-29 00:14:48 UTC (rev 18344)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/server/SSHPackagesPublisher.java 2009-10-29 01:10:48 UTC (rev 18345)
@@ -71,6 +71,7 @@
statuses.addAll(Arrays.asList(publishModule(module2, true, monitor)));
}
}catch(Exception e) {
+ e.printStackTrace();
IStatus status = new Status(IStatus.ERROR, IntegrationPlugin.PLUGIN_ID,
NLS.bind(Messages.ErrorDuringPublish, module2.getName()), e);
return status;
@@ -115,16 +116,17 @@
IPath remoteRoot = new Path(remoteContainer).append(sourcePath.lastSegment());
try {
- if( incremental ) {
- IModuleResource[] members = PublishUtil.getResources(module);
- SSHCopyCallback callback = new SSHCopyCallback(remoteRoot, method);
- PublishCopyUtil util = new PublishCopyUtil(callback);
- return util.publishDelta(delta, monitor);
+ if( !pack.isExploded() ) {
+ // copy the output file
+ SSHZippedJSTPublisher.launchCommand(method.getSession(), "rm -rf " + remoteRoot.toString(), monitor);
+ SSHZippedJSTPublisher.launchCopyCommand(method.getSession(), sourcePath.toOSString(), remoteRoot.toString(), monitor);
} else {
- if( !pack.isExploded() ) {
- // copy the output file
- SSHZippedJSTPublisher.launchCopyCommand(method.getSession(), sourcePath.toOSString(), remoteRoot.toString(), monitor);
+ if( incremental ) {
+ SSHCopyCallback callback = new SSHCopyCallback(remoteRoot, method);
+ PublishCopyUtil util = new PublishCopyUtil(callback);
+ return util.publishDelta(delta, monitor);
} else {
+ SSHZippedJSTPublisher.launchCommand(method.getSession(), "rm -rf " + remoteRoot.toString(), monitor);
IModuleResource[] members = PublishUtil.getResources(module);
SSHCopyCallback callback = new SSHCopyCallback(remoteRoot, method);
PublishCopyUtil util = new PublishCopyUtil(callback);
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/ui/editor/SSHDeploymentModuleTab.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/ui/editor/SSHDeploymentModuleTab.java 2009-10-29 00:14:48 UTC (rev 18344)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/ui/editor/SSHDeploymentModuleTab.java 2009-10-29 01:10:48 UTC (rev 18345)
@@ -64,8 +64,6 @@
}
public Control createControl(Composite parent) {
- helper = new ServerAttributeHelper(page.getServer().getOriginal(), page.getServer());
-
Composite random = new Composite(parent, SWT.NONE);
GridData randomData = new GridData(GridData.FILL_BOTH);
random.setLayoutData(randomData);
@@ -82,7 +80,6 @@
private Text userText, passText, deployText, hostsFileText;
private ModifyListener userListener, passListener, deployListener, hostsListener;
- private ServerAttributeHelper helper;
private Button zipDeployWTPProjects, browseHostsFileButton;
private SelectionListener zipListener, browseHostsButtonListener;
@@ -241,6 +238,10 @@
}
}
+ protected ServerAttributeHelper getHelper() {
+ return new ServerAttributeHelper(page.getServer().getOriginal(), page.getServer());
+ }
+
public class SetPropertyCommand extends ServerCommand {
protected String oldDir;
protected String newDir;
@@ -253,15 +254,15 @@
this.newDir = text.getText();
this.listener = listener;
this.attribute = attribute;
- this.oldDir = helper.getAttribute(attribute, ""); //$NON-NLS-1$
+ this.oldDir = getHelper().getAttribute(attribute, ""); //$NON-NLS-1$
}
public void execute() {
- helper.setAttribute(attribute, newDir);
+ getHelper().setAttribute(attribute, newDir);
page.getSaveStatus();
}
public void undo() {
text.removeModifyListener(listener);
- helper.setAttribute(attribute, oldDir);
+ getHelper().setAttribute(attribute, oldDir);
text.setText(oldDir);
text.addModifyListener(listener);
page.getSaveStatus();
@@ -301,17 +302,17 @@
boolean newVal;
public SetZipCommand() {
super(page.getServer(), Messages.EditorZipDeployments);
- oldVal = helper.getAttribute(ISSHDeploymentConstants.ZIP_DEPLOYMENTS_PREF, false);
+ oldVal = getHelper().getAttribute(ISSHDeploymentConstants.ZIP_DEPLOYMENTS_PREF, false);
newVal = zipDeployWTPProjects.getSelection();
}
public void execute() {
- helper.setAttribute(ISSHDeploymentConstants.ZIP_DEPLOYMENTS_PREF, newVal);
+ getHelper().setAttribute(ISSHDeploymentConstants.ZIP_DEPLOYMENTS_PREF, newVal);
page.getSaveStatus();
}
public void undo() {
zipDeployWTPProjects.removeSelectionListener(zipListener);
zipDeployWTPProjects.setSelection(oldVal);
- helper.setAttribute(ISSHDeploymentConstants.ZIP_DEPLOYMENTS_PREF, oldVal);
+ getHelper().setAttribute(ISSHDeploymentConstants.ZIP_DEPLOYMENTS_PREF, oldVal);
zipDeployWTPProjects.addSelectionListener(zipListener);
page.getSaveStatus();
}
@@ -320,7 +321,7 @@
private boolean getZipsSSHDeployments() {
- return helper.getAttribute(ISSHDeploymentConstants.ZIP_DEPLOYMENTS_PREF, false);
+ return getHelper().getAttribute(ISSHDeploymentConstants.ZIP_DEPLOYMENTS_PREF, false);
}
private IDeployableServer getServer() {
15 years, 1 month
- 1
- 0
JBoss Tools SVN: r18344 - in trunk/as/plugins: org.jboss.ide.eclipse.as.ssh/META-INF and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-10-28 20:14:48 -0400 (Wed, 28 Oct 2009)
New Revision: 18344
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/server/SSHPackagesPublisher.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/events/IEventCodes.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/META-INF/MANIFEST.MF
trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/SSHDeploymentPlugin.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/server/ISSHDeploymentConstants.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/server/SSHPublishUtil.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/server/SSHPublisher.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/server/SSHServerBehaviourDelegate.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/server/SSHServerDelegate.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/server/SSHServerRuntime.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/server/SSHSingleFilePublisher.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/server/SSHZippedJSTPublisher.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/ui/editor/DeploymentPage.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/ui/editor/SSHDeploymentModuleTab.java
Log:
Headers and some cleanup / error handling
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/events/IEventCodes.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/events/IEventCodes.java 2009-10-28 22:39:10 UTC (rev 18343)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/events/IEventCodes.java 2009-10-29 00:14:48 UTC (rev 18344)
@@ -40,6 +40,7 @@
// Publishing
public static final int PUBLISHING_ROOT_CODE = PUBLISHING_CODE | (1 << 16);
+ public static final int SSH_PUBLISHING_ROOT_CODE = PUBLISHING_CODE | (1 << 15);
public static final int JST_PUBLISHER_CODE = PUBLISHING_CODE | (2 << 16);
public static final int SINGLE_FILE_PUBLISHER_CODE = PUBLISHING_CODE | (3 << 16);
public static final int ADD_DEPLOYMENT_FOLDER = PUBLISHING_CODE | (4<<16);
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/META-INF/MANIFEST.MF
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/META-INF/MANIFEST.MF 2009-10-28 22:39:10 UTC (rev 18343)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/META-INF/MANIFEST.MF 2009-10-29 00:14:48 UTC (rev 18344)
@@ -6,21 +6,22 @@
Bundle-Activator: org.jboss.ide.eclipse.as.ssh.SSHDeploymentPlugin
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
- com.jcraft.jsch;bundle-version="0.1.41",
- org.eclipse.jsch.core;bundle-version="1.1.100",
- org.eclipse.jsch.ui;bundle-version="1.1.200",
- org.eclipse.wst.server.core;bundle-version="1.1.102",
- org.eclipse.wst.server.ui;bundle-version="1.1.103",
- org.eclipse.jst.jee;bundle-version="1.0.201",
- org.eclipse.jst.j2ee;bundle-version="1.1.301",
- org.eclipse.jst.j2ee.core;bundle-version="1.1.301",
- org.eclipse.jst.server.core;bundle-version="1.2.0",
- org.jboss.ide.eclipse.as.core;bundle-version="1.0.0",
- org.eclipse.debug.core;bundle-version="3.5.0",
- org.eclipse.wst.common.emfworkbench.integration;bundle-version="1.1.301",
- org.eclipse.jem.util;bundle-version="2.0.200",
- org.jboss.ide.eclipse.archives.webtools;bundle-version="1.0.0",
- org.jboss.ide.eclipse.as.ui;bundle-version="1.0.0",
- org.eclipse.ui.forms;bundle-version="3.4.1"
+ com.jcraft.jsch,
+ org.eclipse.jsch.core,
+ org.eclipse.jsch.ui,
+ org.eclipse.wst.server.core,
+ org.eclipse.wst.server.ui,
+ org.eclipse.jst.jee,
+ org.eclipse.jst.j2ee,
+ org.eclipse.jst.j2ee.core,
+ org.eclipse.jst.server.core,
+ org.jboss.ide.eclipse.as.core,
+ org.eclipse.debug.core,
+ org.eclipse.wst.common.emfworkbench.integration,
+ org.eclipse.jem.util,
+ org.jboss.ide.eclipse.archives.webtools,
+ org.jboss.ide.eclipse.as.ui,
+ org.eclipse.ui.forms,
+ org.jboss.ide.eclipse.archives.core;bundle-version="2.0.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/SSHDeploymentPlugin.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/SSHDeploymentPlugin.java 2009-10-28 22:39:10 UTC (rev 18343)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/SSHDeploymentPlugin.java 2009-10-29 00:14:48 UTC (rev 18344)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.ide.eclipse.as.ssh;
import org.eclipse.ui.plugin.AbstractUIPlugin;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/server/ISSHDeploymentConstants.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/server/ISSHDeploymentConstants.java 2009-10-28 22:39:10 UTC (rev 18343)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/server/ISSHDeploymentConstants.java 2009-10-29 00:14:48 UTC (rev 18344)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.ide.eclipse.as.ssh.server;
public interface ISSHDeploymentConstants {
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/server/SSHPackagesPublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/server/SSHPackagesPublisher.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/server/SSHPackagesPublisher.java 2009-10-29 00:14:48 UTC (rev 18344)
@@ -0,0 +1,147 @@
+package org.jboss.ide.eclipse.as.ssh.server;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.MultiStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.wst.server.core.IModule;
+import org.eclipse.wst.server.core.IServer;
+import org.eclipse.wst.server.core.internal.Server;
+import org.eclipse.wst.server.core.model.IModuleResource;
+import org.eclipse.wst.server.core.model.IModuleResourceDelta;
+import org.jboss.ide.eclipse.archives.core.model.IArchive;
+import org.jboss.ide.eclipse.archives.webtools.IntegrationPlugin;
+import org.jboss.ide.eclipse.archives.webtools.Messages;
+import org.jboss.ide.eclipse.archives.webtools.modules.PackageModuleFactory;
+import org.jboss.ide.eclipse.archives.webtools.modules.PackageModuleFactory.PackagedModuleDelegate;
+import org.jboss.ide.eclipse.as.core.publishers.PublishUtil;
+import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
+import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethod;
+import org.jboss.ide.eclipse.as.core.server.IJBossServerPublisher;
+import org.jboss.ide.eclipse.as.core.server.xpl.PublishCopyUtil;
+import org.jboss.ide.eclipse.as.core.util.ServerConverter;
+import org.jboss.ide.eclipse.as.ssh.server.SSHPublisher.SSHCopyCallback;
+import org.jboss.ide.eclipse.as.ssh.server.SSHServerBehaviourDelegate.SSHPublishMethod;
+
+public class SSHPackagesPublisher implements IJBossServerPublisher {
+
+ protected IDeployableServer server;
+ protected IModuleResourceDelta[] delta;
+ protected ArrayList<IStatus> statuses = new ArrayList<IStatus>();
+ protected SSHPublishMethod method;
+ public SSHPackagesPublisher() {
+ }
+
+ public int getPublishState() {
+ return IServer.PUBLISH_STATE_NONE;
+ }
+
+ public boolean accepts(String method, IServer server, IModule[] module) {
+ if( SSHPublishMethod.SSH_PUBLISH_METHOD.equals(method) && module != null && module.length > 0
+ && PackageModuleFactory.MODULE_TYPE.equals(module[0].getModuleType().getId()))
+ return true;
+ return false;
+ }
+ public IStatus publishModule(
+ IJBossServerPublishMethod method,
+ IServer server, IModule[] module,
+ int publishType, IModuleResourceDelta[] delta,
+ IProgressMonitor monitor)
+ throws CoreException {
+ this.method = (SSHPublishMethod)method;
+ this.server = ServerConverter.getDeployableServer(server);
+ this.delta = delta;
+ IModule module2 = module[0];
+
+ try {
+ // if it's being removed
+ if( publishType == REMOVE_PUBLISH ) {
+ statuses.addAll(Arrays.asList(removeModule(module2, monitor)));
+ } else if( publishType == FULL_PUBLISH ) {
+ statuses.addAll(Arrays.asList(publishModule(module2, false, monitor)));
+ } else if( publishType == INCREMENTAL_PUBLISH ) {
+ statuses.addAll(Arrays.asList(publishModule(module2, true, monitor)));
+ }
+ }catch(Exception e) {
+ IStatus status = new Status(IStatus.ERROR, IntegrationPlugin.PLUGIN_ID,
+ NLS.bind(Messages.ErrorDuringPublish, module2.getName()), e);
+ return status;
+ }
+
+ if( statuses.size() > 0 ) {
+ MultiStatus ms = new MultiStatus(IntegrationPlugin.PLUGIN_ID, IStatus.ERROR,
+ NLS.bind(Messages.ErrorDuringPublish, module2.getName()), null);
+ for( int i = 0; i < statuses.size(); i++ ) {
+ ms.add(statuses.get(i));
+ }
+ return ms;
+ }
+
+ IStatus ret = new Status(IStatus.OK, IntegrationPlugin.PLUGIN_ID,
+ NLS.bind(Messages.PublishSuccessful, module2.getName()));
+ return ret;
+ }
+
+ protected IStatus[] removeModule(IModule module, IProgressMonitor monitor) {
+ IArchive pack = getPackage(module);
+ // remove all of the deployed items
+ if( pack != null ) {
+ IPath sourcePath = pack.getArchiveFilePath();
+ String deployFolder = getRemoteDeployFolder(server.getServer());
+ String deployFile = new Path(deployFolder).append(sourcePath.lastSegment()).toString();
+ try {
+ SSHZippedJSTPublisher.launchRemoveCommand(method.getSession(), deployFile, monitor);
+ } catch( CoreException ce ) {
+ return new IStatus[] { ce.getStatus() };
+ }
+ }
+ return new IStatus[] { }; // nothing to report
+ }
+
+
+
+ protected IStatus[] publishModule(IModule module, boolean incremental, IProgressMonitor monitor) {
+ IArchive pack = getPackage(module);
+ IPath sourcePath = pack.getArchiveFilePath();
+ String remoteContainer = getRemoteDeployFolder(server.getServer());
+ IPath remoteRoot = new Path(remoteContainer).append(sourcePath.lastSegment());
+
+ try {
+ if( incremental ) {
+ IModuleResource[] members = PublishUtil.getResources(module);
+ SSHCopyCallback callback = new SSHCopyCallback(remoteRoot, method);
+ PublishCopyUtil util = new PublishCopyUtil(callback);
+ return util.publishDelta(delta, monitor);
+ } else {
+ if( !pack.isExploded() ) {
+ // copy the output file
+ SSHZippedJSTPublisher.launchCopyCommand(method.getSession(), sourcePath.toOSString(), remoteRoot.toString(), monitor);
+ } else {
+ IModuleResource[] members = PublishUtil.getResources(module);
+ SSHCopyCallback callback = new SSHCopyCallback(remoteRoot, method);
+ PublishCopyUtil util = new PublishCopyUtil(callback);
+ return util.publishFull(members, monitor);
+ }
+ }
+ } catch( CoreException ce ) {
+ return new IStatus[] { ce.getStatus() };
+ }
+ return new IStatus[] { };
+ }
+
+ protected IArchive getPackage(IModule module) {
+ PackagedModuleDelegate delegate = (PackagedModuleDelegate)module.loadAdapter(PackagedModuleDelegate.class, new NullProgressMonitor());
+ return delegate == null ? null : delegate.getPackage();
+ }
+ protected String getRemoteDeployFolder(IServer server) {
+ return ((Server)server).getAttribute(ISSHDeploymentConstants.DEPLOY_DIRECTORY, (String)null);
+ }
+}
\ No newline at end of file
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/server/SSHPublishUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/server/SSHPublishUtil.java 2009-10-28 22:39:10 UTC (rev 18343)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/server/SSHPublishUtil.java 2009-10-29 00:14:48 UTC (rev 18344)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.ide.eclipse.as.ssh.server;
import org.eclipse.wst.server.core.IServer;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/server/SSHPublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/server/SSHPublisher.java 2009-10-28 22:39:10 UTC (rev 18343)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/server/SSHPublisher.java 2009-10-29 00:14:48 UTC (rev 18344)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.ide.eclipse.as.ssh.server;
import java.io.File;
@@ -106,7 +116,7 @@
ArrayList<IStatus> list = new ArrayList<IStatus>();
if( !PublishUtil.deployPackaged(moduleTree) && !PublishUtil.isBinaryObject(moduleTree)) {
- SSHCopyCallback callback = new SSHCopyCallback(remoteDeployPath);
+ SSHCopyCallback callback = new SSHCopyCallback(remoteDeployPath, publishMethod);
PublishCopyUtil util = new PublishCopyUtil(callback);
list.addAll(Arrays.asList(util.publishFull(members, monitor)));
}
@@ -121,7 +131,7 @@
list.addAll(Arrays.asList(PublishUtil.packModuleIntoJar(moduleTree[moduleTree.length-1], tempFile)));
mkdirAndCopy(publishMethod.getSession(), tempFile.toString(), remoteDeployPath.toString());
} catch( IOException ioe) {
- // TODO error handling
+ list.add(new Status(IStatus.ERROR, SSHDeploymentPlugin.PLUGIN_ID, ioe.getMessage(), ioe));
}
}
@@ -134,21 +144,22 @@
IStatus[] results = new IStatus[] {};
IPath remoteDeployPath = getDeployPath(moduleTree, server);
if( !PublishUtil.deployPackaged(moduleTree) && !PublishUtil.isBinaryObject(moduleTree)) {
- SSHCopyCallback handler = new SSHCopyCallback(remoteDeployPath);
+ SSHCopyCallback handler = new SSHCopyCallback(remoteDeployPath, publishMethod);
results = new PublishCopyUtil(handler).publishDelta(delta, monitor);
} else if( delta.length > 0 ) {
if( PublishUtil.isBinaryObject(moduleTree))
results = copyBinaryModule(moduleTree, monitor);
else {
IPath localDeployRoot = JBossServerCorePlugin.getServerStateLocation(server.getServer()).
- append(IJBossServerConstants.DEPLOY).makeAbsolute();
+ append(IJBossServerConstants.DEPLOY).makeAbsolute();
try {
File temp = localDeployRoot.toFile().createTempFile(module.getName(), ".tmp", localDeployRoot.toFile());
IPath tempFile = new Path(temp.getAbsolutePath());
PublishUtil.packModuleIntoJar(moduleTree[moduleTree.length-1], tempFile);
mkdirAndCopy(publishMethod.getSession(), tempFile.toString(), remoteDeployPath.toString());
} catch( IOException ioe) {
- // TODO error handling
+ IStatus s = new Status(IStatus.ERROR, SSHDeploymentPlugin.PLUGIN_ID, ioe.getMessage(), ioe);
+ results = new IStatus[] { s };
}
}
}
@@ -216,25 +227,27 @@
SSHZippedJSTPublisher.launchCopyCommand(session, localFile, remoteFile, new NullProgressMonitor());
}
- public class SSHCopyCallback implements IPublishCopyCallbackHandler {
+ public static class SSHCopyCallback implements IPublishCopyCallbackHandler {
- private IPath deployRoot;
- public SSHCopyCallback(IPath deployRoot) {
- this.deployRoot = deployRoot;
+ private IPath root;
+ private SSHPublishMethod method;
+ public SSHCopyCallback(IPath deployRoot, SSHPublishMethod method) {
+ this.root = deployRoot;
+ this.method = method;
}
public IStatus[] copyFile(IModuleFile mf, IPath path,
IProgressMonitor monitor) throws CoreException {
File sourceFile = PublishUtil.getFile(mf);
- IPath destination = deployRoot.append(path);
- mkdirAndCopy(publishMethod.getSession(), sourceFile.getAbsolutePath(), destination.toString());
+ IPath destination = root.append(path);
+ mkdirAndCopy(method.getSession(), sourceFile.getAbsolutePath(), destination.toString());
return new IStatus[]{};
}
public IStatus[] deleteResource(IPath path, IProgressMonitor monitor) {
- IPath remotePath = deployRoot.append(path);
+ IPath remotePath = root.append(path);
try {
- SSHZippedJSTPublisher.launchCommand(publishMethod.getSession(), "rm -rf " + remotePath.toString(), monitor);
+ SSHZippedJSTPublisher.launchCommand(method.getSession(), "rm -rf " + remotePath.toString(), monitor);
} catch( CoreException ce ) {
return new IStatus[]{ce.getStatus()};
}
@@ -242,9 +255,9 @@
}
public IStatus[] makeDirectoryIfRequired(IPath dir, IProgressMonitor monitor) {
- IPath remotePath = deployRoot.append(dir);
+ IPath remotePath = root.append(dir);
try {
- SSHZippedJSTPublisher.launchCommand(publishMethod.getSession(), "mkdir -p " + remotePath.toString(), monitor);
+ SSHZippedJSTPublisher.launchCommand(method.getSession(), "mkdir -p " + remotePath.toString(), monitor);
} catch( CoreException ce ) {
return new IStatus[]{ce.getStatus()};
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/server/SSHServerBehaviourDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/server/SSHServerBehaviourDelegate.java 2009-10-28 22:39:10 UTC (rev 18343)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/server/SSHServerBehaviourDelegate.java 2009-10-29 00:14:48 UTC (rev 18344)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.ide.eclipse.as.ssh.server;
import org.eclipse.core.runtime.CoreException;
@@ -2,6 +12,10 @@
import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
import org.eclipse.wst.server.core.IServer;
+import org.eclipse.wst.server.core.ServerCore;
import org.jboss.ide.eclipse.as.core.publishers.LocalPublishMethod;
import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethod;
import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior;
+import org.jboss.ide.eclipse.as.ssh.SSHDeploymentPlugin;
@@ -52,7 +66,7 @@
session.setUserInfo(info);
session.connect();
} catch( JSchException jsche) {
- // TODO handle
+ throw new CoreException(new Status(IStatus.ERROR, SSHDeploymentPlugin.PLUGIN_ID, "Remote Authentication Error", jsche));
}
}
@@ -73,6 +87,8 @@
private String password;
private String hostsFile;
public ServerUserInfo(IServer server) {
+ IServer tmp = ServerCore.findServer(server.getId());
+ String tmp_pass = SSHPublishUtil.getPass(tmp);
user = SSHPublishUtil.getUser(server);
password = SSHPublishUtil.getPass(server);
hostsFile = SSHPublishUtil.getHostsFile(server);
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/server/SSHServerDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/server/SSHServerDelegate.java 2009-10-28 22:39:10 UTC (rev 18343)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/server/SSHServerDelegate.java 2009-10-29 00:14:48 UTC (rev 18344)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.ide.eclipse.as.ssh.server;
import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/server/SSHServerRuntime.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/server/SSHServerRuntime.java 2009-10-28 22:39:10 UTC (rev 18343)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/server/SSHServerRuntime.java 2009-10-29 00:14:48 UTC (rev 18344)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.ide.eclipse.as.ssh.server;
import org.eclipse.wst.server.core.model.RuntimeDelegate;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/server/SSHSingleFilePublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/server/SSHSingleFilePublisher.java 2009-10-28 22:39:10 UTC (rev 18343)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/server/SSHSingleFilePublisher.java 2009-10-29 00:14:48 UTC (rev 18344)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.ide.eclipse.as.ssh.server;
import org.eclipse.core.runtime.CoreException;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/server/SSHZippedJSTPublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/server/SSHZippedJSTPublisher.java 2009-10-28 22:39:10 UTC (rev 18343)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/server/SSHZippedJSTPublisher.java 2009-10-29 00:14:48 UTC (rev 18344)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.ide.eclipse.as.ssh.server;
import java.io.File;
@@ -19,6 +29,9 @@
import org.eclipse.wst.server.core.model.IModuleResourceDelta;
import org.jboss.ide.eclipse.archives.webtools.modules.LocalZippedPublisherUtil;
import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
+import org.jboss.ide.eclipse.as.core.Messages;
+import org.jboss.ide.eclipse.as.core.extensions.events.IEventCodes;
+import org.jboss.ide.eclipse.as.core.extensions.events.ServerLogger;
import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
import org.jboss.ide.eclipse.as.core.server.IJBossServerConstants;
import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethod;
@@ -92,6 +105,18 @@
}
public static void launchCommand(Session session, String command, IProgressMonitor monitor) throws CoreException {
+ launchThreadedCommand(session, command, monitor);
+ }
+
+ protected static void launchThreadedCommand(final Session session, final String command, final IProgressMonitor monitor) throws CoreException {
+ // thread and watch the monitor for cancelations and interrupt the thread
+ LaunchRunnable r = new LaunchRunnable() { public void run() throws CoreException {
+ launchCommandNoThread(session, command, monitor);
+ } };
+ launchThreadedCommand(r, monitor);
+ }
+
+ protected static void launchCommandNoThread(Session session, String command, IProgressMonitor monitor) throws CoreException {
Channel channel = null;
try {
channel = session.openChannel("exec");
@@ -102,17 +127,73 @@
try {Thread.sleep(300);} catch(InterruptedException ie) {}
}
} catch( JSchException jsche ) {
- throw new CoreException(new Status(IStatus.ERROR, SSHDeploymentPlugin.PLUGIN_ID, "Error Removing Remote File"));
+ throw new CoreException(new Status(IStatus.ERROR, SSHDeploymentPlugin.PLUGIN_ID, IEventCodes.SSH_PUBLISHING_ROOT_CODE, "Error executing command: " + command, null));
} finally {
channel.disconnect();
}
-
}
- public static void launchCopyCommand(Session session, String localFile, String remoteFile, IProgressMonitor monitor) throws CoreException {
- launchCopyCommandImpl(session, localFile, remoteFile, monitor);
+ public static class LaunchRunnable {
+ public void run() throws CoreException {
+ }
}
+ public static void launchCopyCommand(final Session session, final String localFile,
+ final String remoteFile, final IProgressMonitor monitor) throws CoreException {
+ // thread and watch the monitor for cancelations and interrupt the thread
+ LaunchRunnable r = new LaunchRunnable() { public void run() throws CoreException {
+ launchCopyCommandImpl(session, localFile, remoteFile, monitor);
+ } };
+ launchThreadedCommand(r, monitor);
+ }
+
+ protected static void launchThreadedCommand(final LaunchRunnable runnable, IProgressMonitor monitor) throws CoreException {
+ final Exception[] e = new Exception[1];
+ e[0] = null;
+ final Object waitObject = new Object();
+ final Boolean[] subtaskComplete = new Boolean[1];
+ subtaskComplete[0] = new Boolean(false);
+ Thread t = new Thread() {
+ public void run() {
+ Exception exception = null;
+ try {
+ runnable.run();
+ } catch( Exception ex ) {
+ exception = ex;
+ }
+ synchronized(waitObject) {
+ e[0] = exception;
+ subtaskComplete[0] = new Boolean(true);
+ waitObject.notifyAll();
+ }
+ }
+ };
+ t.start();
+ while(t.isAlive() && !monitor.isCanceled() ) {
+ synchronized(waitObject) {
+ if( subtaskComplete[0].booleanValue() )
+ break;
+ try {
+ waitObject.wait(500);
+ } catch(InterruptedException ie) {}
+ }
+ }
+ synchronized(waitObject) {
+ if( !subtaskComplete[0].booleanValue()) {
+ t.interrupt();
+ IStatus status = new Status(IStatus.WARNING, JBossServerCorePlugin.PLUGIN_ID, IEventCodes.ISTATUS_CODE_ERROR, "SSH command canceled", e[0]);
+ CoreException ce = new CoreException(status);
+ throw ce;
+ }
+ if( e[0] != null ) {
+ IStatus status = new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, IEventCodes.ISTATUS_CODE_ERROR, "Error running remote command", e[0]);
+ CoreException ce = new CoreException(status);
+ throw ce;
+ }
+
+ }
+ }
+
protected static void launchCopyCommandImpl(Session session, String localFile, String remoteFile, IProgressMonitor monitor) throws CoreException {
Channel channel = null;
OutputStream out = null;
@@ -127,7 +208,7 @@
InputStream in = channel.getInputStream();
channel.connect();
if (checkAck(in) != 0) {
- throw new CoreException(new Status(IStatus.ERROR, SSHDeploymentPlugin.PLUGIN_ID, "no idea bug"));
+ throw new CoreException(new Status(IStatus.ERROR, SSHDeploymentPlugin.PLUGIN_ID, IEventCodes.SSH_PUBLISHING_ROOT_CODE, "Error transfering file: " + localFile, null));
}
// send "C0644 filesize filename", where filename should not include
@@ -143,8 +224,7 @@
out.write(command.getBytes());
out.flush();
if (checkAck(in) != 0) {
- // TODO throw new exception
- throw new CoreException(new Status(IStatus.ERROR, SSHDeploymentPlugin.PLUGIN_ID, "Error transfering file"));
+ throw new CoreException(new Status(IStatus.ERROR, SSHDeploymentPlugin.PLUGIN_ID, IEventCodes.SSH_PUBLISHING_ROOT_CODE, "Error transfering file: " + localFile, null));
}
// send a content of lfile
@@ -163,13 +243,13 @@
out.write(buf, 0, 1);
out.flush();
if (checkAck(in) != 0) {
- System.exit(0);
+ throw new CoreException(new Status(IStatus.ERROR, SSHDeploymentPlugin.PLUGIN_ID, IEventCodes.SSH_PUBLISHING_ROOT_CODE, "Error transfering file: " + localFile, null));
}
} catch( JSchException jsche ) {
- throw new CoreException(new Status(IStatus.ERROR, SSHDeploymentPlugin.PLUGIN_ID, "Error transfering file"));
+ throw new CoreException(new Status(IStatus.ERROR, SSHDeploymentPlugin.PLUGIN_ID, IEventCodes.SSH_PUBLISHING_ROOT_CODE, "Error transfering file: " + localFile, jsche));
} catch( IOException ioe) {
- throw new CoreException(new Status(IStatus.ERROR, SSHDeploymentPlugin.PLUGIN_ID, "Error transfering file"));
+ throw new CoreException(new Status(IStatus.ERROR, SSHDeploymentPlugin.PLUGIN_ID, IEventCodes.SSH_PUBLISHING_ROOT_CODE, "Error transfering file: " + localFile, ioe));
} finally {
if( channel != null )
channel.disconnect();
@@ -199,12 +279,12 @@
c = in.read();
sb.append((char) c);
} while (c != '\n');
- if (b == 1) { // error
- System.out.print(sb.toString());
- }
- if (b == 2) { // fatal error
- System.out.print(sb.toString());
- }
+// if (b == 1) { // error
+// System.out.print(sb.toString());
+// }
+// if (b == 2) { // fatal error
+// System.out.print(sb.toString());
+// }
}
return b;
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/ui/editor/DeploymentPage.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/ui/editor/DeploymentPage.java 2009-10-28 22:39:10 UTC (rev 18343)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/ui/editor/DeploymentPage.java 2009-10-29 00:14:48 UTC (rev 18344)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.ide.eclipse.as.ssh.ui.editor;
import org.eclipse.swt.SWT;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/ui/editor/SSHDeploymentModuleTab.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/ui/editor/SSHDeploymentModuleTab.java 2009-10-28 22:39:10 UTC (rev 18343)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/src/org/jboss/ide/eclipse/as/ssh/ui/editor/SSHDeploymentModuleTab.java 2009-10-29 00:14:48 UTC (rev 18344)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.ide.eclipse.as.ssh.ui.editor;
import org.eclipse.core.runtime.NullProgressMonitor;
@@ -11,11 +21,9 @@
import org.eclipse.swt.layout.FormLayout;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.layout.RowLayout;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.DirectoryDialog;
import org.eclipse.swt.widgets.FileDialog;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Shell;
@@ -39,13 +47,12 @@
public class SSHDeploymentModuleTab implements IDeploymentEditorTab {
private ModuleDeploymentPage page;
- private DeploymentPreferences preferences;
public SSHDeploymentModuleTab() {
}
public String getTabName() {
- return "SSH Deployment";
+ return Messages.SSHDeploymentSectionTitle;
}
public void setDeploymentPage(ModuleDeploymentPage page) {
@@ -53,7 +60,7 @@
}
public void setDeploymentPrefs(DeploymentPreferences prefs) {
- this.preferences = prefs;
+ // DO Nothing
}
public Control createControl(Composite parent) {
15 years, 1 month
- 1
- 0
JBoss Tools SVN: r18343 - in trunk/documentation/whatsnew: examples/images and 8 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2009-10-28 18:39:10 -0400 (Wed, 28 Oct 2009)
New Revision: 18343
Added:
trunk/documentation/whatsnew/examples/images/
trunk/documentation/whatsnew/examples/images/jbtprojectexamples.png
trunk/documentation/whatsnew/examples/images/newexamples1.png
trunk/documentation/whatsnew/hibernate/images/ddl-gen-export-to-db.png
trunk/documentation/whatsnew/hibernate/images/generatedannotation.png
trunk/documentation/whatsnew/hibernate/images/hibernate-props-ca1.png
trunk/documentation/whatsnew/hibernate/images/hibernate-props-ca2.png
trunk/documentation/whatsnew/hibernate/images/sortedoutline.png
trunk/documentation/whatsnew/jst/images/casesensetivefilter.jpg
trunk/documentation/whatsnew/jst/images/css-properties1.png
trunk/documentation/whatsnew/seam/seam-news-3.1.0.M4.html
trunk/documentation/whatsnew/smooks/images/
trunk/documentation/whatsnew/smooks/images/12329054_thumb_smookstools_input_page.png.jpeg
trunk/documentation/whatsnew/smooks/images/smookstools_input_page.png
Modified:
trunk/documentation/whatsnew/examples/examples-news-1.1.0.M4.html
trunk/documentation/whatsnew/hibernate/hibernate-news-3.3.0.M4.html
trunk/documentation/whatsnew/jst/jst-news-3.1.0.M4.html
trunk/documentation/whatsnew/smooks/smooks-news-1.1.0.M4.html
trunk/documentation/whatsnew/vpe/vpe-news-3.1.0.M4.html
Log:
25 of 33 issues marked as new_and_noteworthy are added to 'What's new in 3.1.0.M4'
Modified: trunk/documentation/whatsnew/examples/examples-news-1.1.0.M4.html
===================================================================
--- trunk/documentation/whatsnew/examples/examples-news-1.1.0.M4.html 2009-10-28 19:35:59 UTC (rev 18342)
+++ trunk/documentation/whatsnew/examples/examples-news-1.1.0.M4.html 2009-10-28 22:39:10 UTC (rev 18343)
@@ -27,7 +27,7 @@
<td width="70%" valign="top">
<p>DVD Store and Booking examples were migrated to Seam 2.2 and adapted for JBoss EAP5. They are available from Experimental Sites.</p>
-<p><img src="../images/customprojectexamples.png"/></p>
+<p><img src="./images/newexamples1.png"/></p>
<p><small><a href="https://jira.jboss.org/jira/browse/JBIDE-5012">Related jira</a></small></p>
</td>
@@ -39,13 +39,13 @@
</td>
</tr>
<td valign="top" align="right">
- <a name="itemnam2e" id="itemname2"></a><b>Seam Examples with Cheatsheets</b>
+ <a name="itemnam2e" id="itemname2"></a><b>Project Examples in New Example wizard</b>
</td>
<td width="70%" valign="top">
- <p>We have added a few of the Seam exmples to the project example site and we also added Cheatsheets to some of these
-based on the Seam Example tutorials allowing you to see the explanation of the code and navigate to it directly in the IDE.</p>
+ <p>JBoss Tools Category with Projects Examples wizard now available in eclipse New Example Wizard</p>
+ <img src="images/jbtprojectexamples.png">
- <p><small><a href="https://jira.jboss.org/jira/browse/JBIDE-4180">Related jira</a></small></p>
+ <p><small><a href="https://jira.jboss.org/jira/browse/JBIDE-4544">Related jira</a></small></p>
</td>
</tr>
@@ -54,5 +54,3 @@
</body>
</html>
-
-
Added: trunk/documentation/whatsnew/examples/images/jbtprojectexamples.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/examples/images/jbtprojectexamples.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/examples/images/newexamples1.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/examples/images/newexamples1.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/documentation/whatsnew/hibernate/hibernate-news-3.3.0.M4.html
===================================================================
--- trunk/documentation/whatsnew/hibernate/hibernate-news-3.3.0.M4.html 2009-10-28 19:35:59 UTC (rev 18342)
+++ trunk/documentation/whatsnew/hibernate/hibernate-news-3.3.0.M4.html 2009-10-28 22:39:10 UTC (rev 18343)
@@ -18,136 +18,84 @@
<tr>
<td colspan="2">
<hr/>
- <h3>Dali Integration</h3>
+ <h3>Source Editing</h3>
<hr/>
</td>
</tr>
<tr>
- <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>Validation via NamingStrategy</b></td>
+ <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>Properties editor for hibernate.properties</b></td>
<td valign="top">
- <p>When using Hibernate Platform with Dali (JPA Tooling) we now validate through the chosen NamingStrategy (if none chosen the default NamingStrategy is used).</p>
+ <p>JBoss Tools Properties editor now can be extended to recognize particular files by name and provides content assist with help hoover for available properties.</p>
- <p>This allows those users who have custom naming strategies in place to utilize the nice Dali JPA validation of wether the reference table and column names are enabled.</p>
-
- <p>Note: Remember for Dali validation to work you have to enable the JPA facet on your project and have the chosen DTP connection be connected to the database. If not, Dali will not perform any validation!</p>
-
- <p>In case you do not want the NamingStrategy to be used, i.e. your NamingStrategy requires custom setup or have dependencies not available during design time you can disable the use of it on the Hibernate project preference page.</p>
-<p></p>
-
-
- <p><small>Releated jiras: <a href="http://jira.jboss.org/jira/browse/JBIDE-4761">1</a>, <a href="http://jira.jboss.org/jira/browse/JBIDE-4803">2</a></p>
-
+ <p>For hibernate.properties files editor shows available properties in 'Add/Edit property' dialog.</p>
+ <img src="images/hibernate-props-ca1.png" />
+ <p>the same content assists works for source tab if you prefer use text editor to edit properties files.</p>
+ <img src="images/hibernate-props-ca2.png" />
+ <p><small><a href="https://jira.jboss.org/jira/browse/JBIDE-4916">Releated jira</a></small></p>
</td>
</tr>
-
-
-
-
<tr>
<td colspan="2">
<hr/>
+ <h3>Code Generation</h3>
+ <hr/>
</td>
</tr>
<tr>
- <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>Hibernate specific annotations</b></td>
+ <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>DDL generation dialog</b></td>
<td valign="top">
- <p>The JPA UI and validation has been extended to cover a few more Hibernate specific annotations.</p>
- <ul>
- <li><code>@GenericGenerators</code> (before only supported the singular <code>@GenericGenerator</code></li>
- <li><code>@DiscriminatorFormula</code></li>
- <li><code>@NamedQuery</code></li>
- <li><code>@NamedNativeQuery</code></li>
- <li><code>@Embeddable</code> with associations (not allowed in JPA spec, but ok in Hibernate)</li>
-</ul>
-
- <p>This means that these annotations now have UI support and if possible also validated in Dali.</p>
-
- <p>This screenshot shows a @NamedQuery being edited/shown in the UI.</p>
-
- <p><img src="../images/hibernatenamedquerydaliui.png"/></p>
-
-<p></p>
-
-
- <p><small>Releated jiras: <a href="http://jira.jboss.org/jira/browse/JBIDE-4521">1</a>, <a href="http://jira.jboss.org/jira/browse/JBIDE-4649">2</a>,<a href="http://jira.jboss.org/jira/browse/JBIDE-4613">3</a>, <a href="http://jira.jboss.org/jira/browse/JBIDE-4527">4</a>, <a href="http://jira.jboss.org/jira/browse/JBIDE-4716">5</a></p>
-
-
+ <p>In DDL generation dialog new option added to execute generated script in selected DB.</p>
+ <img src="images/ddl-gen-export-to-db.png" />
+ <p><small><a href="https://jira.jboss.org/jira/browse/JBIDE-4733">Releated jira</a></small></p>
</td>
</tr>
-
<tr>
<td colspan="2">
<hr/>
- <h3>Wizards</h3>
+ <h3>Mapping Diagram</h3>
<hr/>
</td>
</tr>
<tr>
- <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>hbm.xml Wizard now generates mapping for object graph</b></td>
+ <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>Views improvements</b></td>
<td valign="top">
- <p>When using New Hibernate Mapping wizard the generated hbm.xml now contains basic mappings for properties and associations.</p>
-<p><img src="../images/new_hbm_xml_selection.png"/></p>
-
-<p>You can select a package or multiple individual classes and then from there the wizard will traverse the object graph and generate mappings for the full object graph.</p>
- <p><small><a href="http://jira.jboss.org/jira/browse/JBIDE-3457">Related jira</a></p>
-
+ <p>'Outline' View for hibernate mapping diagram supports alphabet sorting. 'Sort' button was added to view's action bar.</p>
+ <img src="images/sortedoutline.png" />
+ <p><small><a href="https://jira.jboss.org/jira/browse/JBIDE-4715">Releated jira</a></small></p>
</td>
</tr>
-
<tr>
<td colspan="2">
<hr/>
- <h3>Views</h3>
- <hr/>
</td>
</tr>
-
<tr>
- <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>Pending... node</b></td>
- <td valign="top">
- <p>Creation/opening of a Console Configuration is now visualized with a Pending... node until it completes.</p>
-
-<p><img src="../images/hc_pending_icon.png"/></p>
-
- <p><small><a href="http://jira.jboss.org/jira/browse/JBIDE-4622">Related jira</a></p>
-
- </td>
- </tr>
-
- <tr>
<td colspan="2">
<hr/>
+ <h3>Dali Support</h3>
+ <hr/>
</td>
</tr>
<tr>
- <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>Mapping Diagram</b></td>
+ <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>@GenerationTime annotation</b></td>
<td valign="top">
- <p>The mapping diagram now has support for showing Grid, Rules and Snap-to-Geometry.</p>
- <p><img src="../images/hibernate_rulers_grid_snap2geometry.jpg"/></p>
-
- <p><small><a href="http://jira.jboss.org/jira/browse/JBIDE-4643">Related jira</a></p>
-
+ <p><b>TBD: Add description</b></p>
+ <img src="images/generatedannotation.png" />
+ <p><small><a href="https://jira.jboss.org/jira/browse/JBIDE-4665">Releated jira</a></small></p>
</td>
</tr>
-
-
-
-
-
<tr>
<td colspan="2">
<hr/>
</td>
</tr>
-
-
</table>
</body>
Added: trunk/documentation/whatsnew/hibernate/images/ddl-gen-export-to-db.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/hibernate/images/ddl-gen-export-to-db.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/hibernate/images/generatedannotation.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/hibernate/images/generatedannotation.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/hibernate/images/hibernate-props-ca1.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/hibernate/images/hibernate-props-ca1.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/hibernate/images/hibernate-props-ca2.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/hibernate/images/hibernate-props-ca2.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/hibernate/images/sortedoutline.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/hibernate/images/sortedoutline.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/jst/images/casesensetivefilter.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/jst/images/casesensetivefilter.jpg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/jst/images/css-properties1.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/jst/images/css-properties1.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/documentation/whatsnew/jst/jst-news-3.1.0.M4.html
===================================================================
--- trunk/documentation/whatsnew/jst/jst-news-3.1.0.M4.html 2009-10-28 19:35:59 UTC (rev 18342)
+++ trunk/documentation/whatsnew/jst/jst-news-3.1.0.M4.html 2009-10-28 22:39:10 UTC (rev 18343)
@@ -31,20 +31,18 @@
<p><small><a
href="https://jira.jboss.org/jira/browse/JBIDE-5041">Related Jira</a></small></p>
-
</td>
</tr>
<tr>
<td colspan="2">
<hr />
- <h3>RichFaces 3.3.2.SR1 Update</h3>
+ <h3>RichFaces Support</h3>
<hr />
</td>
</tr>
<tr>
- <td valign="top" align="left"><a name="itemname3" id="itemname3"></a><b>Menu
- key is supported</b></td>
+ <td valign="top" align="left"><a name="itemname3" id="itemname3"></a><b>3.3.2.S1 release included</b></td>
<td valign="top">
<p>Richfaces 3.3 Capability was updated to Richfaces 3.3.2.SR1
release</p>
@@ -58,7 +56,7 @@
<tr>
<td colspan="2">
<hr />
- <h3>Code Assists</h3>
+ <h3 style="FONT-FAMILY: 'AlArabiya';">Code Assists</h3>
<hr />
</td>
</tr>
@@ -76,9 +74,66 @@
<tr>
<td colspan="2">
<hr />
+ <h3>CSS Style Editing</h3>
+ <hr />
</td>
</tr>
+ <tr>
+ <td valign="top" align="left"><a name="itemname3" id="itemname3"></a><b>'CSS Properies' view</b></td>
+ <td valign="top">
+ <p>'CSS Properties' view can be used in for jsp files to edit styles inside <code>style</code> node. </p>
+ <p><img src="images/css-properties1.png" /></p>
+ <p><small><a
+ href="https://jira.jboss.org/jira/browse/JBIDE-4850">Related Jira</a></small></p>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <hr />
+ <h3>Refactoring / References Search</h3>
+ <hr />
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left"><a name="itemname3" id="itemname3"></a><b>Search EL references to Java Method or Property</b></td>
+ <td valign="top">
+ <ul>Find references and rename now supported through context menu or Ctr+Shift+G for:
+ <li>Seam Context Variable's property/method</li>
+ <li>Manage Bean's property/method</li>
+ <li>JavaBean property/method</li>
+ <li>Message Bundle property</li>
+ </ul>
+ <p><small><a
+ href="https://jira.jboss.org/jira/browse/JBIDE-4771">Related Jira</a></small></p>
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2">
+ <hr />
+ <h3>Editors</h3>
+ <hr />
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left"><a name="itemname3" id="itemname3"></a><b>Properties Editor Filter</b></td>
+ <td valign="top">
+ <p>Properties editor now supports case sensitive/insensitive filtering
+ </p>
+
+ <img src="images/casesensetivefilter.jpg">
+
+ <p><small><a
+ href="https://jira.jboss.org/jira/browse/JBIDE-4771">Related Jira</a></small></p>
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2">
+ <hr />
+ </td>
+ </tr>
</table>
</body>
Added: trunk/documentation/whatsnew/seam/seam-news-3.1.0.M4.html
===================================================================
--- trunk/documentation/whatsnew/seam/seam-news-3.1.0.M4.html (rev 0)
+++ trunk/documentation/whatsnew/seam/seam-news-3.1.0.M4.html 2009-10-28 22:39:10 UTC (rev 18343)
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Language" content="en-us" />
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<link rel="stylesheet" href="../whatsnew.css"/>
+<title>Seam tools 3.1.0.M4 What's New</title>
+</head>
+<body>
+<h1>Seam tools 3.1.0.M4 What's New</h1>
+
+<p align="right"><a href="../index.html">< Main Index</a> <a href="../jst/jst-news-3.1.0.M4.html">JST/JSF Tools News ></a></p>
+
+<table border="0" cellpadding="10" cellspacing="0" width="80%">
+ <tr>
+ <td colspan="2">
+ <hr/>
+ <h3>New Wizards</h3>
+ <hr/>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left">
+ <p><b>Validation Improvements</b></p></td>
+ <td valign="top">
+ <p>Seam artifacts generation were improved. Now it warns if the resources are going to be created conflict with existing ones.</p>
+
+ <p><small><a href="https://jira.jboss.org/jira/browse/JBIDE-4944">Related Jira</a></small></p>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <hr/>
+ </td>
+ </tr>
+
+ <tr>
+ <td valign="top" align="left">
+ <p><b>New Seam 2 EJB Project Wizard</b></p></td>
+ <td valign="top">
+ <p>Now Seam EAR Project is created according Seam recommendation to use /lib directory in EAR. That helps to fix many issues related to JBoss AS classloaders. </p>
+
+ <p><small><a href="https://jira.jboss.org/jira/browse/JBIDE-4136">Related Jira</a></small></p>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <hr/>
+ </td>
+ </tr>
+
+</table>
+
+</body>
+
+</html>
Property changes on: trunk/documentation/whatsnew/seam/seam-news-3.1.0.M4.html
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ text/plain
Added: trunk/documentation/whatsnew/smooks/images/12329054_thumb_smookstools_input_page.png.jpeg
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/smooks/images/12329054_thumb_smookstools_input_page.png.jpeg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/smooks/images/smookstools_input_page.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/smooks/images/smookstools_input_page.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/documentation/whatsnew/smooks/smooks-news-1.1.0.M4.html
===================================================================
--- trunk/documentation/whatsnew/smooks/smooks-news-1.1.0.M4.html 2009-10-28 19:35:59 UTC (rev 18342)
+++ trunk/documentation/whatsnew/smooks/smooks-news-1.1.0.M4.html 2009-10-28 22:39:10 UTC (rev 18343)
@@ -25,22 +25,29 @@
</td>
</tr>
<tr>
- <td valign="top" align="right"><a name="itemname1" id="itemname1"></a><b>Multiple Page Editor</b></td>
+ <td valign="top" align="right"><a name="itemname1" id="itemname1"></a><b>Multiple
+ Page Editor</b></td>
<td valign="top">
- <p>Overview page. Configurate the high level informations of
- Smooks configuration file.</p>
+ <p>'Reader' tab was replaced by 'Input' tab</p>
- <p><img src="../images/smookstools_overview_page.png"
- style="width: 991px; height: 472px" /></p>
+ <img src="images/smookstools_input_page.png">
- <p>Reader Page. Add/Remove the Reader model in this page.</p>
+ <p>The 'Input' page inherited many functions from the 'Reader'
+ page and there are several differences between them :
+ <ol>
+ <li>Reader page can add multiple Reader.<br >
+ Input page just allow only one Reader be added.</li>
- <p><img src="../images/smookstools_reader_page.png" /></p>
+ <li>Reader page support add multiple input data , and each of
+ them is usable.<br >
+ Input page can add multiple input data too , but just only one of
+ them can be used.</li>
- <p>Message Filter Page. This page inherits many functions from the
- Design page , it can add/remove the message filter resources.</p>
-
- <p><img src="../images/smookstools_message_filter_page.png" /></p>
+ <li>Reader page can view the results what is transformed by the
+ Reader<br >
+ Input page has a input model view to check the transform result.</li>
+ </ol>
+ </p>
</td>
</tr>
<tr>
@@ -49,83 +56,6 @@
</td>
</tr>
- <tr>
- <td valign="top" align="right"><a name="itemname2" id="itemname2"></a><b>Support
- the Smooks configuration file 1.2.1 version</b></td>
- <td valign="top">
- <p>The Smooks editor support the Smooks configuration file which
- is related to Smooks 1.2.1 platform.</p>
-
- <p><img src="../images/smookstools_addchildren_wizardpage.png" /></p>
-
- <p><img src="../images/smookstools_addreader_wizardpage.png" /></p>
-
- </td>
- </tr>
-
- <tr>
- <td colspan="2">
- <hr />
- </td>
-
-
- </tr>
-
- <tr>
- <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>Support
- CSV,JSON,EDI input type data</b></td>
- <td valign="top">
- <p>Support CSV , JSON , EDI input type data</p>
-
- <p><img src="../images/smookstools_inputdataselection_v12.png" /></p>
-
- <p>CSV input Reader configuration wizard page.</p>
-
- <p><img src="../images/smookstools_csvdatawizard3.png" /></p>
-
- <p>EDI input Reader configuration wizard page.</p>
-
- <p><img src="../images/smookstools_edi_wizard_v12.png" /></p>
-
- <p>JSON input Reader configuration wizard page.</p>
-
- <p><img src="../images/smookstools_jsondatawizard3.png" /></p>
-
- </td>
- </tr>
-
- <tr>
- <td colspan="2">
- <hr />
- <h3>EDI Message Mapping Graphical Editor</h3>
- <hr />
- </td>
- </tr>
- <tr>
- <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>EDI
- Message Mapping Graphical Editor</b></td>
- <td valign="top">
- <p>EDI Message Mapping File Wizard.</p>
-
- <p><img
- src="../images/smookstools_edi_message_mapping_file_wizard.png" /></p>
-
- <p><img src="../images/smookstools_edi_config_wizardpage.png" /></p>
-
- <p>EDI Message Mapping Graphical Editor. It can edit the
- EDI-Message-Mapping configuration file.</p>
-
- <p><img src="../images/smookstools_edi_message_mapping_editor.png" /></p>
-
- </td>
- </tr>
-
- <tr>
- <td colspan="2">
- <hr />
- </td>
- </tr>
-
</table>
</body>
Modified: trunk/documentation/whatsnew/vpe/vpe-news-3.1.0.M4.html
===================================================================
--- trunk/documentation/whatsnew/vpe/vpe-news-3.1.0.M4.html 2009-10-28 19:35:59 UTC (rev 18342)
+++ trunk/documentation/whatsnew/vpe/vpe-news-3.1.0.M4.html 2009-10-28 22:39:10 UTC (rev 18343)
@@ -51,7 +51,25 @@
href="https://jira.jboss.org/jira/browse/JBIDE-4945">Related Jira</a></small></p>
</td>
</tr>
+ <tr>
+ <td colspan="2">
+ <hr />
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left"><a name="itemname3" id="itemname3"></a><b>Internal toolbar</b></td>
+ <td valign="top">
+ <p>Visual editor toolbar was extended by three new tools:</p>
+ <ul>
+ <li>Show/hide none-visula tags</li>
+ <li>Show/hide text formatting toolbar</li>
+ <li>Show/hide selection bar</li>
+ </ul>
+ <p><small><a
+ href="https://jira.jboss.org/jira/browse/JBIDE-4914">Related Jira</a></small></p>
+ </td>
+ </tr>
<tr>
<td colspan="2">
<hr />
@@ -65,7 +83,7 @@
<p>Now Facelets taglib can be imported to Palette View</p>
<p><small><a
- href="https://jira.jboss.org/jira/browse/JBIDE-4945">Related Jira</a></small></p>
+ href="https://jira.jboss.org/jira/browse/JBIDE-4934">Related Jira</a></small></p>
</td>
</tr>
15 years, 1 month
- 1
- 0
JBoss Tools SVN: r18342 - trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions.
by jbosstools-commits＠lists.jboss.org
Author: vyemialyanchyk
Date: 2009-10-28 15:35:59 -0400 (Wed, 28 Oct 2009)
New Revision: 18342
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/ExportImageAction.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5076 - try to fix
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/ExportImageAction.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/ExportImageAction.java 2009-10-28 17:01:11 UTC (rev 18341)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/ExportImageAction.java 2009-10-28 19:35:59 UTC (rev 18342)
@@ -168,8 +168,9 @@
*/
private byte[] createImage(IFigure figure, int format) {
- Device device = getDiagramViewer().getEditPartViewer().getControl()
- .getDisplay();
+ //Device device = getDiagramViewer().getEditPartViewer().getControl()
+ // .getDisplay();
+ Device device = null;
Rectangle r = figure.getBounds();
ByteArrayOutputStream result = new ByteArrayOutputStream();
@@ -188,6 +189,8 @@
ImageLoader imageLoader = new ImageLoader();
imageLoader.data = new ImageData[] { image.getImageData() };
imageLoader.save(result, format);
+ } catch (Throwable e) {
+ HibernateConsolePlugin.getDefault().logErrorMessage("ExportImageAction - save:", e); //$NON-NLS-1$
} finally {
if (g != null) {
g.dispose();
15 years, 1 month
- 1
- 0
JBoss Tools SVN: r18341 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/handlers.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-10-28 13:01:11 -0400 (Wed, 28 Oct 2009)
New Revision: 18341
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/handlers/RemoveModelNatureHandler.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5096
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/handlers/RemoveModelNatureHandler.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/handlers/RemoveModelNatureHandler.java 2009-10-28 16:41:15 UTC (rev 18340)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/handlers/RemoveModelNatureHandler.java 2009-10-28 17:01:11 UTC (rev 18341)
@@ -36,13 +36,29 @@
public boolean isEnabled(XModelObject object) {
if(object == null) return false;
- String nature = getNature(object);
+ String nature = getNatureDisplayName(object);
if(nature == null) return false;
XActionImpl i = (XActionImpl)action;
i.setDisplayName(MessageFormat.format("Remove {0} Capabilities", nature));
return true;
}
+ private String getNatureDisplayName(XModelObject object) {
+ IProject p = EclipseResourceUtil.getProject(object);
+ ModelNatureExtension[] es = ModelNatureExtension.getInstances();
+ for (ModelNatureExtension ext: es) {
+ String name = ext.getName();
+ if(p != null && p.isAccessible()) try {
+ if(p.hasNature(name)) {
+ return ext.getDisplayName();
+ }
+ } catch (CoreException e) {
+
+ }
+ }
+ return null;
+ }
+
private String getNature(XModelObject object) {
IProject p = EclipseResourceUtil.getProject(object);
ModelNatureExtension[] es = ModelNatureExtension.getInstances();
@@ -69,7 +85,8 @@
ServiceDialog dialog = object.getModel().getService();
Properties pd = new Properties();
- String message = SignificanceMessageFactory.getInstance().getMessage(action, object, null) + "?";
+ String message = MessageFormat.format("Remove {0} Capabilities from project {1}?", getNatureDisplayName(object), project.getName());
+ //SignificanceMessageFactory.getInstance().getMessage(action, object, null) + "?";
pd.setProperty(ServiceDialog.DIALOG_MESSAGE, message);
String checkBoxMessage = "Remove Dynamic Web Project Capabilities";
pd.setProperty(ServiceDialog.CHECKBOX_MESSAGE, checkBoxMessage);
15 years, 1 month
- 1
- 0