Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--org.eclipse.jubula.app.autrun/src/org/eclipse/jubula/app/autrun/AutRunApplication.java22
-rw-r--r--org.eclipse.jubula.app.autrun/src/org/eclipse/jubula/app/autrun/AutRunner.java6
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartJavaAut.java10
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartJavaAutServer.java13
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartPseudoJavaAUT.java2
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartToolkitAut.java13
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/IStartAut.java2
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartAUTServerCommand.java4
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartJavaFXAutServerCommand.java4
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartRcpAutServerCommand.java12
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartSwingAutServerCommand.java4
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartSwtAutServerCommand.java2
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/monitoring/MonitoringDataStore.java8
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/StartAUTServerMessage.java9
-rw-r--r--org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/constants/AutConfigConstants.java2
15 files changed, 60 insertions, 53 deletions
diff --git a/org.eclipse.jubula.app.autrun/src/org/eclipse/jubula/app/autrun/AutRunApplication.java b/org.eclipse.jubula.app.autrun/src/org/eclipse/jubula/app/autrun/AutRunApplication.java
index b5dfe4bae..efd0c28aa 100644
--- a/org.eclipse.jubula.app.autrun/src/org/eclipse/jubula/app/autrun/AutRunApplication.java
+++ b/org.eclipse.jubula.app.autrun/src/org/eclipse/jubula/app/autrun/AutRunApplication.java
@@ -25,7 +25,7 @@ import org.apache.commons.cli.OptionGroup;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
import org.apache.commons.cli.Parser;
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang.StringUtils;
import org.eclipse.equinox.app.IApplication;
import org.eclipse.equinox.app.IApplicationContext;
import org.eclipse.jubula.app.autrun.i18n.Messages;
@@ -189,8 +189,8 @@ public class AutRunApplication implements IApplication {
* @param cmdLine Provides the settings for the AUT configuration.
* @return new settings for starting an AUT.
*/
- private static Map<String, Object> createAutConfig(CommandLine cmdLine) {
- Map<String, Object> autConfig = new HashMap<String, Object>();
+ private static Map<String, String> createAutConfig(CommandLine cmdLine) {
+ Map<String, String> autConfig = new HashMap<String, String>();
if (cmdLine.hasOption(OPT_WORKING_DIR)) {
autConfig.put(AutConfigConstants.WORKING_DIR, cmdLine
.getOptionValue(OPT_WORKING_DIR));
@@ -200,12 +200,12 @@ public class AutRunApplication implements IApplication {
}
if (cmdLine.hasOption(OPT_NAME_TECHNICAL_COMPONENTS)) {
- autConfig.put(AutConfigConstants.NAME_TECHNICAL_COMPONENTS, Boolean
- .valueOf(cmdLine
- .getOptionValue(OPT_NAME_TECHNICAL_COMPONENTS)));
+ autConfig.put(AutConfigConstants.NAME_TECHNICAL_COMPONENTS, String
+ .valueOf(cmdLine.getOptionValue(
+ OPT_NAME_TECHNICAL_COMPONENTS)));
} else {
autConfig.put(AutConfigConstants.NAME_TECHNICAL_COMPONENTS,
- DEFAULT_NAME_TECHNICAL_COMPONENTS);
+ String.valueOf(DEFAULT_NAME_TECHNICAL_COMPONENTS));
}
autConfig.put(AutConfigConstants.EXECUTABLE, cmdLine
.getOptionValue(OPT_EXECUTABLE));
@@ -217,8 +217,10 @@ public class AutRunApplication implements IApplication {
String[] autArguments = cmdLine.getOptionValues(OPT_EXECUTABLE);
if (autArguments.length > 1) {
- autConfig.put(AutConfigConstants.AUT_RUN_AUT_ARGUMENTS,
- ArrayUtils.subarray(autArguments, 1, autArguments.length));
+ autConfig.put(AutConfigConstants.AUT_RUN_AUT_ARGUMENTS, StringUtils
+ .join(autArguments,
+ AutConfigConstants.AUT_RUN_AUT_ARGUMENTS_SEPARATOR_CHAR, 1,
+ autArguments.length));
}
return autConfig;
@@ -362,7 +364,7 @@ public class AutRunApplication implements IApplication {
AutIdentifier autId = new AutIdentifier(cmdLine
.getOptionValue(OPT_AUT_ID));
- Map<String, Object> autConfiguration = createAutConfig(cmdLine);
+ Map<String, String> autConfiguration = createAutConfig(cmdLine);
AutRunner runner = new AutRunner(
toolkit, autId, agentAddr, autConfiguration);
diff --git a/org.eclipse.jubula.app.autrun/src/org/eclipse/jubula/app/autrun/AutRunner.java b/org.eclipse.jubula.app.autrun/src/org/eclipse/jubula/app/autrun/AutRunner.java
index 85977bbc6..11618d482 100644
--- a/org.eclipse.jubula.app.autrun/src/org/eclipse/jubula/app/autrun/AutRunner.java
+++ b/org.eclipse.jubula.app.autrun/src/org/eclipse/jubula/app/autrun/AutRunner.java
@@ -118,7 +118,7 @@ public class AutRunner {
LoggerFactory.getLogger(AutRunner.class);
/** settings used to start the AUT */
- private Map<String, Object> m_autConfiguration;
+ private Map<String, String> m_autConfiguration;
/** the object responsible for actually starting the AUT */
private IStartAut m_startAut;
@@ -142,14 +142,14 @@ public class AutRunner {
* @throws IllegalAccessException
*/
public AutRunner(String autToolkit, AutIdentifier autIdentifier,
- InetSocketAddress agentAddr, Map<String, Object> autConfiguration)
+ InetSocketAddress agentAddr, Map<String, String> autConfiguration)
throws ClassNotFoundException, InstantiationException,
IllegalAccessException {
String className = "org.eclipse.jubula.autagent.commands.Start" //$NON-NLS-1$
+ autToolkit + "AutServerCommand"; //$NON-NLS-1$
Class< ? > autServerClass = Class.forName(className);
m_agentAddr = agentAddr;
- m_autConfiguration = new HashMap<String, Object>(autConfiguration);
+ m_autConfiguration = new HashMap<String, String>(autConfiguration);
m_autConfiguration.put(AutConfigConstants.AUT_AGENT_HOST,
agentAddr.getHostName());
m_autConfiguration.put(AutConfigConstants.AUT_AGENT_PORT,
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartJavaAut.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartJavaAut.java
index 21572bbe8..ef1a13b14 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartJavaAut.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartJavaAut.java
@@ -66,7 +66,7 @@ public abstract class AbstractStartJavaAut extends AbstractStartToolkitAut {
/**
* {@inheritDoc}
*/
- protected String createBaseCmd(Map<String, Object> parameters)
+ protected String createBaseCmd(Map<String, String> parameters)
throws IOException {
String executableFileName = (String)parameters.get(
AutConfigConstants.EXECUTABLE);
@@ -309,11 +309,11 @@ public abstract class AbstractStartJavaAut extends AbstractStartToolkitAut {
* @return the _JAVA_OPTIONS environment variable including -javaagent
* and jre arguments
*/
- protected String setJavaOptions(Map<String, Object> parameters) {
+ protected String setJavaOptions(Map<String, String> parameters) {
StringBuffer sb = new StringBuffer();
if (isRunningFromExecutable(parameters)) {
- Locale locale = (Locale)parameters.get(
- AutConfigConstants.AUT_LOCALE);
+ Locale locale = new Locale(parameters.get(
+ AutConfigConstants.AUT_LOCALE));
// set agent and locals
sb.append(JAVA_OPTIONS_INTRO);
@@ -375,7 +375,7 @@ public abstract class AbstractStartJavaAut extends AbstractStartToolkitAut {
* @return agentString The agent String like -javaagent:myagent.jar
* or null if the monitoring agent String couldn't be generated
*/
- protected String getMonitoringAgent(Map<String, Object> parameters) {
+ protected String getMonitoringAgent(Map<String, String> parameters) {
String autId = (String)parameters.get(
AutConfigConstants.AUT_ID);
MonitoringDataStore mds = MonitoringDataStore.getInstance();
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartJavaAutServer.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartJavaAutServer.java
index 3fd36b86b..fcf4925de 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartJavaAutServer.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartJavaAutServer.java
@@ -19,6 +19,7 @@ import java.util.Map;
import java.util.StringTokenizer;
import java.util.Vector;
+import org.apache.commons.lang.StringUtils;
import org.eclipse.jubula.autagent.AutStarter;
import org.eclipse.jubula.communication.Communicator;
import org.eclipse.jubula.tools.constants.AutConfigConstants;
@@ -54,7 +55,7 @@ public abstract class AbstractStartJavaAutServer extends AbstractStartJavaAut {
* @param parameters The parameters for starting the AUT
* @param autServerClasspath The classpath of the AUT Server
*/
- protected void setEnv(Map<String, Object> parameters,
+ protected void setEnv(Map<String, String> parameters,
String autServerClasspath) {
String env = (String)parameters.get(AutConfigConstants.ENVIRONMENT);
if (env == null) {
@@ -200,13 +201,13 @@ public abstract class AbstractStartJavaAutServer extends AbstractStartJavaAut {
* @return The arguments for the AUT that were found in the given
* parameters.
*/
- protected List<String> createAutArguments(Map<String, Object> parameters) {
+ protected List<String> createAutArguments(Map<String, String> parameters) {
List<String> argsList = new Vector<String>();
- final Object autRunArgs = parameters.get(
+ final String joinedAutRunArgs = parameters.get(
AutConfigConstants.AUT_RUN_AUT_ARGUMENTS);
- if (autRunArgs instanceof String[]) {
- String[] autArgs = (String[]) autRunArgs;
- return Arrays.asList(autArgs);
+ if (joinedAutRunArgs != null) {
+ return Arrays.asList(StringUtils.split(joinedAutRunArgs,
+ AutConfigConstants.AUT_RUN_AUT_ARGUMENTS_SEPARATOR_CHAR));
}
String autArguments = (String) parameters
.get(AutConfigConstants.AUT_ARGUMENTS);
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartPseudoJavaAUT.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartPseudoJavaAUT.java
index d7f98973d..ab0b43fe3 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartPseudoJavaAUT.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartPseudoJavaAUT.java
@@ -19,7 +19,7 @@ public abstract class AbstractStartPseudoJavaAUT
.getLogger(AbstractStartPseudoJavaAUT.class);
/** {@inheritDoc} */
- protected String createBaseCmd(Map<String, Object> parameters)
+ protected String createBaseCmd(Map<String, String> parameters)
throws IOException {
String jre = System.getProperty("java.home") + FILE_SEPARATOR//$NON-NLS-1$
+ "bin" + FILE_SEPARATOR + "java"; //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartToolkitAut.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartToolkitAut.java
index 6e6ee60a4..98e5674d9 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartToolkitAut.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartToolkitAut.java
@@ -69,7 +69,7 @@ public abstract class AbstractStartToolkitAut implements IStartAut {
*
* {@inheritDoc}
*/
- public StartAUTServerStateMessage startAut(Map<String, Object> parameters)
+ public StartAUTServerStateMessage startAut(Map<String, String> parameters)
throws IOException {
StartAUTServerStateMessage envCheckMsg = validateEnvironment();
if (envCheckMsg == null) {
@@ -140,13 +140,14 @@ public abstract class AbstractStartToolkitAut implements IStartAut {
* @param isAgentSet true if executable file and agent are set.
* @return the environment settings as array.
*/
- protected String[] createEnvArray(Map<String, Object> parameters,
+ protected String[] createEnvArray(Map<String, String> parameters,
boolean isAgentSet) {
m_isAgentSet = isAgentSet;
final String environment =
(String)parameters.get(AutConfigConstants.ENVIRONMENT);
- final boolean generate = ((Boolean)parameters.get(
- AutConfigConstants.NAME_TECHNICAL_COMPONENTS)).booleanValue();
+
+ final boolean generate = Boolean.valueOf(parameters.get(
+ AutConfigConstants.NAME_TECHNICAL_COMPONENTS));
Properties oldProp = EnvironmentUtils.getProcessEnvironment();
String[] newEnvArray = null;
@@ -180,7 +181,7 @@ public abstract class AbstractStartToolkitAut implements IStartAut {
* @return a <code>String</code> that represents a
* call to an executable. Ex. "java" or "/opt/java1.6/java".
*/
- protected abstract String createBaseCmd(Map<String, Object> parameters)
+ protected abstract String createBaseCmd(Map<String, String> parameters)
throws IOException;
/**
@@ -191,7 +192,7 @@ public abstract class AbstractStartToolkitAut implements IStartAut {
* a command line.
*/
protected abstract String[] createCmdArray(String baseCmd,
- Map<String, Object> parameters);
+ Map<String, String> parameters);
/**
* Executes the given command in the given environment with the
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/IStartAut.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/IStartAut.java
index 1f74dbb68..b12f4d8da 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/IStartAut.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/IStartAut.java
@@ -58,6 +58,6 @@ public interface IStartAut {
* condition or just tells the originator that the AUT was started correctly.
* @throws IOException if an I/O error occurs.
*/
- public StartAUTServerStateMessage startAut(Map<String, Object> parameters)
+ public StartAUTServerStateMessage startAut(Map<String, String> parameters)
throws IOException;
}
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartAUTServerCommand.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartAUTServerCommand.java
index 462a062cb..43aab5138 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartAUTServerCommand.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartAUTServerCommand.java
@@ -94,8 +94,8 @@ public class StartAUTServerCommand implements ICommand {
try {
// Prepare additional parameters
// For example, add locale to map
- m_message.getAutConfiguration().put(
- AutConfigConstants.AUT_LOCALE, m_message.getLocale());
+ m_message.getAutConfiguration().put(AutConfigConstants.AUT_LOCALE,
+ m_message.getLocale().toString());
AutStarter.getInstance().getAgent().setStartAutMessage(m_message);
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartJavaFXAutServerCommand.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartJavaFXAutServerCommand.java
index 5ab14d7b5..169c68185 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartJavaFXAutServerCommand.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartJavaFXAutServerCommand.java
@@ -32,7 +32,7 @@ public class StartJavaFXAutServerCommand extends AbstractStartJavaAutServer {
* {@inheritDoc}
*/
protected String[] createCmdArray(String baseCmd,
- Map<String, Object> parameters) {
+ Map<String, String> parameters) {
List<String> cmds = new Vector<String>();
cmds.add(baseCmd);
@@ -80,7 +80,7 @@ public class StartJavaFXAutServerCommand extends AbstractStartJavaAutServer {
}
@Override
- protected String[] createEnvArray(Map<String, Object> parameters,
+ protected String[] createEnvArray(Map<String, String> parameters,
boolean isAgentSet) {
if (isRunningFromExecutable(parameters)
|| MonitoringUtil.shouldAndCanRunWithMonitoring(parameters)) {
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartRcpAutServerCommand.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartRcpAutServerCommand.java
index 9a59d6204..5dde010d0 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartRcpAutServerCommand.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartRcpAutServerCommand.java
@@ -140,7 +140,7 @@ public class StartRcpAutServerCommand extends AbstractStartJavaAut {
* {@inheritDoc}
*/
protected String[] createCmdArray(String baseCmd,
- Map<String, Object> parameters) {
+ Map<String, String> parameters) {
List<String> cmds;
@@ -150,8 +150,8 @@ public class StartRcpAutServerCommand extends AbstractStartJavaAut {
cmds.add(0, baseCmd);
createDirectAutJavaCallParameter(PATH_SEPARATOR, cmds, parameters);
- addLocale(cmds, (Locale)parameters.get(
- AutConfigConstants.AUT_LOCALE));
+ addLocale(cmds, new Locale(parameters.get(
+ AutConfigConstants.AUT_LOCALE)));
} else {
// Start using executable file
cmds = new Vector<String>();
@@ -163,8 +163,8 @@ public class StartRcpAutServerCommand extends AbstractStartJavaAut {
// Note: This overrides the -nl defined in the <app>.ini file, if
// any. It will not override a -nl from the command line.
if (!cmds.contains(NL)) {
- Locale locale = (Locale)parameters.get(
- AutConfigConstants.AUT_LOCALE);
+ Locale locale = new Locale(parameters.get(
+ AutConfigConstants.AUT_LOCALE));
if (locale != null) {
if ((locale.getCountry() != null
&& locale.getCountry().length() > 0)
@@ -188,7 +188,7 @@ public class StartRcpAutServerCommand extends AbstractStartJavaAut {
/**
* {@inheritDoc}
*/
- protected String[] createEnvArray(Map<String, Object> parameters,
+ protected String[] createEnvArray(Map<String, String> parameters,
boolean isAgentSet) {
String [] envArray = super.createEnvArray(parameters, isAgentSet);
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartSwingAutServerCommand.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartSwingAutServerCommand.java
index 17a29aadf..f789f2985 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartSwingAutServerCommand.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartSwingAutServerCommand.java
@@ -32,7 +32,7 @@ public class StartSwingAutServerCommand extends AbstractStartJavaAutServer {
* {@inheritDoc}
*/
protected String[] createCmdArray(String baseCmd,
- Map<String, Object> parameters) {
+ Map<String, String> parameters) {
List<String> cmds = new Vector<String>();
cmds.add(baseCmd);
@@ -67,7 +67,7 @@ public class StartSwingAutServerCommand extends AbstractStartJavaAutServer {
}
@Override
- protected String[] createEnvArray(Map<String, Object> parameters,
+ protected String[] createEnvArray(Map<String, String> parameters,
boolean isAgentSet) {
if (isRunningFromExecutable(parameters)
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartSwtAutServerCommand.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartSwtAutServerCommand.java
index d29f6ac92..5fa529608 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartSwtAutServerCommand.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartSwtAutServerCommand.java
@@ -53,7 +53,7 @@ public class StartSwtAutServerCommand extends StartSwingAutServerCommand {
/**
* {@inheritDoc}
*/
- protected String[] createEnvArray(Map<String, Object> parameters,
+ protected String[] createEnvArray(Map<String, String> parameters,
boolean isAgentSet) {
String [] envArray = super.createEnvArray(parameters, isAgentSet);
if (envArray == null) {
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/monitoring/MonitoringDataStore.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/monitoring/MonitoringDataStore.java
index c6761f735..3275f9746 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/monitoring/MonitoringDataStore.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/monitoring/MonitoringDataStore.java
@@ -26,8 +26,8 @@ public class MonitoringDataStore {
private static MonitoringDataStore instance;
/** The list for data storage */
- private Map<String, Map<String, Object>> m_dataStoreMap =
- new HashMap<String, Map<String, Object>>();
+ private Map<String, Map<String, String>> m_dataStoreMap =
+ new HashMap<String, Map<String, String>>();
/** The list off current monitoring agents */
private Map<String, IMonitoring> m_monitoringAgentMap =
@@ -56,7 +56,7 @@ public class MonitoringDataStore {
* @param map The AutConfigMap for the given AutID
*/
public synchronized void putConfigMap(
- String autId, Map<String, Object> map) {
+ String autId, Map<String, String> map) {
m_dataStoreMap.put(autId, map);
}
/**
@@ -64,7 +64,7 @@ public class MonitoringDataStore {
* @param autId The autId
* @return The config map for the given autId
*/
- public Map<String, Object> getConfigMap(String autId) {
+ public Map<String, String> getConfigMap(String autId) {
return m_dataStoreMap.get(autId);
}
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/StartAUTServerMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/StartAUTServerMessage.java
index e3d18e440..fdc353be0 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/StartAUTServerMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/StartAUTServerMessage.java
@@ -35,7 +35,7 @@ public class StartAUTServerMessage extends Message {
private String m_autToolKit;
/** The Map with the AUT configuration */
- private Map m_autConfiguration = null;
+ private Map<String, String> m_autConfiguration = null;
/**
* @deprecated Default constructor for transportation layer. Don't use for
@@ -53,7 +53,8 @@ public class StartAUTServerMessage extends Message {
* @param autToolKit
* the autToolKit of the actual project as string
*/
- public StartAUTServerMessage(Map autConfig, String autToolKit) {
+ public StartAUTServerMessage(Map<String, String> autConfig,
+ String autToolKit) {
super();
setAutConfiguration(autConfig);
@@ -93,7 +94,7 @@ public class StartAUTServerMessage extends Message {
}
/** @return the autConfiguration */
- public Map getAutConfiguration() {
+ public Map<String, String> getAutConfiguration() {
return m_autConfiguration;
}
@@ -101,7 +102,7 @@ public class StartAUTServerMessage extends Message {
* @param autConfiguration
* the autConfiguration to set
*/
- public void setAutConfiguration(Map autConfiguration) {
+ public void setAutConfiguration(Map<String, String> autConfiguration) {
m_autConfiguration = autConfiguration;
}
} \ No newline at end of file
diff --git a/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/constants/AutConfigConstants.java b/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/constants/AutConfigConstants.java
index e009db561..4b366b7b5 100644
--- a/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/constants/AutConfigConstants.java
+++ b/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/constants/AutConfigConstants.java
@@ -49,6 +49,8 @@ public class AutConfigConstants {
public static final String AUT_ARGUMENTS = "AUT_ARGUMENTS"; //$NON-NLS-1$
/** The arguments of the Aut-Run AUT (main-args) */
public static final String AUT_RUN_AUT_ARGUMENTS = "AUT_RUN_AUT_ARGUMENTS"; //$NON-NLS-1$
+ /** The arguments of the Aut-Run AUT (main-args) split character */
+ public static final char AUT_RUN_AUT_ARGUMENTS_SEPARATOR_CHAR = '?';
/** The name of the Main-Class */
public static final String CLASSNAME = "CLASSNAME"; //$NON-NLS-1$
/** The classpath of the AUT */

Back to the top