Author: adietish
Date: 2011-05-31 05:41:20 -0400 (Tue, 31 May 2011)
New Revision: 31670
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/WTPZippedPublisher.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
09:20:17 UTC (rev 31669)
+++
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/AltMethodZippedJSTPublisher.java 2011-05-31
09:41:20 UTC (rev 31670)
@@ -120,7 +120,7 @@
AbstractServerToolsPublisher.getSubMon(monitor, 150)
);
if( JBoss7Server.supportsJBoss7MarkerDeployment(server))
- DeploymentMarkerUtils.addDoDeployMarker(method,
ServerConverter.getDeployableServer(server), module, monitor);
+ DeploymentMarkerUtils.addDeployMarker(method,
ServerConverter.getDeployableServer(server), module, monitor);
} catch(CoreException ce) {
return ce.getStatus();
}
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/WTPZippedPublisher.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/WTPZippedPublisher.java 2011-05-31
09:20:17 UTC (rev 31669)
+++
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/WTPZippedPublisher.java 2011-05-31
09:41:20 UTC (rev 31670)
@@ -96,7 +96,7 @@
callback.copyFile(mf, new Path(depPath.lastSegment()), monitor);
// Add marker
- DeploymentMarkerUtils.addDoDeployMarker(method, ds, module, new
NullProgressMonitor());
+ DeploymentMarkerUtils.addDeployMarker(method, ds, module, new
NullProgressMonitor());
}
monitor.done();
return s;
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
09:20:17 UTC (rev 31669)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/DeploymentMarkerUtils.java 2011-05-31
09:41:20 UTC (rev 31670)
@@ -47,7 +47,7 @@
public static final String SKIP_DEPLOY = ".skipdeploy";//$NON-NLS-1$
public static final String PENDING = ".pending";//$NON-NLS-1$
- public static IStatus addDoDeployMarker(IJBossServerPublishMethod
method,IDeployableServer server,
+ public static IStatus addDeployMarker(IJBossServerPublishMethod method,IDeployableServer
server,
IModule[] moduleTree, IProgressMonitor monitor ) throws CoreException {
IPath depPath = PublishUtil.getDeployPath(method, moduleTree, server);
return addDeployMarker(method, server.getServer(), depPath, monitor);
Show replies by date