Author: rob.stryker(a)jboss.com
Date: 2011-10-04 02:33:27 -0400 (Tue, 04 Oct 2011)
New Revision: 35312
Added:
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/StandaloneUtilProjectPublish.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractServerToolsPublisher.java
Log:
JBIDE-9714 - unit test and slight fix for previous fix in JBIDE-9703
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractServerToolsPublisher.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractServerToolsPublisher.java 2011-10-04
06:09:58 UTC (rev 35311)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractServerToolsPublisher.java 2011-10-04
06:33:27 UTC (rev 35312)
@@ -142,7 +142,7 @@
tree2[i] = moduleTree[i];
}
if( tree2.length == 0 )
- return new Path("/"); //$NON-NLS-1$
+ return new Path(publishMethod.getPublishDefaultRootFolder(server.getServer()));
return PublishUtil.getDeployPath(publishMethod, tree2, server);
}
@@ -237,7 +237,7 @@
list.addAll(Arrays.asList(PublishUtil.packModuleIntoJar(moduleTree[moduleTree.length-1],
tempFile)));
// TODO !!!!! Transfer it
- IPath deployPathInner = getParentDeployPath(moduleTree,
server).removeLastSegments(1);
+ IPath deployPathInner = getParentDeployPath(moduleTree, server);
IPublishCopyCallbackHandler handler =
getCallbackHandler(getRootPath(deployPathInner).append(deployPathInner));
IPath filePath = deployPath.removeFirstSegments(deployPathInner.segments().length);
IPath parentFolderPath = filePath.removeLastSegments(1);
Added:
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/StandaloneUtilProjectPublish.java
===================================================================
---
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/StandaloneUtilProjectPublish.java
(rev 0)
+++
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/StandaloneUtilProjectPublish.java 2011-10-04
06:33:27 UTC (rev 35312)
@@ -0,0 +1,64 @@
+package org.jboss.ide.eclipse.as.test.publishing.v2;
+
+import java.io.IOException;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
+import org.eclipse.wst.server.core.IModule;
+import org.eclipse.wst.server.core.IServer;
+import org.eclipse.wst.server.core.IServerWorkingCopy;
+import org.eclipse.wst.server.core.ServerUtil;
+import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
+import org.jboss.ide.eclipse.as.core.server.internal.ServerAttributeHelper;
+import org.jboss.ide.eclipse.as.test.ASTest;
+import org.jboss.ide.eclipse.as.test.util.ServerRuntimeUtils;
+import org.jboss.ide.eclipse.as.test.util.wtp.OperationTestCase;
+import org.jboss.ide.eclipse.as.test.util.wtp.ProjectCreationUtil;
+import org.jboss.ide.eclipse.as.test.util.wtp.ProjectUtility;
+
+public class StandaloneUtilProjectPublish extends
+ TestCase {
+ public void setUp() throws Exception {
+ }
+ public void tearDown() throws Exception {
+ ServerRuntimeUtils.deleteAllServers();
+ ServerRuntimeUtils.deleteAllRuntimes();
+ ProjectUtility.deleteAllProjects();
+ ASTest.clearStateLocation();
+ }
+
+ private IServer server;
+ private IProject utilProject;
+ public void testZippedPublish() throws CoreException, IOException, Exception {
+ server = ServerRuntimeUtils.createMockDeployOnlyServer();
+ server = ServerRuntimeUtils.useMockPublishMethod(server);
+ MockPublishMethod.reset();
+
+
+ IDataModel dm =
ProjectCreationUtil.getUtilityProjectCreationDataModel("Util", null);
+ OperationTestCase.runAndVerify(dm);
+ utilProject = ResourcesPlugin.getWorkspace().getRoot().getProject("Util");
+ assertTrue(utilProject.exists());
+
+ IModule mod = ServerUtil.getModule(utilProject);
+ server = ServerRuntimeUtils.addModule(server, mod);
+ IStatus s = ServerRuntimeUtils.publish(server);
+ assertTrue(s.isOK());
+ }
+
+ private void setZipFlag() throws IOException, CoreException {
+ IServerWorkingCopy wc = server.createWorkingCopy();
+ ServerAttributeHelper helper = new ServerAttributeHelper(server, wc);
+ helper.setAttribute(IDeployableServer.ZIP_DEPLOYMENTS_PREF, true);
+ server = wc.save(true, new NullProgressMonitor());
+ }
+
+
+
+}
Show replies by date