Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Tiede2011-04-28 13:57:02 +0000
committerMarkus Tiede2011-04-28 13:57:02 +0000
commit5c281aab051fb7d9d10cdb820d6b19735effc8a9 (patch)
treecfcf4bfeb6c04a559f8944cc5f3661d31059def3
parent09169b9b476aa774b456416b5bb60f67996b837f (diff)
downloadorg.eclipse.jubula.core-5c281aab051fb7d9d10cdb820d6b19735effc8a9.tar.gz
org.eclipse.jubula.core-5c281aab051fb7d9d10cdb820d6b19735effc8a9.tar.xz
org.eclipse.jubula.core-5c281aab051fb7d9d10cdb820d6b19735effc8a9.zip
Timebox task - major releng change - switched to maven build for *common.agent, *common, AUTLauncher, *rc.swing and rc.swt.
-rw-r--r--org.eclipse.jubula.rc.common.agent/.classpath10
-rw-r--r--org.eclipse.jubula.rc.common.agent/.gitignore3
-rw-r--r--org.eclipse.jubula.rc.common.agent/.project8
-rw-r--r--org.eclipse.jubula.rc.common.agent/.settings/org.eclipse.jdt.core.prefs6
-rw-r--r--org.eclipse.jubula.rc.common.agent/.settings/org.maven.ide.eclipse.prefs8
-rw-r--r--org.eclipse.jubula.rc.common.agent/buildScript.xml94
-rw-r--r--org.eclipse.jubula.rc.common.agent/pom.xml59
-rw-r--r--org.eclipse.jubula.rc.common/.classpath9
-rw-r--r--org.eclipse.jubula.rc.common/.gitignore3
-rw-r--r--org.eclipse.jubula.rc.common/.project9
-rw-r--r--org.eclipse.jubula.rc.common/.settings/org.eclipse.jdt.core.prefs3
-rw-r--r--org.eclipse.jubula.rc.common/.settings/org.maven.ide.eclipse.prefs8
-rw-r--r--org.eclipse.jubula.rc.common/artifacts/AUTLauncher/.gitignore1
-rw-r--r--org.eclipse.jubula.rc.common/artifacts/AUTLauncher/pom.xml53
-rw-r--r--org.eclipse.jubula.rc.common/artifacts/org.eclipse.jubula.rc.common/.gitignore1
-rw-r--r--org.eclipse.jubula.rc.common/artifacts/org.eclipse.jubula.rc.common/pom.xml66
-rw-r--r--org.eclipse.jubula.rc.common/buildScript.xml94
-rw-r--r--org.eclipse.jubula.rc.common/lib/.keep0
-rw-r--r--org.eclipse.jubula.rc.common/pom.xml25
-rw-r--r--org.eclipse.jubula.rc.swing/.classpath8
-rw-r--r--org.eclipse.jubula.rc.swing/.gitignore3
-rw-r--r--org.eclipse.jubula.rc.swing/.project6
-rw-r--r--org.eclipse.jubula.rc.swing/.settings/org.eclipse.jdt.core.prefs3
-rw-r--r--org.eclipse.jubula.rc.swing/.settings/org.maven.ide.eclipse.prefs8
-rw-r--r--org.eclipse.jubula.rc.swing/buildScript.xml92
-rw-r--r--org.eclipse.jubula.rc.swing/pom.xml63
-rw-r--r--org.eclipse.jubula.rc.swt/.classpath10
-rw-r--r--org.eclipse.jubula.rc.swt/.gitignore3
-rw-r--r--org.eclipse.jubula.rc.swt/.project6
-rw-r--r--org.eclipse.jubula.rc.swt/.settings/org.eclipse.jdt.core.prefs3
-rw-r--r--org.eclipse.jubula.rc.swt/.settings/org.maven.ide.eclipse.prefs8
-rw-r--r--org.eclipse.jubula.rc.swt/buildScript.xml90
-rw-r--r--org.eclipse.jubula.rc.swt/pom.xml50
-rw-r--r--org.eclipse.jubula.releng.server/pom.xml226
-rw-r--r--org.eclipse.jubula.releng/.settings/org.maven.ide.eclipse.prefs8
-rw-r--r--org.eclipse.jubula.releng/pom.xml1
36 files changed, 533 insertions, 515 deletions
diff --git a/org.eclipse.jubula.rc.common.agent/.classpath b/org.eclipse.jubula.rc.common.agent/.classpath
index 406931f33..e1cb9226b 100644
--- a/org.eclipse.jubula.rc.common.agent/.classpath
+++ b/org.eclipse.jubula.rc.common.agent/.classpath
@@ -1,9 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.jubula.rc.common"/>
- <classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.jubula.tools"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="src" output="target/classes" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/org.eclipse.jubula.rc.common.agent/.gitignore b/org.eclipse.jubula.rc.common.agent/.gitignore
index 348c102af..ea8c4bf7f 100644
--- a/org.eclipse.jubula.rc.common.agent/.gitignore
+++ b/org.eclipse.jubula.rc.common.agent/.gitignore
@@ -1,2 +1 @@
-/build
-/bin
+/target
diff --git a/org.eclipse.jubula.rc.common.agent/.project b/org.eclipse.jubula.rc.common.agent/.project
index 25b62cd7a..61b7750c0 100644
--- a/org.eclipse.jubula.rc.common.agent/.project
+++ b/org.eclipse.jubula.rc.common.agent/.project
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.eclipse.jubula.rc.common.agent</name>
- <comment></comment>
+ <comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
<projects>
</projects>
<buildSpec>
@@ -15,8 +15,14 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
</natures>
diff --git a/org.eclipse.jubula.rc.common.agent/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jubula.rc.common.agent/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 000000000..55f29d18d
--- /dev/null
+++ b/org.eclipse.jubula.rc.common.agent/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,6 @@
+#Wed Apr 27 14:19:47 CEST 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/org.eclipse.jubula.rc.common.agent/.settings/org.maven.ide.eclipse.prefs b/org.eclipse.jubula.rc.common.agent/.settings/org.maven.ide.eclipse.prefs
new file mode 100644
index 000000000..a1de82e49
--- /dev/null
+++ b/org.eclipse.jubula.rc.common.agent/.settings/org.maven.ide.eclipse.prefs
@@ -0,0 +1,8 @@
+#Wed Apr 27 14:19:45 CEST 2011
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1
diff --git a/org.eclipse.jubula.rc.common.agent/buildScript.xml b/org.eclipse.jubula.rc.common.agent/buildScript.xml
deleted file mode 100644
index 0d5b1eb59..000000000
--- a/org.eclipse.jubula.rc.common.agent/buildScript.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0"?><!--
- Copyright (c) 2004, 2010 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
- -->
-
-<project name="org.eclipse.jubula.rc.common.agent" default="compile" basedir=".">
-
- <!--
- application specific
- *********************
- app.name the name of the application
- which is used for directory naming.
- you can use projects name in 90%.
- -->
- <property name="app.name" value="org.eclipse.jubula.rc.common.agent"/>
-
- <!--
- general definitions
- ********************
-
- src the name of the diretory(starting at basedir)
- where to find project source files
-
- build the name of the diretory(starting at basedir)
- where to compile to.
-
- classes the name of the diretory(starting at basedir)
- where to put compiled classes to.
-
- jars the name of the diretory(starting at basedir)
- where to put generated jars to.
-
- lib the name of the diretory(starting at basedir)
- where to find libaries, needed for
- compilation.
-
- -->
- <property name="src" value="src"/>
- <property name="build" value="build"/>
- <property name="classes" value="build/classes"/>
- <property name="jars" value="build/jars"/>
- <property name="MF" value="META-INF/MANIFEST.MF"/>
-
- <!-- classpath -->
-
- <!-- internal -->
- <property name="javac" value="javac"/>
- <property name="javac.classpath" value="classpathGDAgent"/>
- <property name="javac.debug" value="javac.debug"/>
-
- <!--
- Targets
- ********
-
- all calling the targets clean and compile.
- So "all" is replacing compiled files
-
- clean deletes the build directory
-
- compile compiles a project into the $build directory
-
- jar creates one or more jar files from the project.
-
- -->
- <target name="all" depends="clean, compile">
- </target>
-
- <target name="clean">
- <delete dir="${build}"/>
- </target>
-
- <target name="compile">
- <mkdir dir="${build}"/>
- <mkdir dir="${classes}"/>
- <mkdir dir="${jars}"/>
- <javac srcdir="${src}"
- destdir="${classes}"
- debug="${javac.debug}"
- classpathref="${javac.classpath}"
- fork="true"
- executable="${javac}"/>
- </target>
-
- <target name="jar" depends="compile">
- <jar filesetmanifest="merge" manifest="${MF}" basedir="${classes}" destfile="${jars}/${app.name}.jar">
- <fileset dir="${src}"
- includes="**/*"
- excludes="**/*.java"/>
- </jar>
- </target>
-</project>
diff --git a/org.eclipse.jubula.rc.common.agent/pom.xml b/org.eclipse.jubula.rc.common.agent/pom.xml
new file mode 100644
index 000000000..87f8989a9
--- /dev/null
+++ b/org.eclipse.jubula.rc.common.agent/pom.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (c) 2004, 2011 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 -->
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>org.eclipse.jubula.releng.server</artifactId>
+ <groupId>org.eclipse.jubula</groupId>
+ <version>0.9.0-SNAPSHOT</version>
+ <relativePath>../org.eclipse.jubula.releng.server</relativePath>
+ </parent>
+ <groupId>org.eclipse.jubula</groupId>
+ <artifactId>org.eclipse.jubula.rc.common.agent</artifactId>
+ <version>0.9.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <build>
+ <finalName>org.eclipse.jubula.rc.common.agent</finalName>
+ <sourceDirectory>src</sourceDirectory>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <archive>
+ <manifestFile>META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.eclipse.jubula</groupId>
+ <artifactId>org.eclipse.jubula.tools</artifactId>
+ <version>0.9.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jubula</groupId>
+ <artifactId>org.eclipse.jubula.rc.common</artifactId>
+ <version>0.9.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
+</project>
diff --git a/org.eclipse.jubula.rc.common/.classpath b/org.eclipse.jubula.rc.common/.classpath
index 8b8d8e633..0e96ed237 100644
--- a/org.eclipse.jubula.rc.common/.classpath
+++ b/org.eclipse.jubula.rc.common/.classpath
@@ -1,11 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.jubula.communication"/>
+ <classpathentry kind="src" output="target/classes" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.jubula.tools"/>
- <classpathentry kind="lib" path="/org.eclipse.jubula.rc.common.orbit/org.apache.commons.beanutils_1.7.0.v200902170505.jar"/>
- <classpathentry kind="lib" path="/org.eclipse.jubula.rc.common.orbit/org.apache.oro_2.0.8.v201005080400.jar"/>
- <classpathentry kind="lib" path="/org.eclipse.jubula.rc.common.orbit/org.apache.commons.collections_3.2.0.v201005080500.jar"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/org.eclipse.jubula.rc.common/.gitignore b/org.eclipse.jubula.rc.common/.gitignore
index 348c102af..ea8c4bf7f 100644
--- a/org.eclipse.jubula.rc.common/.gitignore
+++ b/org.eclipse.jubula.rc.common/.gitignore
@@ -1,2 +1 @@
-/build
-/bin
+/target
diff --git a/org.eclipse.jubula.rc.common/.project b/org.eclipse.jubula.rc.common/.project
index 6708bd821..2988fa998 100644
--- a/org.eclipse.jubula.rc.common/.project
+++ b/org.eclipse.jubula.rc.common/.project
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.eclipse.jubula.rc.common</name>
- <comment></comment>
+ <comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
<projects>
+ <project>org.eclipse.jubula.tools</project>
</projects>
<buildSpec>
<buildCommand>
@@ -15,8 +16,14 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
</natures>
diff --git a/org.eclipse.jubula.rc.common/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jubula.rc.common/.settings/org.eclipse.jdt.core.prefs
index 29a2d79b7..6bf5dc068 100644
--- a/org.eclipse.jubula.rc.common/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.jubula.rc.common/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,9 @@
-#Thu May 03 11:54:18 CEST 2007
+#Wed Apr 27 14:25:57 CEST 2011
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
org.eclipse.jdt.core.compiler.compliance=1.4
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.source=1.4
diff --git a/org.eclipse.jubula.rc.common/.settings/org.maven.ide.eclipse.prefs b/org.eclipse.jubula.rc.common/.settings/org.maven.ide.eclipse.prefs
new file mode 100644
index 000000000..44ab569fc
--- /dev/null
+++ b/org.eclipse.jubula.rc.common/.settings/org.maven.ide.eclipse.prefs
@@ -0,0 +1,8 @@
+#Wed Apr 27 14:25:57 CEST 2011
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1
diff --git a/org.eclipse.jubula.rc.common/artifacts/AUTLauncher/.gitignore b/org.eclipse.jubula.rc.common/artifacts/AUTLauncher/.gitignore
new file mode 100644
index 000000000..ea8c4bf7f
--- /dev/null
+++ b/org.eclipse.jubula.rc.common/artifacts/AUTLauncher/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/org.eclipse.jubula.rc.common/artifacts/AUTLauncher/pom.xml b/org.eclipse.jubula.rc.common/artifacts/AUTLauncher/pom.xml
new file mode 100644
index 000000000..22686ae35
--- /dev/null
+++ b/org.eclipse.jubula.rc.common/artifacts/AUTLauncher/pom.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (c) 2004, 2011 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 -->
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>org.eclipse.jubula.rc.common.project</artifactId>
+ <groupId>org.eclipse.jubula</groupId>
+ <version>0.9.0-SNAPSHOT</version>
+ <relativePath>../..</relativePath>
+ </parent>
+ <groupId>org.eclipse.jubula</groupId>
+ <artifactId>org.eclipse.jubula.rc.common.autlauncher</artifactId>
+ <version>0.9.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <build>
+ <finalName>AUTLauncher</finalName>
+ <sourceDirectory>../../src</sourceDirectory>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <source>1.4</source>
+ <target>1.4</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <includes>
+ <include>**/AutServerLauncher*.class</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.eclipse.jubula</groupId>
+ <artifactId>org.eclipse.jubula.tools</artifactId>
+ <version>0.9.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/org.eclipse.jubula.rc.common/artifacts/org.eclipse.jubula.rc.common/.gitignore b/org.eclipse.jubula.rc.common/artifacts/org.eclipse.jubula.rc.common/.gitignore
new file mode 100644
index 000000000..ea8c4bf7f
--- /dev/null
+++ b/org.eclipse.jubula.rc.common/artifacts/org.eclipse.jubula.rc.common/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/org.eclipse.jubula.rc.common/artifacts/org.eclipse.jubula.rc.common/pom.xml b/org.eclipse.jubula.rc.common/artifacts/org.eclipse.jubula.rc.common/pom.xml
new file mode 100644
index 000000000..e84ef1c1f
--- /dev/null
+++ b/org.eclipse.jubula.rc.common/artifacts/org.eclipse.jubula.rc.common/pom.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (c) 2004, 2011 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 -->
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>org.eclipse.jubula.rc.common.project</artifactId>
+ <groupId>org.eclipse.jubula</groupId>
+ <version>0.9.0-SNAPSHOT</version>
+ <relativePath>../..</relativePath>
+ </parent>
+ <groupId>org.eclipse.jubula</groupId>
+ <artifactId>org.eclipse.jubula.rc.common</artifactId>
+ <version>0.9.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <build>
+ <finalName>org.eclipse.jubula.rc.common</finalName>
+ <sourceDirectory>../../src</sourceDirectory>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <source>1.4</source>
+ <target>1.4</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.eclipse.jubula.rc.common.orbit</groupId>
+ <artifactId>org.apache.commons.beanutils</artifactId>
+ <version>1.7.0.v200902170505</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jubula.rc.common.orbit</groupId>
+ <artifactId>org.apache.oro</artifactId>
+ <version>2.0.8.v201005080400</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jubula.rc.common.orbit</groupId>
+ <artifactId>org.apache.commons.collections</artifactId>
+ <version>3.2.0.v201005080500</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jubula</groupId>
+ <artifactId>org.eclipse.jubula.communication</artifactId>
+ <version>0.9.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jubula</groupId>
+ <artifactId>org.eclipse.jubula.tools</artifactId>
+ <version>0.9.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/org.eclipse.jubula.rc.common/buildScript.xml b/org.eclipse.jubula.rc.common/buildScript.xml
deleted file mode 100644
index 7a6ebe8ba..000000000
--- a/org.eclipse.jubula.rc.common/buildScript.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0"?><!--
- Copyright (c) 2004, 2010 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
- -->
-
-<project name="org.eclipse.jubula.rc.common" default="compile" basedir=".">
-
- <!--
- general definitions
- ********************
-
- src the name of the diretory(starting at basedir)
- where to find project source files
-
- build the name of the diretory(starting at basedir)
- where to compile to.
-
- classes the name of the diretory(starting at basedir)
- where to put compiled classes to.
-
- jars the name of the diretory(starting at basedir)
- where to put generated jars to.
-
- lib the name of the diretory(starting at basedir)
- where to find libaries, needed for
- compilation.
-
- -->
- <property name="src" value="src"/>
- <property name="build" value="build"/>
- <property name="classes" value="build/classes"/>
- <property name="jars" value="build/jars"/>
-
- <!-- classpath -->
- <property name="javac" value="javac"/>
- <property name="javac.classpath" value="classpath"/>
- <property name="javac.debug" value="javac.debug"/>
-
- <!--
- Targets
- ********
-
- all calling the targets clean and compile.
- So "all" is replacing compiled files
-
- clean deletes the build directory
-
- compile compiles a project into the $build directory
-
- jar creates one or more jar files from the project.
-
- -->
-
- <target name="all" depends="clean, compile">
- </target>
-
- <target name="clean">
- <delete dir="${build}"/>
- </target>
-
- <target name="compile">
- <mkdir dir="${build}"/>
- <mkdir dir="${classes}"/>
- <mkdir dir="${jars}"/>
- <javac sourcepath=""
- srcdir="${src}"
- destdir="${classes}"
- classpathref="${javac.classpath}"
- source="1.4"
- target="1.4"
- debug="${javac.debug}"
- fork="true"
- executable="${javac}">
-
- </javac>
-
- </target>
-
- <target name="jar" depends="compile">
- <jar basedir="${classes}" destfile="${jars}/AUTLauncher.jar"
- includes="**/AutServerLauncher*.class">
- </jar>
-
- <jar basedir="${classes}" destfile="${jars}/org.eclipse.jubula.rc.common.jar">
- <fileset dir="${src}"
- includes="**/*"
- excludes="**/*.java" />
- </jar>
- </target>
-
-</project> \ No newline at end of file
diff --git a/org.eclipse.jubula.rc.common/lib/.keep b/org.eclipse.jubula.rc.common/lib/.keep
deleted file mode 100644
index e69de29bb..000000000
--- a/org.eclipse.jubula.rc.common/lib/.keep
+++ /dev/null
diff --git a/org.eclipse.jubula.rc.common/pom.xml b/org.eclipse.jubula.rc.common/pom.xml
new file mode 100644
index 000000000..423ebd471
--- /dev/null
+++ b/org.eclipse.jubula.rc.common/pom.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (c) 2004, 2011 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 -->
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>org.eclipse.jubula.releng.server</artifactId>
+ <groupId>org.eclipse.jubula</groupId>
+ <version>0.9.0-SNAPSHOT</version>
+ <relativePath>../org.eclipse.jubula.releng.server</relativePath>
+ </parent>
+ <groupId>org.eclipse.jubula</groupId>
+ <artifactId>org.eclipse.jubula.rc.common.project</artifactId>
+ <version>0.9.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>artifacts/AUTLauncher</module>
+ <module>artifacts/org.eclipse.jubula.rc.common</module>
+ </modules>
+</project>
diff --git a/org.eclipse.jubula.rc.swing/.classpath b/org.eclipse.jubula.rc.swing/.classpath
index ab493a4ca..0e96ed237 100644
--- a/org.eclipse.jubula.rc.swing/.classpath
+++ b/org.eclipse.jubula.rc.swing/.classpath
@@ -1,10 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.jubula.communication"/>
+ <classpathentry kind="src" output="target/classes" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.jubula.tools"/>
- <classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.jubula.rc.common"/>
- <classpathentry kind="lib" path="/org.eclipse.jubula.rc.common.orbit/org.apache.commons.beanutils_1.7.0.v200902170505.jar"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/org.eclipse.jubula.rc.swing/.gitignore b/org.eclipse.jubula.rc.swing/.gitignore
index 348c102af..ea8c4bf7f 100644
--- a/org.eclipse.jubula.rc.swing/.gitignore
+++ b/org.eclipse.jubula.rc.swing/.gitignore
@@ -1,2 +1 @@
-/build
-/bin
+/target
diff --git a/org.eclipse.jubula.rc.swing/.project b/org.eclipse.jubula.rc.swing/.project
index 867808058..794f0053c 100644
--- a/org.eclipse.jubula.rc.swing/.project
+++ b/org.eclipse.jubula.rc.swing/.project
@@ -15,8 +15,14 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
</natures>
diff --git a/org.eclipse.jubula.rc.swing/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jubula.rc.swing/.settings/org.eclipse.jdt.core.prefs
index ff9f09941..edf191e25 100644
--- a/org.eclipse.jubula.rc.swing/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.jubula.rc.swing/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,8 @@
-#Thu May 03 11:54:00 CEST 2007
+#Wed Apr 27 14:58:57 CEST 2011
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
org.eclipse.jdt.core.compiler.compliance=1.4
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.source=1.4
diff --git a/org.eclipse.jubula.rc.swing/.settings/org.maven.ide.eclipse.prefs b/org.eclipse.jubula.rc.swing/.settings/org.maven.ide.eclipse.prefs
new file mode 100644
index 000000000..7a2a6c9a7
--- /dev/null
+++ b/org.eclipse.jubula.rc.swing/.settings/org.maven.ide.eclipse.prefs
@@ -0,0 +1,8 @@
+#Wed Apr 27 14:58:57 CEST 2011
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1
diff --git a/org.eclipse.jubula.rc.swing/buildScript.xml b/org.eclipse.jubula.rc.swing/buildScript.xml
deleted file mode 100644
index 001034c0c..000000000
--- a/org.eclipse.jubula.rc.swing/buildScript.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0"?><!--
- Copyright (c) 2004, 2010 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
- -->
-
-<project name="org.eclipse.jubula.rc.swing" default="compile" basedir=".">
-
- <!--
- general definitions
- ********************
-
- src the name of the diretory(starting at basedir)
- where to find project source files
-
- build the name of the diretory(starting at basedir)
- where to compile to.
-
- classes the name of the diretory(starting at basedir)
- where to put compiled classes to.
-
- jars the name of the diretory(starting at basedir)
- where to put generated jars to.
-
- lib the name of the diretory(starting at basedir)
- where to find libaries, needed for
- compilation.
-
- -->
- <property name="src" value="src"/>
- <property name="build" value="build"/>
- <property name="classes" value="build/classes"/>
- <property name="jars" value="build/jars"/>
- <property name="lib" value="lib"/>
-
- <!-- classpath -->
- <property name="javac" value="javac"/>
- <property name="javac.classpath" value="classpath"/>
- <property name="javac.debug" value="javac.debug"/>
-
- <!--
- Targets
- ********
-
- all calling the targets clean and compile.
- So "all" is replacing compiled files
-
- clean deletes the build directory
-
- compile compiles a project into the $build directory
-
- jar creates one or more jar files from the project.
-
- -->
- <target name="all" depends="clean, compile">
- </target>
-
- <target name="clean">
- <delete dir="${build}"/>
- </target>
-
- <target name="compile">
- <mkdir dir="${build}"/>
- <mkdir dir="${classes}"/>
- <mkdir dir="${jars}"/>
- <javac sourcepath=""
- srcdir="${src}"
- destdir="${classes}"
- classpathref="${javac.classpath}"
- source="1.4"
- target="1.4"
- debug="${javac.debug}"
- fork="true"
- executable="${javac}">
-
- </javac>
-
- </target>
-
- <target name="jar" depends="compile">
- <jar basedir="${classes}" destfile="${jars}/org.eclipse.jubula.rc.swing.jar">
- <exclude name="**/Server*.*"/>
- <fileset dir="${src}"
- includes="**/*"
- excludes="**/*.java"
- />
- </jar>
- </target>
-
-</project> \ No newline at end of file
diff --git a/org.eclipse.jubula.rc.swing/pom.xml b/org.eclipse.jubula.rc.swing/pom.xml
new file mode 100644
index 000000000..0d936341d
--- /dev/null
+++ b/org.eclipse.jubula.rc.swing/pom.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2004, 2011 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
+ -->
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>org.eclipse.jubula.releng.server</artifactId>
+ <groupId>org.eclipse.jubula</groupId>
+ <version>0.9.0-SNAPSHOT</version>
+ <relativePath>../org.eclipse.jubula.releng.server</relativePath>
+ </parent>
+ <groupId>org.eclipse.jubula</groupId>
+ <artifactId>org.eclipse.jubula.rc.swing</artifactId>
+ <version>0.9.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <build>
+ <finalName>org.eclipse.jubula.rc.swing</finalName>
+ <sourceDirectory>src</sourceDirectory>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <source>1.4</source>
+ <target>1.4</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.eclipse.jubula.rc.common.orbit</groupId>
+ <artifactId>org.apache.commons.beanutils</artifactId>
+ <version>1.7.0.v200902170505</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jubula</groupId>
+ <artifactId>org.eclipse.jubula.rc.common</artifactId>
+ <version>0.9.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jubula</groupId>
+ <artifactId>org.eclipse.jubula.communication</artifactId>
+ <version>0.9.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jubula</groupId>
+ <artifactId>org.eclipse.jubula.tools</artifactId>
+ <version>0.9.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
+</project>
diff --git a/org.eclipse.jubula.rc.swt/.classpath b/org.eclipse.jubula.rc.swt/.classpath
index f0cc86d1c..0e96ed237 100644
--- a/org.eclipse.jubula.rc.swt/.classpath
+++ b/org.eclipse.jubula.rc.swt/.classpath
@@ -1,10 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.jubula.communication"/>
- <classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.jubula.rc.common"/>
+ <classpathentry kind="src" output="target/classes" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
- <classpathentry kind="lib" path="/org.eclipse.jubula.project.compatibility/lib/swt_3.1.jar"/>
- <classpathentry kind="lib" path="/org.eclipse.jubula.rc.common.orbit/org.apache.commons.beanutils_1.7.0.v200902170505.jar"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.jubula.tools"/>
+ <classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/org.eclipse.jubula.rc.swt/.gitignore b/org.eclipse.jubula.rc.swt/.gitignore
index 348c102af..ea8c4bf7f 100644
--- a/org.eclipse.jubula.rc.swt/.gitignore
+++ b/org.eclipse.jubula.rc.swt/.gitignore
@@ -1,2 +1 @@
-/build
-/bin
+/target
diff --git a/org.eclipse.jubula.rc.swt/.project b/org.eclipse.jubula.rc.swt/.project
index 0cc696f21..e1bc89f5b 100644
--- a/org.eclipse.jubula.rc.swt/.project
+++ b/org.eclipse.jubula.rc.swt/.project
@@ -15,8 +15,14 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
</natures>
diff --git a/org.eclipse.jubula.rc.swt/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jubula.rc.swt/.settings/org.eclipse.jdt.core.prefs
index cc89d78e8..fcead0a0f 100644
--- a/org.eclipse.jubula.rc.swt/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.jubula.rc.swt/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,8 @@
-#Thu May 03 11:54:46 CEST 2007
+#Thu Apr 28 09:51:47 CEST 2011
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
org.eclipse.jdt.core.compiler.compliance=1.4
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.source=1.4
diff --git a/org.eclipse.jubula.rc.swt/.settings/org.maven.ide.eclipse.prefs b/org.eclipse.jubula.rc.swt/.settings/org.maven.ide.eclipse.prefs
new file mode 100644
index 000000000..479d21f3f
--- /dev/null
+++ b/org.eclipse.jubula.rc.swt/.settings/org.maven.ide.eclipse.prefs
@@ -0,0 +1,8 @@
+#Thu Apr 28 09:24:10 CEST 2011
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1
diff --git a/org.eclipse.jubula.rc.swt/buildScript.xml b/org.eclipse.jubula.rc.swt/buildScript.xml
deleted file mode 100644
index 7e7e16e96..000000000
--- a/org.eclipse.jubula.rc.swt/buildScript.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0"?><!--
- Copyright (c) 2004, 2010 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
- -->
-
-<project name="org.eclipse.jubula.rc.swt" default="compile" basedir=".">
-
- <!--
- general definitions
- ********************
-
- src the name of the diretory(starting at basedir)
- where to find project source files
-
- build the name of the diretory(starting at basedir)
- where to compile to.
-
- classes the name of the diretory(starting at basedir)
- where to put compiled classes to.
-
- jars the name of the diretory(starting at basedir)
- where to put generated jars to.
-
- lib the name of the diretory(starting at basedir)
- where to find libaries or jars, needed for
- compilation.
-
- -->
- <property name="src" value="src"/>
- <property name="build" value="build"/>
- <property name="classes" value="build/classes"/>
- <property name="jars" value="build/jars"/>
- <property name="lib" value="lib"/>
-
- <!-- classpath -->
- <property name="javac" value="javac"/>
- <property name="javac.classpath" value="classpath"/>
- <property name="javac.debug" value="javac.debug"/>
-
- <!--
- Targets
- ********
-
- all calling the targets clean and compile.
- So "all" is replacing compiled files
-
- clean deletes the build directory
-
- compile compiles a project into the $build directory
-
- jar creates one or more jar files from the project.
-
- -->
- <target name="all" depends="clean, compile">
- </target>
-
- <target name="clean">
- <delete dir="${build}"/>
- </target>
-
- <target name="compile">
- <mkdir dir="${build}"/>
- <mkdir dir="${classes}"/>
- <mkdir dir="${jars}"/>
- <javac sourcepath=""
- srcdir="${src}"
- destdir="${classes}"
- classpathref="${javac.classpath}"
- source="1.4"
- target="1.4"
- debug="${javac.debug}"
- fork="true"
- executable="${javac}">
- </javac>
-
- </target>
-
- <target name="jar" depends="compile">
- <jar basedir="${classes}" destfile="${jars}/org.eclipse.jubula.rc.swt.jar">
- <exclude name="**/Server*.*"/>
- <fileset dir="${src}"
- includes="**/*"
- excludes="**/*.java"/>
- </jar>
- </target>
-
-</project> \ No newline at end of file
diff --git a/org.eclipse.jubula.rc.swt/pom.xml b/org.eclipse.jubula.rc.swt/pom.xml
new file mode 100644
index 000000000..dd80cbce6
--- /dev/null
+++ b/org.eclipse.jubula.rc.swt/pom.xml
@@ -0,0 +1,50 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>org.eclipse.jubula.releng.server</artifactId>
+ <groupId>org.eclipse.jubula</groupId>
+ <version>0.9.0-SNAPSHOT</version>
+ <relativePath>../org.eclipse.jubula.releng.server</relativePath>
+ </parent>
+ <groupId>org.eclipse.jubula</groupId>
+ <artifactId>org.eclipse.jubula.rc.swt</artifactId>
+ <version>0.9.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+
+ <build>
+ <finalName>org.eclipse.jubula.rc.swt</finalName>
+ <sourceDirectory>src</sourceDirectory>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <source>1.4</source>
+ <target>1.4</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.eclipse.jubula.rc.common.orbit</groupId>
+ <artifactId>org.apache.commons.beanutils</artifactId>
+ <version>1.7.0.v200902170505</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jubula.project.compatibility</groupId>
+ <artifactId>org.eclipse.swt</artifactId>
+ <version>3.1</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jubula</groupId>
+ <artifactId>org.eclipse.jubula.rc.common</artifactId>
+ <version>0.9.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+</project> \ No newline at end of file
diff --git a/org.eclipse.jubula.releng.server/pom.xml b/org.eclipse.jubula.releng.server/pom.xml
index b8c5efd7c..f9527f648 100644
--- a/org.eclipse.jubula.releng.server/pom.xml
+++ b/org.eclipse.jubula.releng.server/pom.xml
@@ -3,12 +3,12 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>org.eclipse.jubula.releng</artifactId>
- <groupId>org.eclipse.jubula</groupId>
- <version>0.9.0-SNAPSHOT</version>
- <relativePath>../org.eclipse.jubula.releng</relativePath>
- </parent>
+ <parent>
+ <artifactId>org.eclipse.jubula.releng</artifactId>
+ <groupId>org.eclipse.jubula</groupId>
+ <version>0.9.0-SNAPSHOT</version>
+ <relativePath>../org.eclipse.jubula.releng</relativePath>
+ </parent>
<groupId>org.eclipse.jubula</groupId>
<artifactId>org.eclipse.jubula.releng.server</artifactId>
@@ -17,112 +17,120 @@
<version>0.9.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <repositories>
- <repository>
- <id>local-orbit-repo</id>
- <url>file://${basedir}/../org.eclipse.jubula.rc.common.orbit/local-orbit-repo</url>
- </repository>
- </repositories>
+ <repositories>
+ <repository>
+ <id>local-orbit-repo</id>
+ <url>file://${basedir}/../org.eclipse.jubula.rc.common.orbit/local-orbit-repo</url>
+ </repository>
+ <repository>
+ <id>local-compatibility-repo</id>
+ <url>file://${basedir}/../org.eclipse.jubula.project.compatibility/local-compatibility-repo</url>
+ </repository>
+ </repositories>
- <dependencies>
- <dependency>
- <groupId>org.eclipse.jubula.rc.common.orbit</groupId>
- <artifactId>ch.qos.logback.classic</artifactId>
- <version>0.9.19.v20100519-1505</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jubula.rc.common.orbit</groupId>
- <artifactId>ch.qos.logback.core</artifactId>
- <version>0.9.19.v20100419-1216</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jubula.rc.common.orbit</groupId>
- <artifactId>ch.qos.logback.slf4j</artifactId>
- <version>0.9.19.v20100519-1910</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jubula.rc.common.orbit</groupId>
- <artifactId>org.apache.commons.beanutils</artifactId>
- <version>1.7.0.v200902170505</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jubula.rc.common.orbit</groupId>
- <artifactId>org.apache.commons.cli</artifactId>
- <version>1.2.0.v201011021000</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jubula.rc.common.orbit</groupId>
- <artifactId>org.apache.commons.collections</artifactId>
- <version>3.2.0.v201005080500</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jubula.rc.common.orbit</groupId>
- <artifactId>org.apache.commons.lang</artifactId>
- <version>2.4.0.v201005080502</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jubula.rc.common.orbit</groupId>
- <artifactId>org.apache.oro</artifactId>
- <version>2.0.8.v201005080400</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jubula.rc.common.orbit</groupId>
- <artifactId>org.slf4j.api</artifactId>
- <version>1.5.11.v20100519-1910</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jubula.rc.common.orbit</groupId>
- <artifactId>org.slf4j.jcl</artifactId>
- <version>1.5.11.v20100419-1106</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jubula.rc.common.orbit</groupId>
- <artifactId>org.slf4j.log4j</artifactId>
- <version>1.5.11.v20100419-1106</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jubula.rc.common.orbit</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <version>1.5.11</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jubula</groupId>
- <artifactId>org.eclipse.jubula.tools</artifactId>
- <version>0.9.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jubula</groupId>
- <artifactId>org.eclipse.jubula.communication</artifactId>
- <version>0.9.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>org.eclipse.jubula.rc.common.orbit</groupId>
+ <artifactId>ch.qos.logback.classic</artifactId>
+ <version>0.9.19.v20100519-1505</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jubula.rc.common.orbit</groupId>
+ <artifactId>ch.qos.logback.core</artifactId>
+ <version>0.9.19.v20100419-1216</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jubula.rc.common.orbit</groupId>
+ <artifactId>ch.qos.logback.slf4j</artifactId>
+ <version>0.9.19.v20100519-1910</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jubula.rc.common.orbit</groupId>
+ <artifactId>org.apache.commons.beanutils</artifactId>
+ <version>1.7.0.v200902170505</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jubula.rc.common.orbit</groupId>
+ <artifactId>org.apache.commons.cli</artifactId>
+ <version>1.2.0.v201011021000</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jubula.rc.common.orbit</groupId>
+ <artifactId>org.apache.commons.collections</artifactId>
+ <version>3.2.0.v201005080500</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jubula.rc.common.orbit</groupId>
+ <artifactId>org.apache.commons.lang</artifactId>
+ <version>2.4.0.v201005080502</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jubula.rc.common.orbit</groupId>
+ <artifactId>org.apache.oro</artifactId>
+ <version>2.0.8.v201005080400</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jubula.rc.common.orbit</groupId>
+ <artifactId>org.slf4j.api</artifactId>
+ <version>1.5.11.v20100519-1910</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jubula.rc.common.orbit</groupId>
+ <artifactId>org.slf4j.jcl</artifactId>
+ <version>1.5.11.v20100419-1106</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jubula.rc.common.orbit</groupId>
+ <artifactId>org.slf4j.log4j</artifactId>
+ <version>1.5.11.v20100419-1106</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jubula.rc.common.orbit</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ <version>1.5.11</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jubula</groupId>
+ <artifactId>org.eclipse.jubula.tools</artifactId>
+ <version>0.9.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jubula</groupId>
+ <artifactId>org.eclipse.jubula.communication</artifactId>
+ <version>0.9.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
<modules>
- <module>../org.eclipse.jubula.autagent</module>
+ <!-- <module>../org.eclipse.jubula.autagent</module> -->
+ <module>../org.eclipse.jubula.rc.common</module>
+ <module>../org.eclipse.jubula.rc.common.agent</module>
+ <module>../org.eclipse.jubula.rc.swing</module>
+ <module>../org.eclipse.jubula.rc.swt</module>
</modules>
<url>http://www.eclipse.org/jubula</url>
diff --git a/org.eclipse.jubula.releng/.settings/org.maven.ide.eclipse.prefs b/org.eclipse.jubula.releng/.settings/org.maven.ide.eclipse.prefs
new file mode 100644
index 000000000..7c7d3261c
--- /dev/null
+++ b/org.eclipse.jubula.releng/.settings/org.maven.ide.eclipse.prefs
@@ -0,0 +1,8 @@
+#Wed Apr 27 15:38:16 CEST 2011
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1
diff --git a/org.eclipse.jubula.releng/pom.xml b/org.eclipse.jubula.releng/pom.xml
index 20f94ada7..9c447dc9c 100644
--- a/org.eclipse.jubula.releng/pom.xml
+++ b/org.eclipse.jubula.releng/pom.xml
@@ -11,6 +11,7 @@
<modules>
<module>../org.eclipse.jubula.releng.client</module>
+ <module>../org.eclipse.jubula.releng.server</module>
</modules>
<url>http://www.eclipse.org/jubula</url>

Back to the top