[jbosstools-commits] JBoss Tools SVN: r42871 - in branches/jbosstools-3.3.x/as/plugins: org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration and 1 other directories.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Tue Aug 7 04:27:59 EDT 2012
Author: rob.stryker at jboss.com
Date: 2012-08-07 04:27:58 -0400 (Tue, 07 Aug 2012)
New Revision: 42871
Modified:
branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/AltMethodZippedJSTPublisher.java
branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/WTPZippedPublisher.java
branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/AbstractStartLaunchConfigurator.java
branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/JBossLaunchConfigProperties.java
branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ArgsUtil.java
Log:
JBIDE-12229 to maintenance
Modified: branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/AltMethodZippedJSTPublisher.java
===================================================================
--- branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/AltMethodZippedJSTPublisher.java 2012-08-07 08:04:39 UTC (rev 42870)
+++ branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/AltMethodZippedJSTPublisher.java 2012-08-07 08:27:58 UTC (rev 42871)
@@ -86,7 +86,8 @@
String name = sourcePath.lastSegment();
IStatus result = null;
- DeploymentMarkerUtils.removeDeployFailedMarker(method, server, destination, monitor);
+ if( DeploymentMarkerUtils.supportsJBoss7MarkerDeployment(server) )
+ DeploymentMarkerUtils.removeDeployFailedMarker(method, server, destination, monitor);
if(publishType == IJBossServerPublisher.REMOVE_PUBLISH) {
result = removeRemoteDeployment(sourcePath, destination.removeLastSegments(1), name, monitor);
@@ -127,7 +128,7 @@
// Locally zip it up into the remote tmp folder
IStatus result = super.publishModule(method, server, module, publishType, delta, monitor);
- if( result.isOK() ) {
+ if( result.isOK() && requiresTransfer()) { // It seems the superclass already transfers it upstream for as7 :|
result = remoteFullPublish(sourcePath, destination.removeLastSegments(1), name,
AbstractServerToolsPublisher.getSubMon(monitor, 150));
}
Modified: branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/WTPZippedPublisher.java
===================================================================
--- branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/WTPZippedPublisher.java 2012-08-07 08:04:39 UTC (rev 42870)
+++ branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/WTPZippedPublisher.java 2012-08-07 08:27:58 UTC (rev 42871)
@@ -36,6 +36,7 @@
public class WTPZippedPublisher implements IJBossServerPublisher {
private int moduleState = IServer.PUBLISH_STATE_NONE;
+ private boolean requiresTransfer = true;
public boolean accepts(String method, IServer server, IModule[] module) {
IDeployableServer ds = ServerConverter.getDeployableServer(server);
@@ -45,6 +46,9 @@
public int getPublishState() {
return moduleState;
}
+ public boolean requiresTransfer() {
+ return requiresTransfer;
+ }
protected String getDeployRoot(IModule[] module, IDeployableServer ds) {
return PublishUtil.getDeployRootFolder(
@@ -65,9 +69,11 @@
return null;
if( DeploymentMarkerUtils.supportsJBoss7MarkerDeployment(server)) {
+ requiresTransfer = false;
status = handleJBoss7Deployment(method, server, module, publishType, delta, monitor);
} else {
Trace.trace(Trace.STRING_FINER, "Using as<=6 publishModule logic in WTPZippedPublisher for module " + module[module.length-1].getName() ); //$NON-NLS-1$
+ requiresTransfer = true;
IDeployableServer ds = ServerConverter.getDeployableServer(server);
String deployRoot = getDeployRoot(module, ds);
LocalZippedPublisherUtil util = new LocalZippedPublisherUtil();
Modified: branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/AbstractStartLaunchConfigurator.java
===================================================================
--- branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/AbstractStartLaunchConfigurator.java 2012-08-07 08:04:39 UTC (rev 42870)
+++ branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/AbstractStartLaunchConfigurator.java 2012-08-07 08:27:58 UTC (rev 42871)
@@ -16,10 +16,12 @@
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
import org.eclipse.jdt.launching.IVMInstall;
import org.eclipse.jdt.launching.JavaRuntime;
+import org.eclipse.jst.j2ee.project.facet.JavaUtilityProjectCreationDataModelProvider;
import org.eclipse.wst.server.core.IServer;
import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants;
+import org.jboss.ide.eclipse.as.core.util.JavaUtils;
/**
* @author André Dietisheim
@@ -49,6 +51,7 @@
getProperties().setHost(getHost(jbossServer, jbossRuntime), launchConfig);
getProperties().setConfig(getServerConfig(jbossRuntime), launchConfig);
getProperties().setServerHome(getServerHome(jbossRuntime), jbossRuntime, launchConfig);
+ getProperties().setServerFlag(getSupportsServerFlag(jbossRuntime), jbossRuntime, launchConfig);
getProperties().setVmArguments(getDefaultVMArguments(jbossRuntime), launchConfig);
getProperties().setJreContainer(getJreContainerPath(jbossRuntime), launchConfig);
getProperties().setEndorsedDir(getEndorsedDir(jbossRuntime), launchConfig);
@@ -66,6 +69,7 @@
getProperties().setHost(getHost(jbossServer, jbossRuntime), launchConfig);
getProperties().setConfig(getServerConfig(jbossRuntime), launchConfig);
getProperties().setServerHome(getServerHome(jbossRuntime), jbossRuntime, launchConfig);
+ getProperties().setServerFlag(getSupportsServerFlag(jbossRuntime), jbossRuntime, launchConfig);
getProperties().setJreContainer(getJreContainerPath(jbossRuntime), launchConfig);
getProperties().setEndorsedDir(getEndorsedDir(jbossRuntime), launchConfig);
getProperties().setJavaLibPath(getJavaLibraryPath(jbossRuntime), launchConfig);
@@ -76,6 +80,11 @@
getProperties().setServerId(getServerId(jbossServer), launchConfig);
}
+ protected boolean getSupportsServerFlag(IJBossServerRuntime runtime) {
+ IVMInstall install = runtime.getVM();
+ return JavaUtils.supportsServerMode(install);
+ }
+
protected abstract String getEndorsedDir(IJBossServerRuntime runtime);
protected abstract String getJavaLibraryPath(IJBossServerRuntime runtime);
Modified: branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/JBossLaunchConfigProperties.java
===================================================================
--- branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/JBossLaunchConfigProperties.java 2012-08-07 08:04:39 UTC (rev 42870)
+++ branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/JBossLaunchConfigProperties.java 2012-08-07 08:27:58 UTC (rev 42871)
@@ -178,6 +178,15 @@
}
}
+ public void setServerFlag(boolean useFlag, IJBossServerRuntime runtime,
+ ILaunchConfigurationWorkingCopy launchConfig) throws CoreException {
+ String programArguments = getProgramArguments(launchConfig);
+ String newArgs = useFlag ?
+ ArgsUtil.setFlag(programArguments, IJBossRuntimeConstants.SERVER_ARG) :
+ ArgsUtil.clearFlag(programArguments, IJBossRuntimeConstants.SERVER_ARG);
+ setProgramArguments(newArgs, launchConfig);
+ }
+
public boolean isServerHomeSet(ILaunchConfigurationWorkingCopy launchConfig) throws CoreException {
String value = ArgsUtil.getValue(getProgramArguments(launchConfig),
null,
Modified: branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ArgsUtil.java
===================================================================
--- branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ArgsUtil.java 2012-08-07 08:04:39 UTC (rev 42870)
+++ branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ArgsUtil.java 2012-08-07 08:27:58 UTC (rev 42871)
@@ -233,4 +233,27 @@
}
return original;
}
+
+ public static String setFlag(String original, String flagName) {
+ if( original.startsWith(flagName + SPACE ) || original.contains(SPACE + flagName + SPACE) || original.endsWith(flagName))
+ return original;
+ return original.trim() + SPACE + flagName;
+ }
+
+ public static String clearFlag(String original, String flagName) {
+ if( original.trim().startsWith(flagName + SPACE))
+ return original.trim().substring(flagName.length()).trim();
+
+ if( original.contains(SPACE + flagName + SPACE)) {
+ return original.replace(SPACE + flagName + SPACE, SPACE).trim();
+ }
+
+ if( original.trim().endsWith(SPACE + flagName)) {
+ return original.trim().substring(0, original.trim().length() - flagName.length()).trim();
+ }
+ if( original.trim().equals(flagName)) {
+ return ""; //$NON-NLS-1$
+ }
+ return original.trim();
+ }
}
\ No newline at end of file
More information about the jbosstools-commits
mailing list