[jbosstools-commits] JBoss Tools SVN: r26502 - in trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl: deployment and 1 other directory.

Author: koen.aers(a)jboss.com Date: 2010-11-12 06:34:27 -0500 (Fri, 12 Nov 2010) New Revision: 26502 Modified: trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/action/DeployProcessAction.java trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/action/PingServerAction.java trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/deployment/ProcessArchiveDeployer.java Log: JBIDE-7347 Modified: trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/action/DeployProcessAction.java =================================================================== --- trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/action/DeployProcessAction.java 2010-11-12 11:29:11 UTC (rev 26501) +++ trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/action/DeployProcessAction.java 2010-11-12 11:34:27 UTC (rev 26502) @@ -21,6 +21,8 @@ boolean success = new ProcessArchiveDeployer(jpdlEditor).deploy(processArchive); if (success) { showSuccessDialog(); + } else { + showFailureDialog(); } } @@ -36,4 +38,16 @@ dialog.open(); } + private void showFailureDialog() { + MessageDialog dialog = new MessageDialog( + jpdlEditor.getSite().getShell(), + "Deployment Failed", + null, + "The process archive could not be deployed.", + SWT.ICON_ERROR, + new String[] { "OK" }, + 0); + dialog.open(); + } + } Modified: trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/action/PingServerAction.java =================================================================== --- trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/action/PingServerAction.java 2010-11-12 11:29:11 UTC (rev 26501) +++ trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/action/PingServerAction.java 2010-11-12 11:34:27 UTC (rev 26502) @@ -18,6 +18,8 @@ boolean success = new ProcessArchiveDeployer(jpdlEditor).pingServer(); if (success) { showSuccessDialog(); + } else { + showFailureDialog(); } } @@ -33,4 +35,16 @@ dialog.open(); } + private void showFailureDialog() { + MessageDialog dialog = new MessageDialog( + jpdlEditor.getSite().getShell(), + "Ping Server Failure", + null, + "The server could not be reached. Check your connection information.", + SWT.ICON_ERROR, + new String[] { "OK" }, + 0); + dialog.open(); + } + } Modified: trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/deployment/ProcessArchiveDeployer.java =================================================================== --- trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/deployment/ProcessArchiveDeployer.java 2010-11-12 11:29:11 UTC (rev 26501) +++ trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/deployment/ProcessArchiveDeployer.java 2010-11-12 11:34:27 UTC (rev 26502) @@ -36,8 +36,7 @@ if (response == null) { return false; } - System.out.println(response); - return true; + return response.contains("deployed successfully"); } public boolean pingServer() { @@ -50,8 +49,7 @@ if (response == null) { return false; } - System.out.println(response); - return true; + return response.contains("GPD deployer is operational"); } private String constructUrlString() {