Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Tiede2013-06-20 04:29:18 -0400
committerMarkus Tiede2013-06-20 10:44:24 -0400
commitd02eef25db58beda62d63698c99d6711a8ac2498 (patch)
treef1f3b795f2bc2b3c2168be521043489924bdfddb
parent26bc77d6930dddd64d4a40fa1159919b2839bcdf (diff)
downloadorg.eclipse.jubula.core-d02eef25db58beda62d63698c99d6711a8ac2498.tar.gz
org.eclipse.jubula.core-d02eef25db58beda62d63698c99d6711a8ac2498.tar.xz
org.eclipse.jubula.core-d02eef25db58beda62d63698c99d6711a8ac2498.zip
Sprint task - refactoring: rename bundles, classes, etc.: part 1 - testexec
-rw-r--r--org.eclipse.jubula.app.testexec/.checkstyle (renamed from org.eclipse.jubula.app.cmd/.checkstyle)2
-rw-r--r--org.eclipse.jubula.app.testexec/.classpath (renamed from org.eclipse.jubula.app.cmd/.classpath)0
-rw-r--r--org.eclipse.jubula.app.testexec/.gitignore (renamed from org.eclipse.jubula.app.cmd/.gitignore)0
-rw-r--r--org.eclipse.jubula.app.testexec/.project (renamed from org.eclipse.jubula.app.cmd/.project)2
-rw-r--r--org.eclipse.jubula.app.testexec/META-INF/MANIFEST.MF (renamed from org.eclipse.jubula.app.cmd/META-INF/MANIFEST.MF)5
-rw-r--r--org.eclipse.jubula.app.testexec/about.html (renamed from org.eclipse.jubula.app.cmd/about.html)0
-rw-r--r--org.eclipse.jubula.app.testexec/build.properties (renamed from org.eclipse.jubula.app.cmd/build.properties)0
-rw-r--r--org.eclipse.jubula.app.testexec/plugin.xml (renamed from org.eclipse.jubula.app.cmd/plugin.xml)2
-rw-r--r--org.eclipse.jubula.app.testexec/pom.xml (renamed from org.eclipse.jubula.app.cmd/pom.xml)2
-rw-r--r--org.eclipse.jubula.app.testexec/src/org/eclipse/jubula/app/testexec/Launcher.java (renamed from org.eclipse.jubula.app.cmd/src/org/eclipse/jubula/app/cmd/Launcher.java)4
-rw-r--r--org.eclipse.jubula.app.testexec/src/org/eclipse/jubula/app/testexec/PluginStarter.java (renamed from org.eclipse.jubula.app.cmd/src/org/eclipse/jubula/app/cmd/PluginStarter.java)4
-rw-r--r--org.eclipse.jubula.app.testexec/src/org/eclipse/jubula/app/testexec/TestexecClient.java (renamed from org.eclipse.jubula.app.cmd/src/org/eclipse/jubula/app/cmd/Client.java)14
-rw-r--r--org.eclipse.jubula.app.testexec/src/org/eclipse/jubula/app/testexec/batch/ExecutionController.java (renamed from org.eclipse.jubula.app.cmd/src/org/eclipse/jubula/app/cmd/batch/ExecutionController.java)4
-rw-r--r--org.eclipse.jubula.app.testexec/src/org/eclipse/jubula/app/testexec/i18n/Messages.java (renamed from org.eclipse.jubula.app.cmd/src/org/eclipse/jubula/app/cmd/i18n/Messages.java)4
-rw-r--r--org.eclipse.jubula.app.testexec/src/org/eclipse/jubula/app/testexec/i18n/messages.properties (renamed from org.eclipse.jubula.app.cmd/src/org/eclipse/jubula/app/cmd/i18n/messages.properties)0
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/AutStarter.java8
-rw-r--r--org.eclipse.jubula.feature.source/feature.xml2
-rw-r--r--org.eclipse.jubula.feature/feature.xml2
-rw-r--r--org.eclipse.jubula.releng.client/pom.xml2
19 files changed, 29 insertions, 28 deletions
diff --git a/org.eclipse.jubula.app.cmd/.checkstyle b/org.eclipse.jubula.app.testexec/.checkstyle
index 90629f73a..69294f41b 100644
--- a/org.eclipse.jubula.app.cmd/.checkstyle
+++ b/org.eclipse.jubula.app.testexec/.checkstyle
@@ -5,6 +5,6 @@
<file-match-pattern match-pattern="." include-pattern="true"/>
</fileset>
<filter name="FilesFromPackage" enabled="true">
- <filter-data value="src/org/eclipse/jubula/app/cmd/i18n"/>
+ <filter-data value="src/org/eclipse/jubula/app/testexec/i18n"/>
</filter>
</fileset-config>
diff --git a/org.eclipse.jubula.app.cmd/.classpath b/org.eclipse.jubula.app.testexec/.classpath
index 64c5e31b7..64c5e31b7 100644
--- a/org.eclipse.jubula.app.cmd/.classpath
+++ b/org.eclipse.jubula.app.testexec/.classpath
diff --git a/org.eclipse.jubula.app.cmd/.gitignore b/org.eclipse.jubula.app.testexec/.gitignore
index 934e0e06f..934e0e06f 100644
--- a/org.eclipse.jubula.app.cmd/.gitignore
+++ b/org.eclipse.jubula.app.testexec/.gitignore
diff --git a/org.eclipse.jubula.app.cmd/.project b/org.eclipse.jubula.app.testexec/.project
index b51ee2771..036d491dd 100644
--- a/org.eclipse.jubula.app.cmd/.project
+++ b/org.eclipse.jubula.app.testexec/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.jubula.app.cmd</name>
+ <name>org.eclipse.jubula.app.testexec</name>
<comment></comment>
<projects>
</projects>
diff --git a/org.eclipse.jubula.app.cmd/META-INF/MANIFEST.MF b/org.eclipse.jubula.app.testexec/META-INF/MANIFEST.MF
index 3fe6c8389..47777f9b0 100644
--- a/org.eclipse.jubula.app.cmd/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.app.testexec/META-INF/MANIFEST.MF
@@ -1,8 +1,9 @@
-Bundle-SymbolicName: org.eclipse.jubula.app.cmd;singleton=true
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.jubula.app.testexec;singleton:=true
Bundle-Name: Jubula Commandline Client
Bundle-Version: 2.1.0.qualifier
Bundle-Vendor: Eclipse Jubula
-Bundle-Activator: org.eclipse.jubula.app.cmd.PluginStarter
+Bundle-Activator: org.eclipse.jubula.app.testexec.PluginStarter
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
org.apache.commons.lang;bundle-version="[2.4.0,3.0.0)",
diff --git a/org.eclipse.jubula.app.cmd/about.html b/org.eclipse.jubula.app.testexec/about.html
index f1be81099..f1be81099 100644
--- a/org.eclipse.jubula.app.cmd/about.html
+++ b/org.eclipse.jubula.app.testexec/about.html
diff --git a/org.eclipse.jubula.app.cmd/build.properties b/org.eclipse.jubula.app.testexec/build.properties
index 17ff10960..17ff10960 100644
--- a/org.eclipse.jubula.app.cmd/build.properties
+++ b/org.eclipse.jubula.app.testexec/build.properties
diff --git a/org.eclipse.jubula.app.cmd/plugin.xml b/org.eclipse.jubula.app.testexec/plugin.xml
index bff1fae2f..c5e23b798 100644
--- a/org.eclipse.jubula.app.cmd/plugin.xml
+++ b/org.eclipse.jubula.app.testexec/plugin.xml
@@ -14,7 +14,7 @@
point="org.eclipse.core.runtime.applications">
<application>
<run
- class="org.eclipse.jubula.app.cmd.Launcher">
+ class="org.eclipse.jubula.app.testexec.Launcher">
</run>
</application>
</extension>
diff --git a/org.eclipse.jubula.app.cmd/pom.xml b/org.eclipse.jubula.app.testexec/pom.xml
index 93beeb80e..957e5a243 100644
--- a/org.eclipse.jubula.app.cmd/pom.xml
+++ b/org.eclipse.jubula.app.testexec/pom.xml
@@ -9,7 +9,7 @@
<relativePath>../org.eclipse.jubula.releng.client</relativePath>
</parent>
<groupId>org.eclipse.jubula</groupId>
- <artifactId>org.eclipse.jubula.app.cmd</artifactId>
+ <artifactId>org.eclipse.jubula.app.testexec</artifactId>
<version>2.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/org.eclipse.jubula.app.cmd/src/org/eclipse/jubula/app/cmd/Launcher.java b/org.eclipse.jubula.app.testexec/src/org/eclipse/jubula/app/testexec/Launcher.java
index 0f49ff72b..893743e5c 100644
--- a/org.eclipse.jubula.app.cmd/src/org/eclipse/jubula/app/cmd/Launcher.java
+++ b/org.eclipse.jubula.app.testexec/src/org/eclipse/jubula/app/testexec/Launcher.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.app.cmd;
+package org.eclipse.jubula.app.testexec;
import org.eclipse.jubula.client.cmd.AbstractCmdlineClient;
import org.eclipse.jubula.client.cmd.AbstractLauncher;
@@ -22,6 +22,6 @@ public class Launcher extends AbstractLauncher {
* {@inheritDoc}
*/
protected AbstractCmdlineClient getAbstractCmdLineClient() {
- return Client.getInstance();
+ return TestexecClient.getInstance();
}
}
diff --git a/org.eclipse.jubula.app.cmd/src/org/eclipse/jubula/app/cmd/PluginStarter.java b/org.eclipse.jubula.app.testexec/src/org/eclipse/jubula/app/testexec/PluginStarter.java
index 3065c358e..116db868f 100644
--- a/org.eclipse.jubula.app.cmd/src/org/eclipse/jubula/app/cmd/PluginStarter.java
+++ b/org.eclipse.jubula.app.testexec/src/org/eclipse/jubula/app/testexec/PluginStarter.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.app.cmd;
+package org.eclipse.jubula.app.testexec;
import org.eclipse.core.runtime.Plugin;
import org.eclipse.jubula.client.cmd.AbstractCmdlineClient;
@@ -19,7 +19,7 @@ import org.osgi.framework.BundleContext;
*/
public class PluginStarter extends Plugin {
/** plugin id */
- public static final String PLUGIN_ID = "org.eclipse.jubula.app.cmd"; //$NON-NLS-1$
+ public static final String PLUGIN_ID = "org.eclipse.jubula.app.testexec"; //$NON-NLS-1$
/** the shared instance*/
private static PluginStarter plugin;
diff --git a/org.eclipse.jubula.app.cmd/src/org/eclipse/jubula/app/cmd/Client.java b/org.eclipse.jubula.app.testexec/src/org/eclipse/jubula/app/testexec/TestexecClient.java
index 9dfc58dbe..4d4539adb 100644
--- a/org.eclipse.jubula.app.cmd/src/org/eclipse/jubula/app/cmd/Client.java
+++ b/org.eclipse.jubula.app.testexec/src/org/eclipse/jubula/app/testexec/TestexecClient.java
@@ -9,11 +9,11 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.app.cmd;
+package org.eclipse.jubula.app.testexec;
import org.apache.commons.cli.OptionGroup;
import org.apache.commons.cli.Options;
-import org.eclipse.jubula.app.cmd.batch.ExecutionController;
+import org.eclipse.jubula.app.testexec.batch.ExecutionController;
import org.eclipse.jubula.client.cmd.AbstractCmdlineClient;
import org.eclipse.jubula.client.cmd.JobConfiguration;
import org.eclipse.jubula.client.cmd.constants.ClientStrings;
@@ -28,10 +28,10 @@ import org.slf4j.LoggerFactory;
/**
* @created Mar 21, 2006
*/
-public class Client extends AbstractCmdlineClient {
+public class TestexecClient extends AbstractCmdlineClient {
/** log facility */
- private static Logger log = LoggerFactory.getLogger(Client.class);
+ private static Logger log = LoggerFactory.getLogger(TestexecClient.class);
/** the instance */
private static AbstractCmdlineClient instance = null;
@@ -40,7 +40,7 @@ public class Client extends AbstractCmdlineClient {
* private contructor
*
*/
- private Client() {
+ private TestexecClient() {
//no public constructor for this class
}
@@ -51,7 +51,7 @@ public class Client extends AbstractCmdlineClient {
*/
public static AbstractCmdlineClient getInstance() {
if (instance == null) {
- instance = new Client();
+ instance = new TestexecClient();
}
return instance;
}
@@ -225,6 +225,6 @@ public class Client extends AbstractCmdlineClient {
/** {@inheritDoc} */
public String getCmdlineClientExecName() {
- return org.eclipse.jubula.app.cmd.i18n.Messages.ClientNameShort;
+ return org.eclipse.jubula.app.testexec.i18n.Messages.ClientNameShort;
}
} \ No newline at end of file
diff --git a/org.eclipse.jubula.app.cmd/src/org/eclipse/jubula/app/cmd/batch/ExecutionController.java b/org.eclipse.jubula.app.testexec/src/org/eclipse/jubula/app/testexec/batch/ExecutionController.java
index 597fc5da9..2110f14cc 100644
--- a/org.eclipse.jubula.app.cmd/src/org/eclipse/jubula/app/cmd/batch/ExecutionController.java
+++ b/org.eclipse.jubula.app.testexec/src/org/eclipse/jubula/app/testexec/batch/ExecutionController.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.app.cmd.batch;
+package org.eclipse.jubula.app.testexec.batch;
import java.io.BufferedReader;
import java.io.File;
@@ -25,7 +25,7 @@ import java.util.TimerTask;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.Validate;
import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jubula.app.cmd.i18n.Messages;
+import org.eclipse.jubula.app.testexec.i18n.Messages;
import org.eclipse.jubula.client.cmd.AbstractCmdlineClient;
import org.eclipse.jubula.client.cmd.JobConfiguration;
import org.eclipse.jubula.client.cmd.controller.IClcServer;
diff --git a/org.eclipse.jubula.app.cmd/src/org/eclipse/jubula/app/cmd/i18n/Messages.java b/org.eclipse.jubula.app.testexec/src/org/eclipse/jubula/app/testexec/i18n/Messages.java
index d61450948..7f5bc6796 100644
--- a/org.eclipse.jubula.app.cmd/src/org/eclipse/jubula/app/cmd/i18n/Messages.java
+++ b/org.eclipse.jubula.app.testexec/src/org/eclipse/jubula/app/testexec/i18n/Messages.java
@@ -8,7 +8,7 @@
* Contributors:
* BREDEX GmbH - initial API and implementation and/or initial documentation
*******************************************************************************/
-package org.eclipse.jubula.app.cmd.i18n;
+package org.eclipse.jubula.app.testexec.i18n;
import org.eclipse.osgi.util.NLS;
@@ -17,7 +17,7 @@ import org.eclipse.osgi.util.NLS;
* @created 10.12.2010
*/
public class Messages extends NLS {
- private static final String BUNDLE_NAME = "org.eclipse.jubula.app.cmd.i18n.messages"; //$NON-NLS-1$
+ private static final String BUNDLE_NAME = "org.eclipse.jubula.app.testexec.i18n.messages"; //$NON-NLS-1$
public static String ConnectingToAUTAgent;
public static String ConnectionToAUTAgentFailed;
diff --git a/org.eclipse.jubula.app.cmd/src/org/eclipse/jubula/app/cmd/i18n/messages.properties b/org.eclipse.jubula.app.testexec/src/org/eclipse/jubula/app/testexec/i18n/messages.properties
index 4ad8b76cd..4ad8b76cd 100644
--- a/org.eclipse.jubula.app.cmd/src/org/eclipse/jubula/app/cmd/i18n/messages.properties
+++ b/org.eclipse.jubula.app.testexec/src/org/eclipse/jubula/app/testexec/i18n/messages.properties
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/AutStarter.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/AutStarter.java
index dbe5e2623..0b574d1a4 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/AutStarter.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/AutStarter.java
@@ -422,7 +422,7 @@ public class AutStarter {
}
/**
- * A thread waiting for termination of the autServerVM. Puts the exitcode
+ * A thread waiting for termination of the autServerVM. Puts the exit code
* into m_autExitValue and handle the termination.
*
* @author BREDEX GmbH
@@ -430,7 +430,7 @@ public class AutStarter {
*/
private static class AUTServerWatcher extends Thread {
- /** lock for synchonizing on m_autServerVM */
+ /** lock for synchronizing on m_autServerVM */
private final Object m_autServerLock = new Object();
/**
@@ -451,7 +451,7 @@ public class AutStarter {
*/
private boolean m_isExpectingAUTServerStop;
- /** whether the AUT was startet using the GDAgent mechanism */
+ /** whether the AUT was started using the GDAgent mechanism */
private boolean m_isAgentSet;
/** sends messages concerning the AUT Server */
@@ -462,7 +462,7 @@ public class AutStarter {
*
* @param autServerProcess The process in which the AUT and AUT Server
* are running.
- * @param isAgentSet Whether the AUT was startet using the GDAgent
+ * @param isAgentSet Whether the AUT was started using the GDAgent
* mechanism.
* @param messenger Sends messages concerning the AUT Server.
*/
diff --git a/org.eclipse.jubula.feature.source/feature.xml b/org.eclipse.jubula.feature.source/feature.xml
index 677651c5a..7d642b20f 100644
--- a/org.eclipse.jubula.feature.source/feature.xml
+++ b/org.eclipse.jubula.feature.source/feature.xml
@@ -145,7 +145,7 @@ BREDEX GmbH - initial API and implementation and/or initial documentation
unpack="false"/>
<plugin
- id="org.eclipse.jubula.app.cmd.source"
+ id="org.eclipse.jubula.app.testexec.source"
download-size="0"
install-size="0"
version="0.0.0"
diff --git a/org.eclipse.jubula.feature/feature.xml b/org.eclipse.jubula.feature/feature.xml
index bdb8c9e1b..e7051565d 100644
--- a/org.eclipse.jubula.feature/feature.xml
+++ b/org.eclipse.jubula.feature/feature.xml
@@ -263,7 +263,7 @@ BREDEX GmbH - initial API and implementation and/or initial documentation
unpack="false"/>
<plugin
- id="org.eclipse.jubula.app.cmd"
+ id="org.eclipse.jubula.app.testexec"
download-size="0"
install-size="0"
version="0.0.0"
diff --git a/org.eclipse.jubula.releng.client/pom.xml b/org.eclipse.jubula.releng.client/pom.xml
index a7d57877c..87d80270d 100644
--- a/org.eclipse.jubula.releng.client/pom.xml
+++ b/org.eclipse.jubula.releng.client/pom.xml
@@ -17,7 +17,7 @@
<modules>
<module>../org.eclipse.jubula.site</module>
<module>../org.eclipse.jubula.app</module>
- <module>../org.eclipse.jubula.app.cmd</module>
+ <module>../org.eclipse.jubula.app.testexec</module>
<module>../org.eclipse.jubula.app.dbtool</module>
<module>../org.eclipse.jubula.feature</module>
<module>../org.eclipse.jubula.feature.source</module>

Back to the top