Author: adietish Date: 2011-06-01 17:18:21 -0400 (Wed, 01 Jun 2011) New Revision: 31754 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 trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java Log: [JBIDE-9054] renamed #addDeployMarker to #addDoDeployMarker to match the marker file name 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-06-01 21:14:50 UTC (rev 31753) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/AltMethodZippedJSTPublisher.java 2011-06-01 21:18:21 UTC (rev 31754) @@ -117,7 +117,7 @@ AbstractServerToolsPublisher.getSubMon(monitor, 150) ); if( DeploymentMarkerUtils.supportsJBoss7MarkerDeployment(server)) - DeploymentMarkerUtils.addDeployMarker(method, ServerConverter.getDeployableServer(server), module, monitor); + DeploymentMarkerUtils.addDoDeployMarker(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-06-01 21:14:50 UTC (rev 31753) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/WTPZippedPublisher.java 2011-06-01 21:18:21 UTC (rev 31754) @@ -97,7 +97,7 @@ callback.copyFile(mf, new Path(depPath.lastSegment()), monitor); // Add marker - DeploymentMarkerUtils.addDeployMarker(method, ds, module, new NullProgressMonitor()); + DeploymentMarkerUtils.addDoDeployMarker(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-06-01 21:14:50 UTC (rev 31753) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/DeploymentMarkerUtils.java 2011-06-01 21:18:21 UTC (rev 31754) @@ -61,10 +61,10 @@ * @return the result of the marker addition operation * @throws CoreException */ - public static IStatus addDeployMarker(IJBossServerPublishMethod method, IDeployableServer server, + public static IStatus addDoDeployMarker(IJBossServerPublishMethod method, IDeployableServer server, IModule[] moduleTree, IProgressMonitor monitor) throws CoreException { IPath depPath = PublishUtil.getDeployPath(method, moduleTree, server); - return addDeployMarker(method, server.getServer(), depPath, monitor); + return addDoDeployMarker(method, server.getServer(), depPath, monitor); } /** @@ -78,7 +78,7 @@ * @return the result of the marker addition operation * @throws CoreException */ - public static IStatus addDeployMarker(IJBossServerPublishMethod method, IServer server, + public static IStatus addDoDeployMarker(IJBossServerPublishMethod method, IServer server, IPath depPath, IProgressMonitor monitor) throws CoreException { IPath folder = depPath.removeLastSegments(1); IPublishCopyCallbackHandler callback = method.getCallbackHandler(folder, server); Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java 2011-06-01 21:14:50 UTC (rev 31753) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java 2011-06-01 21:18:21 UTC (rev 31754) @@ -141,7 +141,7 @@ Iterator<IPath> i = l.iterator(); IPath p; while (i.hasNext()) { - DeploymentMarkerUtils.addDeployMarker(method, getServer(), i.next(), new SubProgressMonitor(monitor, + DeploymentMarkerUtils.addDoDeployMarker(method, getServer(), i.next(), new SubProgressMonitor(monitor, 1)); } super.publishFinish(new SubProgressMonitor(monitor, 1));