[jboss-cvs] jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server ...
Robert Stryker
rawblem at gmail.com
Thu Jul 27 11:59:30 EDT 2006
User: rawb
Date: 06/07/27 11:59:30
Modified: as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server
JBossServerBehavior.java ServerAttributeHelper.java
ServerStateChecker.java
Log:
Removed some methods from the attribute helper (stored in the server object's property map) and allowed them to be stored in the launch configuration where they fit better.
Revision Changes Path
1.7 +13 -5 jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/JBossServerBehavior.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: JBossServerBehavior.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/JBossServerBehavior.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- JBossServerBehavior.java 27 Jul 2006 06:34:03 -0000 1.6
+++ JBossServerBehavior.java 27 Jul 2006 15:59:30 -0000 1.7
@@ -147,8 +147,7 @@
wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY,
helper.getServerHome());
wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, args);
- wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS,
- helper.getVMArgs());
+ wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, runtimeDelegate.getVMArgs(jbServer));
wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, runtimeDelegate.getStopMainType());
wc.launch(ILaunchManager.RUN_MODE, new NullProgressMonitor());
@@ -248,9 +247,18 @@
String action = workingCopy.getAttribute(ATTR_ACTION, ACTION_STARTING);
if( action.equals(ACTION_STARTING)) {
try {
- workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, helper.getStartArgs());
- workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, helper.getVMArgs());
- workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, helper.getStartMainType());
+
+ String pgArgs = workingCopy.getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, (String)null);
+ if( pgArgs == null ) {
+ workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, runtime.getVersionDelegate().getStartArgs(jbServer));
+ }
+ String vmArgs = workingCopy.getAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, (String)null);
+ if( vmArgs == null ) {
+ workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, runtime.getVersionDelegate().getVMArgs(jbServer));
+ }
+
+
+ workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, runtime.getVersionDelegate().getStartMainType());
workingCopy.setAttribute(
IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY,
helper.getServerHome() + Path.SEPARATOR + "bin");
1.4 +2 -36 jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/ServerAttributeHelper.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ServerAttributeHelper.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/ServerAttributeHelper.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- ServerAttributeHelper.java 27 Jul 2006 06:34:03 -0000 1.3
+++ ServerAttributeHelper.java 27 Jul 2006 15:59:30 -0000 1.4
@@ -16,18 +16,9 @@
public class ServerAttributeHelper {
- public static final String PROP_START_ARGS = "PROP_START_ARGS";
- public static final String PROP_STOP_ARGS = "PROP_STOP_ARGS";
- public static final String PROP_PROG_ARGS = "PROP_PROG_ARGS";
- public static final String PROP_VM_ARGS = "PROP_VM_ARGS";
- public static final String PROP_CONFIG_PATH = "PROP_START_ARGS";
- public static final String PROP_CLASSPATH = "PROP_CLASSPATH";
-
public static final String PROP_MINIMAL_CONFIG = "MINIMAL_CONFIG";
-
public static final String JBOSS_SERVER_HOME = "JBOSS_SERVER_HOME";
public static final String JBOSS_CONFIG = "JBOSS_CONFIG";
-
public static final String JBOSS_CONFIG_DEFAULT = "default";
@@ -61,15 +52,6 @@
server.setAttribute(ServerAttributeHelper.JBOSS_CONFIG, config);
}
- public void setProgramArgs(String args) {
- server.setAttribute(PROP_START_ARGS, args);
- }
-
- public void setVMArgs(String args) {
- server.setAttribute(PROP_VM_ARGS, args);
- }
-
-
public void save() {
try {
server.save(true, null);
@@ -83,18 +65,6 @@
* they are not set as attributes here.
*/
- public String getStartArgs() {
- return server.getAttribute(PROP_START_ARGS, getVersionDelegate().getStartArgs(jbServer));
- }
-
- public String getStopArgs() {
- return server.getAttribute(PROP_STOP_ARGS, getVersionDelegate().getStopArgs(jbServer));
- }
-
- public String getVMArgs() {
- return server.getAttribute(PROP_VM_ARGS, getVersionDelegate().getVMArgs(jbServer));
- }
-
public String[] getMinimalConfig() {
String minimal;
if( (minimal=server.getAttribute(PROP_MINIMAL_CONFIG, (String)null)) == null ) {
@@ -103,10 +73,6 @@
return minimal.split("\n");
}
- public String getStartMainType() {
- return getVersionDelegate().getStartMainType();
- }
-
public String getConfigurationPath() {
return getServerHome() + File.separator + "server" + File.separator + getJbossConfiguration();
1.11 +0 -1 jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/ServerStateChecker.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ServerStateChecker.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/ServerStateChecker.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- ServerStateChecker.java 27 Jul 2006 06:34:03 -0000 1.10
+++ ServerStateChecker.java 27 Jul 2006 15:59:30 -0000 1.11
@@ -75,7 +75,6 @@
public void cancel() {
canceled = true;
- ASDebug.p("canceled called", this);
}
public void run() {
More information about the jboss-cvs-commits
mailing list