Timebox task - major releng change - switched to maven build for *common.agent, *common, AUTLauncher, *rc.swing and rc.swt.

7 files changed, 83 insertions, 100 deletions

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>