[jbosstools-commits] JBoss Tools SVN: r30690 - in trunk/as: plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers and 3 other directories.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Wed Apr 20 18:13:38 EDT 2011
Author: rob.stryker at jboss.com
Date: 2011-04-20 18:13:37 -0400 (Wed, 20 Apr 2011)
New Revision: 30690
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.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/SingleFilePublisher.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7JSTPublisher.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7Server.java
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/archives/RSEZippedFolderPublisher.java
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/archives/RSEZippedJSTPublisher.java
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/SingleFileDeploymentTester.java
Log:
/JBIDE-8724 - test case fixes
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-04-20 21:28:54 UTC (rev 30689)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/WTPZippedPublisher.java 2011-04-20 22:13:37 UTC (rev 30690)
@@ -78,7 +78,7 @@
if( module.length > 1 )
return null;
- if( JBoss7Server.supportsJBoss7Deployment(server))
+ if( JBoss7Server.supportsJBoss7MarkerDeployment(server))
return handleJBoss7Deployment(method, server, module, publishType, delta, monitor);
IDeployableServer ds = ServerConverter.getDeployableServer(server);
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/SingleFilePublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/SingleFilePublisher.java 2011-04-20 21:28:54 UTC (rev 30689)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/SingleFilePublisher.java 2011-04-20 22:13:37 UTC (rev 30690)
@@ -19,7 +19,7 @@
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
import org.jboss.ide.eclipse.as.wtp.core.modules.IJBTModule;
-public class SingleFilePublisher extends JBoss7JSTPublisher {
+public class SingleFilePublisher extends AbstractJSTPublisher {
protected boolean forceZipModule(IModule[] moduleTree) {
return false;
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7JSTPublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7JSTPublisher.java 2011-04-20 21:28:54 UTC (rev 30689)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7JSTPublisher.java 2011-04-20 22:13:37 UTC (rev 30690)
@@ -20,7 +20,6 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
import org.eclipse.wst.server.core.IModule;
@@ -41,24 +40,25 @@
public class JBoss7JSTPublisher extends AbstractJSTPublisher {
// Same as super class but just a *bit* different
public boolean accepts(String method, IServer server, IModule[] module) {
- return super.accepts(method, server, module) && server.loadAdapter(JBoss7Server.class, new NullProgressMonitor()) != null;
+ return super.accepts(method, server, module) &&
+ JBoss7Server.supportsJBoss7MarkerDeployment(server);
}
- public static final String DO_DEPLOY = ".dodeploy"; //$NON-NLS-1$
- public static final String DEPLOYING = ".deploying"; //$NON-NLS-1$
- public static final String DEPLOYED = ".isdeployed"; //$NON-NLS-1$
- public static final String FAILED_DEPLOY = ".faileddeploy"; //$NON-NLS-1$
- public static final String UNDEPLOYING = ".undeploying"; //$NON-NLS-1$
- public static final String UNDEPLOYED = ".undeployed"; //$NON-NLS-1$
-
+ public static final String DEPLOYED = ".deployed"; //$NON-NLS-1$
+ public static final String FAILED_DEPLOY = ".failed";//$NON-NLS-1$
+ public static final String DO_DEPLOY = ".dodeploy";//$NON-NLS-1$
+ public static final String DEPLOYING = ".isdeploying";//$NON-NLS-1$
+ public static final String UNDEPLOYING = ".isundeploying";//$NON-NLS-1$
+ public static final String UNDEPLOYED = ".undeployed";//$NON-NLS-1$
+ public static final String SKIP_DEPLOY = ".skipdeploy";//$NON-NLS-1$
+ public static final String PENDING = ".pending";//$NON-NLS-1$
+
public IStatus publishModule(
IJBossServerPublishMethod method,
IServer server, IModule[] module,
int publishType, IModuleResourceDelta[] delta,
IProgressMonitor monitor) throws CoreException {
- IJBoss7ManagementService service = JBoss7ManagementUtil.findManagementService(server);
- if( !JBoss7Server.supportsJBoss7Deployment(server))
- return super.publishModule(method, server, module, publishType, delta, monitor);
+ //IJBoss7ManagementService service = JBoss7ManagementUtil.findManagementService(server);
// jboss-7 specific
IDeployableServer ds = ServerConverter.getDeployableServer(server);
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7Server.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7Server.java 2011-04-20 21:28:54 UTC (rev 30689)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7Server.java 2011-04-20 22:13:37 UTC (rev 30690)
@@ -34,7 +34,7 @@
}
- public static boolean supportsJBoss7Deployment(IServer server) {
+ public static boolean supportsJBoss7MarkerDeployment(IServer server) {
if( server.loadAdapter(IJBoss7Deployment.class, new NullProgressMonitor()) != null )
return true;
return false;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/archives/RSEZippedFolderPublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/archives/RSEZippedFolderPublisher.java 2011-04-20 21:28:54 UTC (rev 30689)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/archives/RSEZippedFolderPublisher.java 2011-04-20 22:13:37 UTC (rev 30690)
@@ -26,8 +26,8 @@
*/
public class RSEZippedFolderPublisher extends RSEZippedJSTPublisher {
public boolean accepts(String method, IServer server, IModule[] module) {
- if( !LocalPublishMethod.LOCAL_PUBLISH_METHOD.equals(method))
- return true;
+ if( LocalPublishMethod.LOCAL_PUBLISH_METHOD.equals(method))
+ return false;
IDeployableServer ds = ServerConverter.getDeployableServer(server);
if( module != null && module.length > 0
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/archives/RSEZippedJSTPublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/archives/RSEZippedJSTPublisher.java 2011-04-20 21:28:54 UTC (rev 30689)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/archives/RSEZippedJSTPublisher.java 2011-04-20 22:13:37 UTC (rev 30690)
@@ -133,7 +133,7 @@
);
// method2.getFileService().upload(sourcePath.toFile(), destFolder.toString(), name, true, null, null,
// AbstractServerToolsPublisher.getSubMon(monitor, 150));
- if( JBoss7Server.supportsJBoss7Deployment(server))
+ if( JBoss7Server.supportsJBoss7MarkerDeployment(server))
JBoss7JSTPublisher.addDoDeployMarkerFile(method, ServerConverter.getDeployableServer(server), module, monitor);
} catch( SystemMessageException sme ) {
return new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, sme.getMessage(), sme);
@@ -147,7 +147,7 @@
IPath destFolder, String name, IProgressMonitor monitor) throws CoreException {
IDeployableServer ds = ServerConverter.getDeployableServer(server);
try {
- if( JBoss7Server.supportsJBoss7Deployment(server))
+ if( JBoss7Server.supportsJBoss7MarkerDeployment(server))
return JBoss7JSTPublisher.removeDeployedMarkerFile(method, ds, module, monitor);
return removeRemoteDeploymentFolder(sourcePath, destFolder, name, monitor);
} catch( SystemElementNotFoundException senfe ) {
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/SingleFileDeploymentTester.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/SingleFileDeploymentTester.java 2011-04-20 21:28:54 UTC (rev 30689)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/SingleFileDeploymentTester.java 2011-04-20 22:13:37 UTC (rev 30690)
@@ -24,6 +24,7 @@
import org.jboss.ide.eclipse.as.test.ASTest;
import org.jboss.ide.eclipse.as.test.util.IOUtil;
import org.jboss.ide.eclipse.as.test.util.ServerRuntimeUtils;
+import org.jboss.tools.test.util.JobUtils;
public class SingleFileDeploymentTester extends JSTDeploymentTester {
public void testSingleFile() throws CoreException, IOException {
@@ -41,6 +42,7 @@
assertEquals(IOUtil.countFiles(deployRoot.toFile()), 0);
assertEquals(IOUtil.countAllResources(deployRoot.toFile()), 1);
ServerRuntimeUtils.publish(server);
+ JobUtils.waitForIdle();
assertEquals(IOUtil.countFiles(deployRoot.toFile()), 1);
assertEquals(IOUtil.countAllResources(deployRoot.toFile()), 2);
assertContents(deployRoot.append("test.xml").toFile(),
@@ -49,6 +51,7 @@
assertContents(deployRoot.append("test.xml").toFile(),
"<test>done</test>");
ServerRuntimeUtils.publish(server);
+ JobUtils.waitForIdle();
assertContents(deployRoot.append("test.xml").toFile(),
"<test>done2</test>");
server = ServerRuntimeUtils.removeModule(server, mods[0]);
@@ -56,6 +59,7 @@
"<test>done2</test>");
assertEquals(IOUtil.countAllResources(deployRoot.toFile()), 2);
ServerRuntimeUtils.publish(server);
+ JobUtils.waitForIdle();
assertFalse(deployRoot.append("test.xml").toFile().exists());
assertEquals(IOUtil.countAllResources(deployRoot.toFile()), 1);
}
More information about the jbosstools-commits
mailing list