Author: adietish
Date: 2011-05-31 06:34:11 -0400 (Tue, 31 May 2011)
New Revision: 31676
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/AltMethodZippedJSTPublisher.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/DeploymentMarkerUtils.java
Log:
[JBIDE-9023] extracted AS7 marker util methods to their own file (no deprecation - avoids
even more mess - since this is a new API)
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/AltMethodZippedJSTPublisher.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/AltMethodZippedJSTPublisher.java 2011-05-31
10:26:11 UTC (rev 31675)
+++
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/AltMethodZippedJSTPublisher.java 2011-05-31
10:34:11 UTC (rev 31676)
@@ -127,9 +127,8 @@
private IStatus removeDeployFailedMarker(IProgressMonitor monitor) {
try {
- IDeployableServer ds = ServerConverter.getDeployableServer(server);
if (DeploymentMarkerUtils.supportsJBoss7MarkerDeployment(server)) {
- return DeploymentMarkerUtils.removeDeployFailedMarkerIfExists(method, ds, module,
monitor);
+ return DeploymentMarkerUtils.removeDeployFailedMarkerIfExists(method, server, module,
monitor);
}
} catch(CoreException ce) {
return ce.getStatus();
@@ -139,10 +138,9 @@
private IStatus removeRemoteDeployment( IPath sourcePath,
IPath destFolder, String name, IProgressMonitor monitor) throws CoreException {
- IDeployableServer ds = ServerConverter.getDeployableServer(server);
try {
if( DeploymentMarkerUtils.supportsJBoss7MarkerDeployment(server))
- return DeploymentMarkerUtils.removeDeployedMarkerIfExists(method, ds, module,
monitor);
+ return DeploymentMarkerUtils.removeDeployedMarkerIfExists(method, server, module,
monitor);
return removeRemoteDeploymentFolder(sourcePath, destFolder, name, monitor);
} catch(CoreException ce) {
return ce.getStatus();
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/DeploymentMarkerUtils.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/DeploymentMarkerUtils.java 2011-05-31
10:26:11 UTC (rev 31675)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/DeploymentMarkerUtils.java 2011-05-31
10:34:11 UTC (rev 31676)
@@ -31,6 +31,7 @@
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.xpl.PublishCopyUtil.IPublishCopyCallbackHandler;
+import org.jboss.ide.eclipse.as.core.util.ServerConverter;
/**
*
@@ -79,9 +80,7 @@
return p.toFile();
}
- public static IStatus removeDeployFailedMarker(
- IServer server, IPath depPath,
- IJBossServerPublishMethod method,
+ public static IStatus removeDeployFailedMarker(IServer server, IPath depPath,
IJBossServerPublishMethod method,
IProgressMonitor monitor) throws CoreException {
return removeFile(FAILED_DEPLOY, server, depPath, method, monitor);
}
@@ -95,12 +94,25 @@
return Status.OK_STATUS;
}
+ public static IStatus removeDeployedMarkerIfExists(IJBossServerPublishMethod method,
IServer server, IModule[] module, IProgressMonitor monitor)
+ throws CoreException {
+ IDeployableServer deployableServer = ServerConverter.getDeployableServer(server);
+ IPath deployPath = PublishUtil.getDeployPath(method, module, deployableServer);
+ return removeDeployedMarkerIfExists(server, deployPath, method, monitor);
+ }
+
public static IStatus removeDeployedMarkerIfExists(IJBossServerPublishMethod method,
IDeployableServer jbServer, IModule[] module, IProgressMonitor monitor)
throws CoreException {
- return removeDeployedMarkerIfExists(
- jbServer.getServer(), PublishUtil.getDeployPath(method, module, jbServer), method,
monitor);
+ IPath deployPath = PublishUtil.getDeployPath(method, module, jbServer);
+ return removeDeployedMarkerIfExists(jbServer.getServer(), deployPath, method,
monitor);
}
+ public static IStatus removeDeployFailedMarkerIfExists(IJBossServerPublishMethod method,
IServer server, IModule[] module,
+ IProgressMonitor monitor) throws CoreException {
+ IDeployableServer deployableServer = ServerConverter.getDeployableServer(server);
+ return removeDeployedMarkerIfExists(method, deployableServer, module, monitor);
+ }
+
public static IStatus removeDeployFailedMarkerIfExists(IJBossServerPublishMethod method,
IDeployableServer jbServer, IModule[] module,
IProgressMonitor monitor) throws CoreException {
IPath depPath = PublishUtil.getDeployPath(method, module, jbServer);