[jbosstools-commits] JBoss Tools SVN: r31672 - in trunk/as: tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2 and 1 other directory.

[jbosstools-commits at lists.jboss.org]

Author: adietish
Date: 2011-05-31 05:49:47 -0400 (Tue, 31 May 2011)
New Revision: 31672

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/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTDeploymentWarUpdateXML.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:43:09 UTC (rev 31671)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/AltMethodZippedJSTPublisher.java	2011-05-31 09:49:47 UTC (rev 31672)
@@ -119,7 +119,7 @@
 			method.getCallbackHandler(destFolder, server).copyFile(mf, new Path(name),
 					AbstractServerToolsPublisher.getSubMon(monitor, 150)
 			);
-			if( JBoss7Server.supportsJBoss7MarkerDeployment(server)) 
+			if( DeploymentMarkerUtils.supportsJBoss7MarkerDeployment(server)) 
 				DeploymentMarkerUtils.addDeployMarker(method, ServerConverter.getDeployableServer(server), module, monitor);
 		} catch(CoreException ce) {
 			return ce.getStatus();
@@ -130,7 +130,7 @@
 	private IStatus removeDeployFailedMarker(IProgressMonitor monitor) {
 		try {
 		IDeployableServer ds = ServerConverter.getDeployableServer(server);
-		if (JBoss7Server.supportsJBoss7MarkerDeployment(server)) {
+		if (DeploymentMarkerUtils.supportsJBoss7MarkerDeployment(server)) {
 			return DeploymentMarkerUtils.removeDeployFailedMarkerIfExists(method, ds, module, monitor);
 		}
 		} catch(CoreException ce) {
@@ -143,7 +143,7 @@
 			IPath destFolder, String name, IProgressMonitor monitor) throws CoreException {
 		IDeployableServer ds = ServerConverter.getDeployableServer(server);
 		try {
-			if( JBoss7Server.supportsJBoss7MarkerDeployment(server))
+			if( DeploymentMarkerUtils.supportsJBoss7MarkerDeployment(server))
 				return DeploymentMarkerUtils.removeDeployedMarkerIfExists(method, ds, module, monitor);
 			return removeRemoteDeploymentFolder(sourcePath, destFolder, name, monitor);
 		} catch(CoreException ce) {

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:43:09 UTC (rev 31671)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/WTPZippedPublisher.java	2011-05-31 09:49:47 UTC (rev 31672)
@@ -63,7 +63,7 @@
 		if( module.length > 1 ) 
 			return null;
 		
-		if( JBoss7Server.supportsJBoss7MarkerDeployment(server))
+		if( DeploymentMarkerUtils.supportsJBoss7MarkerDeployment(server))
 			return handleJBoss7Deployment(method, server, module, publishType, delta, monitor);
 		
 		IDeployableServer ds = ServerConverter.getDeployableServer(server);

Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTDeploymentWarUpdateXML.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTDeploymentWarUpdateXML.java	2011-05-31 09:43:09 UTC (rev 31671)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTDeploymentWarUpdateXML.java	2011-05-31 09:49:47 UTC (rev 31672)
@@ -12,7 +12,7 @@
 import org.eclipse.wst.server.core.IModule;
 import org.eclipse.wst.server.core.IServer;
 import org.eclipse.wst.server.core.ServerUtil;
-import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7JSTPublisher;
+import org.jboss.ide.eclipse.as.core.server.internal.v7.DeploymentMarkerUtils;
 import org.jboss.ide.eclipse.as.test.util.ServerRuntimeUtils;
 import org.jboss.ide.eclipse.as.test.util.wtp.JavaEEFacetConstants;
 import org.jboss.ide.eclipse.as.test.util.wtp.OperationTestCase;
@@ -66,7 +66,7 @@
 	public void testWarUpdateMockPublishMethodJBoss7() throws CoreException, IOException {
 		server = ServerRuntimeUtils.createMockJBoss7Server();
 		server = ServerRuntimeUtils.useMockPublishMethod(server);
-		testMockPublishMethod(8,1,"newModule.war" + JBoss7JSTPublisher.DEPLOYED);
+		testMockPublishMethod(8,1,"newModule.war" + DeploymentMarkerUtils.DEPLOYED);
 	}
 	
 	private void testMockPublishMethod(int initial, int remove, String removedFile) throws CoreException, IOException {