Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartJavaAut.java3
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartJavaAutServer.java3
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/IStartAut.java4
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartAUTServerCommand.java5
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartRcpAutServerCommand.java9
-rw-r--r--org.eclipse.jubula.client.api/META-INF/MANIFEST.MF5
-rw-r--r--org.eclipse.jubula.client.api/src/org/eclipse/jubula/client/launch/AUTConfiguration.java6
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/ClientTestImpl.java6
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/StartAUTServerMessage.java22
-rw-r--r--org.eclipse.jubula.toolkit.base.api/META-INF/MANIFEST.MF5
-rw-r--r--org.eclipse.jubula.toolkit.base.api/src/org/eclipse/jubula/toolkit/base/config/AbstractAUTConfiguration.java65
-rw-r--r--org.eclipse.jubula.toolkit.base.api/src/org/eclipse/jubula/toolkit/base/config/AbstractOSProcessAUTConfiguration.java88
-rw-r--r--org.eclipse.jubula.toolkit.rcp.api/META-INF/MANIFEST.MF7
-rw-r--r--org.eclipse.jubula.toolkit.rcp.api/src/org/eclipse/jubula/toolkit/rcp/config/RCPAUTConfiguration.java77
-rw-r--r--org.eclipse.jubula.toolkit.swt.api/META-INF/MANIFEST.MF4
-rw-r--r--org.eclipse.jubula.toolkit.swt.api/src/org/eclipse/jubula/toolkit/swt/config/SWTAUTConfiguration.java59
-rw-r--r--org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/constants/AutConfigConstants.java2
17 files changed, 330 insertions, 40 deletions
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 e0d641395..21572bbe8 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
@@ -312,7 +312,8 @@ public abstract class AbstractStartJavaAut extends AbstractStartToolkitAut {
protected String setJavaOptions(Map<String, Object> parameters) {
StringBuffer sb = new StringBuffer();
if (isRunningFromExecutable(parameters)) {
- Locale locale = (Locale)parameters.get(IStartAut.LOCALE);
+ Locale locale = (Locale)parameters.get(
+ AutConfigConstants.AUT_LOCALE);
// set agent and locals
sb.append(JAVA_OPTIONS_INTRO);
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 0a5a7c70d..3fd36b86b 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
@@ -252,7 +252,8 @@ public abstract class AbstractStartJavaAutServer extends AbstractStartJavaAut {
*/
protected void addBaseSettings(List<String> cmds, Map parameters) {
// add locale
- addLocale(cmds, (Locale)parameters.get(IStartAut.LOCALE));
+ addLocale(cmds, (Locale)parameters.get(
+ AutConfigConstants.AUT_LOCALE));
// add JRE params
final String jreParams = (String)parameters.get(
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 e6087bea2..1f74dbb68 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
@@ -26,10 +26,6 @@ import org.eclipse.jubula.tools.constants.StringConstants;
*
*/
public interface IStartAut {
-
- /** The locale of the AUT */
- public static final String LOCALE = "LOCALE"; //$NON-NLS-1$
-
/** Default error message when the AUT cannot be started */
public static final Message ERROR_MESSAGE = new StartAUTServerStateMessage(
StartAUTServerStateMessage.ERROR, "Unexpected error, no detail available."); //$NON-NLS-1$
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 dbbd527cd..462a062cb 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
@@ -95,10 +95,7 @@ public class StartAUTServerCommand implements ICommand {
// Prepare additional parameters
// For example, add locale to map
m_message.getAutConfiguration().put(
- IStartAut.LOCALE, m_message.getLocale());
- m_message.getAutConfiguration()
- .put(AutConfigConstants.NAME_TECHNICAL_COMPONENTS,
- Boolean.valueOf(m_message.isGenerateNames()));
+ AutConfigConstants.AUT_LOCALE, m_message.getLocale());
AutStarter.getInstance().getAgent().setStartAutMessage(m_message);
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 d77ccde98..9a59d6204 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
@@ -112,7 +112,8 @@ public class StartRcpAutServerCommand extends AbstractStartJavaAut {
// create exec string array
List<String> cmds = new Vector<String>();
// add locale
- addLocale(cmds, (Locale)parameters.get(IStartAut.LOCALE));
+ addLocale(cmds, (Locale)parameters.get(
+ AutConfigConstants.AUT_LOCALE));
// add JRE parameter
final String jreParams = (String)parameters.get(
AutConfigConstants.JRE_PARAMETER);
@@ -149,7 +150,8 @@ public class StartRcpAutServerCommand extends AbstractStartJavaAut {
cmds.add(0, baseCmd);
createDirectAutJavaCallParameter(PATH_SEPARATOR, cmds, parameters);
- addLocale(cmds, (Locale)parameters.get(IStartAut.LOCALE));
+ addLocale(cmds, (Locale)parameters.get(
+ AutConfigConstants.AUT_LOCALE));
} else {
// Start using executable file
cmds = new Vector<String>();
@@ -161,7 +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(IStartAut.LOCALE);
+ Locale locale = (Locale)parameters.get(
+ AutConfigConstants.AUT_LOCALE);
if (locale != null) {
if ((locale.getCountry() != null
&& locale.getCountry().length() > 0)
diff --git a/org.eclipse.jubula.client.api/META-INF/MANIFEST.MF b/org.eclipse.jubula.client.api/META-INF/MANIFEST.MF
index 0977a3dfc..f8f040c07 100644
--- a/org.eclipse.jubula.client.api/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.client.api/META-INF/MANIFEST.MF
@@ -10,6 +10,7 @@ Bundle-ClassPath: .
Require-Bundle: org.slf4j.api;bundle-version="[1.7.2,2.0.0)",
org.eclipse.jubula.tools;bundle-version="[2.4.0,2.5.0)",
org.eclipse.jubula.communication;bundle-version="[2.4.0,2.5.0)"
-Export-Package: org.eclipse.jubula.client.internal.exceptions,
- org.eclipse.jubula.client.internal
+Export-Package: org.eclipse.jubula.client.internal,
+ org.eclipse.jubula.client.internal.exceptions,
+ org.eclipse.jubula.client.launch
Eclipse-BuddyPolicy: registered
diff --git a/org.eclipse.jubula.client.api/src/org/eclipse/jubula/client/launch/AUTConfiguration.java b/org.eclipse.jubula.client.api/src/org/eclipse/jubula/client/launch/AUTConfiguration.java
index 8ae9f6db3..37448b082 100644
--- a/org.eclipse.jubula.client.api/src/org/eclipse/jubula/client/launch/AUTConfiguration.java
+++ b/org.eclipse.jubula.client.api/src/org/eclipse/jubula/client/launch/AUTConfiguration.java
@@ -10,6 +10,12 @@
*******************************************************************************/
package org.eclipse.jubula.client.launch;
+import java.util.Map;
+
/** @author BREDEX GmbH */
public interface AUTConfiguration {
+ /**
+ * @return a map of launch information
+ */
+ Map<String, String> getLaunchInformation();
} \ No newline at end of file
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/ClientTestImpl.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/ClientTestImpl.java
index efcca5330..0c65233f9 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/ClientTestImpl.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/ClientTestImpl.java
@@ -270,9 +270,11 @@ public class ClientTestImpl implements IClientTest {
try {
// start the AUTServer
Map<String, String> autConfigMap = createAutConfigMap(conf);
+ autConfigMap.put(AutConfigConstants.NAME_TECHNICAL_COMPONENTS,
+ String.valueOf(aut.isGenerateNames()));
+
StartAUTServerMessage startAUTServerMessage =
- new StartAUTServerMessage(autConfigMap, autToolkit,
- aut.isGenerateNames());
+ new StartAUTServerMessage(autConfigMap, autToolkit);
startAUTServerMessage.setLocale(locale);
AutAgentConnection.getInstance().send(startAUTServerMessage);
if (log.isDebugEnabled()) {
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 c592e8c0e..e3d18e440 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
@@ -37,9 +37,6 @@ public class StartAUTServerMessage extends Message {
/** The Map with the AUT configuration */
private Map m_autConfiguration = null;
- /** flag to indicate whether technical names should be generated */
- private boolean m_generateNames;
-
/**
* @deprecated Default constructor for transportation layer. Don't use for
* normal programming.
@@ -55,16 +52,12 @@ public class StartAUTServerMessage extends Message {
* a Map<String, String> with the AutConfiguration
* @param autToolKit
* the autToolKit of the actual project as string
- * @param generateNames
- * set to true to enable name generation in server
*/
- public StartAUTServerMessage(Map autConfig, String autToolKit,
- boolean generateNames) {
+ public StartAUTServerMessage(Map autConfig, String autToolKit) {
super();
setAutConfiguration(autConfig);
setAutToolKit(autToolKit);
- setGenerateNames(generateNames);
}
/**
@@ -111,17 +104,4 @@ public class StartAUTServerMessage extends Message {
public void setAutConfiguration(Map autConfiguration) {
m_autConfiguration = autConfiguration;
}
-
- /**
- * @param generateNames
- * the generateNames to set
- */
- public void setGenerateNames(boolean generateNames) {
- m_generateNames = generateNames;
- }
-
- /** @return the generateNames */
- public boolean isGenerateNames() {
- return m_generateNames;
- }
} \ No newline at end of file
diff --git a/org.eclipse.jubula.toolkit.base.api/META-INF/MANIFEST.MF b/org.eclipse.jubula.toolkit.base.api/META-INF/MANIFEST.MF
index 68cc7424a..681d29aa3 100644
--- a/org.eclipse.jubula.toolkit.base.api/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.toolkit.base.api/META-INF/MANIFEST.MF
@@ -7,5 +7,8 @@ Bundle-Vendor: Eclipse Jubula
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
-Require-Bundle: org.eclipse.jubula.toolkit.api;bundle-version="[2.4.0,2.5.0)",
+Require-Bundle: org.eclipse.jubula.client.api;bundle-version="[2.4.0,2.5.0)",
+ org.eclipse.jubula.tools;bundle-version="[2.4.0,2.5.0)",
+ org.eclipse.jubula.toolkit.api;bundle-version="[2.4.0,2.5.0)",
org.eclipse.jubula.toolkit.api.gen;resolution:=optional;bundle-version="[2.4.0,2.5.0)"
+Export-Package: org.eclipse.jubula.toolkit.base.config
diff --git a/org.eclipse.jubula.toolkit.base.api/src/org/eclipse/jubula/toolkit/base/config/AbstractAUTConfiguration.java b/org.eclipse.jubula.toolkit.base.api/src/org/eclipse/jubula/toolkit/base/config/AbstractAUTConfiguration.java
new file mode 100644
index 000000000..f3b444654
--- /dev/null
+++ b/org.eclipse.jubula.toolkit.base.api/src/org/eclipse/jubula/toolkit/base/config/AbstractAUTConfiguration.java
@@ -0,0 +1,65 @@
+/*******************************************************************************
+ * Copyright (c) 2014 BREDEX GmbH.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * BREDEX GmbH - initial API and implementation and/or initial documentation
+ *******************************************************************************/
+package org.eclipse.jubula.toolkit.base.config;
+
+import org.eclipse.jubula.client.launch.AUTConfiguration;
+import org.eclipse.jubula.tools.registration.AutIdentifier;
+
+/** @author BREDEX GmbH */
+public abstract class AbstractAUTConfiguration implements AUTConfiguration {
+ /** the name */
+ private String m_name;
+ /** the autID */
+ private AutIdentifier m_autID;
+
+ /**
+ * Constructor
+ *
+ * @param name
+ * the name
+ * @param autID
+ * the AUT ID
+ */
+ public AbstractAUTConfiguration(String name, AutIdentifier autID) {
+ setName(name);
+ setAutID(autID);
+ }
+
+ /**
+ * @return the name
+ */
+ public String getName() {
+ return m_name;
+ }
+
+ /**
+ * @param name
+ * the name to set
+ */
+ private void setName(String name) {
+ m_name = name;
+ }
+
+ /**
+ * @return the autID
+ */
+ public AutIdentifier getAutID() {
+ return m_autID;
+ }
+
+ /**
+ * @param autID
+ * the autID to set
+ */
+ private void setAutID(AutIdentifier autID) {
+ m_autID = autID;
+ }
+} \ No newline at end of file
diff --git a/org.eclipse.jubula.toolkit.base.api/src/org/eclipse/jubula/toolkit/base/config/AbstractOSProcessAUTConfiguration.java b/org.eclipse.jubula.toolkit.base.api/src/org/eclipse/jubula/toolkit/base/config/AbstractOSProcessAUTConfiguration.java
new file mode 100644
index 000000000..a035547ac
--- /dev/null
+++ b/org.eclipse.jubula.toolkit.base.api/src/org/eclipse/jubula/toolkit/base/config/AbstractOSProcessAUTConfiguration.java
@@ -0,0 +1,88 @@
+/*******************************************************************************
+ * Copyright (c) 2014 BREDEX GmbH.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * BREDEX GmbH - initial API and implementation and/or initial documentation
+ *******************************************************************************/
+package org.eclipse.jubula.toolkit.base.config;
+
+import org.eclipse.jubula.tools.registration.AutIdentifier;
+
+/** @author BREDEX GmbH */
+public abstract class AbstractOSProcessAUTConfiguration extends
+ AbstractAUTConfiguration {
+ /** the command */
+ private String m_command;
+ /** the dir */
+ private String m_workingDir;
+ /** the args */
+ private String[] m_args;
+
+ /**
+ * Constructor
+ *
+ * @param name
+ * the name
+ * @param autID
+ * the AUT ID
+ * @param command
+ * the command
+ * @param wd
+ * the working directory
+ * @param args
+ * the commands arguments
+ */
+ public AbstractOSProcessAUTConfiguration(String name, AutIdentifier autID,
+ String command, String wd, String[] args) {
+ super(name, autID);
+ setCommand(command);
+ setWorkingDir(wd);
+ setArgs(args);
+ }
+
+ /**
+ * @return the command
+ */
+ public String getCommand() {
+ return m_command;
+ }
+
+ /**
+ * @param command the command to set
+ */
+ private void setCommand(String command) {
+ m_command = command;
+ }
+
+ /**
+ * @return the workingDir
+ */
+ public String getWorkingDir() {
+ return m_workingDir;
+ }
+
+ /**
+ * @param workingDir the workingDir to set
+ */
+ private void setWorkingDir(String workingDir) {
+ m_workingDir = workingDir;
+ }
+
+ /**
+ * @return the args
+ */
+ public String[] getArgs() {
+ return m_args;
+ }
+
+ /**
+ * @param args the args to set
+ */
+ private void setArgs(String[] args) {
+ m_args = args;
+ }
+} \ No newline at end of file
diff --git a/org.eclipse.jubula.toolkit.rcp.api/META-INF/MANIFEST.MF b/org.eclipse.jubula.toolkit.rcp.api/META-INF/MANIFEST.MF
index a48a37061..ce32d2194 100644
--- a/org.eclipse.jubula.toolkit.rcp.api/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.toolkit.rcp.api/META-INF/MANIFEST.MF
@@ -8,4 +8,9 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
Require-Bundle: org.eclipse.jubula.toolkit.api;bundle-version="[2.4.0,2.5.0)",
- org.eclipse.jubula.toolkit.api.gen;resolution:=optional;bundle-version="[2.4.0,2.5.0)"
+ org.eclipse.jubula.client.api;bundle-version="[2.4.0,2.5.0)",
+ org.eclipse.jubula.toolkit.swt.api;bundle-version="[2.4.0,2.5.0)",
+ org.eclipse.jubula.toolkit.base.api;bundle-version="[2.4.0,2.5.0)",
+ org.eclipse.jubula.tools;bundle-version="[2.4.0,2.5.0)",
+ org.eclipse.jubula.toolkit.api.gen;bundle-version="[2.4.0,2.5.0)";resolution:=optional,
+ org.apache.commons.lang;bundle-version="[2.4.0,3.0.0)"
diff --git a/org.eclipse.jubula.toolkit.rcp.api/src/org/eclipse/jubula/toolkit/rcp/config/RCPAUTConfiguration.java b/org.eclipse.jubula.toolkit.rcp.api/src/org/eclipse/jubula/toolkit/rcp/config/RCPAUTConfiguration.java
new file mode 100644
index 000000000..ede96c085
--- /dev/null
+++ b/org.eclipse.jubula.toolkit.rcp.api/src/org/eclipse/jubula/toolkit/rcp/config/RCPAUTConfiguration.java
@@ -0,0 +1,77 @@
+/*******************************************************************************
+ * Copyright (c) 2014 BREDEX GmbH.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * BREDEX GmbH - initial API and implementation and/or initial documentation
+ *******************************************************************************/
+package org.eclipse.jubula.toolkit.rcp.config;
+
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+
+import org.apache.commons.lang.StringUtils;
+import org.eclipse.jubula.toolkit.swt.config.SWTAUTConfiguration;
+import org.eclipse.jubula.tools.constants.AutConfigConstants;
+import org.eclipse.jubula.tools.constants.CommandConstants;
+import org.eclipse.jubula.tools.constants.RcpAccessorConstants;
+import org.eclipse.jubula.tools.constants.ToolkitConstants;
+import org.eclipse.jubula.tools.registration.AutIdentifier;
+
+/** @author BREDEX GmbH */
+public class RCPAUTConfiguration extends SWTAUTConfiguration {
+ /**
+ * Constructor
+ *
+ * @param name
+ * the name
+ * @param autID
+ * the AUT ID
+ * @param command
+ * the command
+ * @param wd
+ * the working directory
+ * @param args
+ * the arguments
+ * @param keyboardLayout
+ * the keyboard layout to use
+ */
+ public RCPAUTConfiguration(String name, AutIdentifier autID,
+ String command, String wd, String[] args, Locale keyboardLayout) {
+ super(name, autID, command, wd, args, keyboardLayout);
+ }
+
+ /** {@inheritDoc} */
+ public Map<String, String> getLaunchInformation() {
+ Map<String, String> launchInformation = new HashMap<String, String>();
+
+ launchInformation.put(ToolkitConstants.ATTR_TOOLKITID,
+ CommandConstants.RCP_TOOLKIT);
+
+ launchInformation.put(
+ AutConfigConstants.AUT_ID,
+ getAutID().getExecutableName());
+ launchInformation.put(
+ AutConfigConstants.EXECUTABLE,
+ getCommand());
+ launchInformation.put(
+ AutConfigConstants.WORKING_DIR,
+ getWorkingDir());
+ launchInformation.put(
+ AutConfigConstants.AUT_ARGUMENTS,
+ StringUtils.join(getArgs()));
+ launchInformation.put(
+ RcpAccessorConstants.KEYBOARD_LAYOUT,
+ getKeyboardLayout().toString());
+
+ launchInformation.put(
+ AutConfigConstants.NAME_TECHNICAL_COMPONENTS,
+ Boolean.TRUE.toString());
+
+ return launchInformation;
+ }
+} \ No newline at end of file
diff --git a/org.eclipse.jubula.toolkit.swt.api/META-INF/MANIFEST.MF b/org.eclipse.jubula.toolkit.swt.api/META-INF/MANIFEST.MF
index 47f314de4..9cb9402dd 100644
--- a/org.eclipse.jubula.toolkit.swt.api/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.toolkit.swt.api/META-INF/MANIFEST.MF
@@ -8,4 +8,8 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
Require-Bundle: org.eclipse.jubula.toolkit.api;bundle-version="[2.4.0,2.5.0)",
+ org.eclipse.jubula.client.api;bundle-version="[2.4.0,2.5.0)",
+ org.eclipse.jubula.toolkit.base.api;bundle-version="[2.4.0,2.5.0)",
+ org.eclipse.jubula.tools;bundle-version="[2.4.0,2.5.0)",
org.eclipse.jubula.toolkit.api.gen;resolution:=optional;bundle-version="[2.4.0,2.5.0)"
+Export-Package: org.eclipse.jubula.toolkit.swt.config
diff --git a/org.eclipse.jubula.toolkit.swt.api/src/org/eclipse/jubula/toolkit/swt/config/SWTAUTConfiguration.java b/org.eclipse.jubula.toolkit.swt.api/src/org/eclipse/jubula/toolkit/swt/config/SWTAUTConfiguration.java
new file mode 100644
index 000000000..a0b15124e
--- /dev/null
+++ b/org.eclipse.jubula.toolkit.swt.api/src/org/eclipse/jubula/toolkit/swt/config/SWTAUTConfiguration.java
@@ -0,0 +1,59 @@
+/*******************************************************************************
+ * Copyright (c) 2014 BREDEX GmbH.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * BREDEX GmbH - initial API and implementation and/or initial documentation
+ *******************************************************************************/
+package org.eclipse.jubula.toolkit.swt.config;
+
+import java.util.Locale;
+
+import org.eclipse.jubula.toolkit.base.config.AbstractOSProcessAUTConfiguration;
+import org.eclipse.jubula.tools.registration.AutIdentifier;
+
+/** @author BREDEX GmbH */
+public abstract class SWTAUTConfiguration
+ extends AbstractOSProcessAUTConfiguration {
+ /** the keyboardLayout */
+ private Locale m_keyboardLayout;
+
+ /**
+ * Constructor
+ *
+ * @param name
+ * the name
+ * @param autID
+ * the AUT ID
+ * @param command
+ * the command
+ * @param wd
+ * the working directory
+ * @param args
+ * the arguments
+ * @param keyboardLayout
+ * the keyboard layout to use
+ */
+ public SWTAUTConfiguration(String name, AutIdentifier autID,
+ String command, String wd, String[] args, Locale keyboardLayout) {
+ super(name, autID, command, wd, args);
+ setKeyboardLayout(keyboardLayout);
+ }
+
+ /**
+ * @return the keyboardLayout
+ */
+ public Locale getKeyboardLayout() {
+ return m_keyboardLayout;
+ }
+
+ /**
+ * @param keyboardLayout the keyboardLayout to set
+ */
+ private void setKeyboardLayout(Locale keyboardLayout) {
+ m_keyboardLayout = keyboardLayout;
+ }
+} \ 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 4096b2b58..e009db561 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
@@ -37,6 +37,8 @@ public class AutConfigConstants {
public static final String AUT_AGENT_PORT = "com.bredexsw.guidancer.aut.register.autAgentPort"; //$NON-NLS-1$
/** The AUT hostname set in the AUT config */
public static final String AUT_CONFIG_AUT_HOST_NAME = "SERVER"; //$NON-NLS-1$
+ /** The locale of the AUT */
+ public static final String AUT_LOCALE = "AUT_LOCALE"; //$NON-NLS-1$
/** The method for activation on test start (enum ActivationMethod) */
public static final String ACTIVATION_METHOD = "ACTIVATION_METHOD"; //$NON-NLS-1$
/** The MonitoringAgent ID*/

Back to the top