[Libreoffice-commits] core.git: Branch 'aoo/trunk' - Module_ooo.mk qadevOOo/Ant_OOoRunnerLight.mk qadevOOo/Ant_OOoRunner.mk qadevOOo/build.xml qadevOOo/java qadevOOo/JunitTest_qadevOOo_unoapi.mk qadevOOo/Makefile qadevOOo/makefile.mk qadevOOo/Module_qadevOOo.mk qadevOOo/objdsc qadevOOo/prj qadevOOo/qa qadevOOo/runner qadevOOo/tests

Damjan Jovanovic (via logerrit) logerrit at kemper.freedesktop.org
Sun May 12 10:11:39 UTC 2019


 Module_ooo.mk                                                                       |    1 
 qadevOOo/Ant_OOoRunner.mk                                                           |   27 +++
 qadevOOo/Ant_OOoRunnerLight.mk                                                      |   27 +++
 qadevOOo/JunitTest_qadevOOo_unoapi.mk                                               |   42 ++---
 qadevOOo/Makefile                                                                   |   32 +++
 qadevOOo/Module_qadevOOo.mk                                                         |   33 +--
 qadevOOo/build.xml                                                                  |   74 --------
 qadevOOo/java/OOoRunner/build.xml                                                   |   41 ++++
 qadevOOo/java/OOoRunner/src/main/java/ifc/sheet/_XSheetAnnotationAnchor.java        |    2 
 qadevOOo/java/OOoRunner/src/main/java/mod/_dbaccess/OQueryDesign.java               |    2 
 qadevOOo/java/OOoRunner/src/main/java/mod/_dbaccess/OSingleSelectQueryComposer.java |    2 
 qadevOOo/java/OOoRunner/src/main/java/util/FootnoteDsc.java                         |    2 
 qadevOOo/java/OOoRunner/src/main/java/util/FormTools.java                           |   24 +-
 qadevOOo/java/OOoRunner/src/main/java/util/ParagraphDsc.java                        |    2 
 qadevOOo/java/OOoRunner/src/main/java/util/ReferenceMarkDsc.java                    |    2 
 qadevOOo/java/OOoRunner/src/main/java/util/ShapeDsc.java                            |    6 
 qadevOOo/java/OOoRunner/src/main/java/util/StyleFamilyDsc.java                      |    6 
 qadevOOo/java/OOoRunner/src/main/java/util/TableDsc.java                            |    2 
 qadevOOo/java/OOoRunner/src/main/java/util/TextSectionDsc.java                      |    2 
 qadevOOo/java/OOoRunnerLight/build.xml                                              |   64 +++++++
 qadevOOo/java/OOoRunnerLight/manifest                                               |    3 
 qadevOOo/prj/build.lst                                                              |    6 
 qadevOOo/prj/d.lst                                                                  |    1 
 qadevOOo/prj/makefile.mk                                                            |   36 ++--
 qadevOOo/runner/basicrunner/basichelper/makefile.mk                                 |   43 -----
 qadevOOo/runner/basicrunner/makefile.mk                                             |   42 -----
 qadevOOo/runner/makefile.mk                                                         |   56 ------
 qadevOOo/runner/util/compare/makefile.mk                                            |   50 ------
 qadevOOo/runner/util/makefile.mk                                                    |   83 ----------
 29 files changed, 272 insertions(+), 441 deletions(-)

New commits:
commit ee4b7394ff7c027e09d885e66056a405fc3b0291
Author:     Damjan Jovanovic <damjan at apache.org>
AuthorDate: Sun May 12 09:34:12 2019 +0000
Commit:     Damjan Jovanovic <damjan at apache.org>
CommitDate: Sun May 12 09:34:12 2019 +0000

    Port qadevOOo to gbuild/Ant.
    
    Patch by: me

diff --git a/Module_ooo.mk b/Module_ooo.mk
index 6adeea125a71..271cf450925c 100644
--- a/Module_ooo.mk
+++ b/Module_ooo.mk
@@ -77,6 +77,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
     padmin \
     psprint_config \
     pyuno \
+    qadevOOo \
     rdbmaker \
     registry \
     remotebridges \
diff --git a/qadevOOo/Ant_OOoRunner.mk b/qadevOOo/Ant_OOoRunner.mk
new file mode 100644
index 000000000000..2b6c0ff661fe
--- /dev/null
+++ b/qadevOOo/Ant_OOoRunner.mk
@@ -0,0 +1,27 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+
+
+$(eval $(call gb_Ant_Ant,OOoRunner,$(SRCDIR)/qadevOOo/java/OOoRunner/build.xml))
+
+# vim: set noet sw=4 ts=4:
+
diff --git a/qadevOOo/Ant_OOoRunnerLight.mk b/qadevOOo/Ant_OOoRunnerLight.mk
new file mode 100644
index 000000000000..40471e803043
--- /dev/null
+++ b/qadevOOo/Ant_OOoRunnerLight.mk
@@ -0,0 +1,27 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+
+
+$(eval $(call gb_Ant_Ant,OOoRunnerLight,$(SRCDIR)/qadevOOo/java/OOoRunnerLight/build.xml))
+
+# vim: set noet sw=4 ts=4:
+
diff --git a/qadevOOo/runner/base/makefile.mk b/qadevOOo/JunitTest_qadevOOo_unoapi.mk
similarity index 53%
rename from qadevOOo/runner/base/makefile.mk
rename to qadevOOo/JunitTest_qadevOOo_unoapi.mk
index f80976096d80..45e0ace439da 100644
--- a/qadevOOo/runner/base/makefile.mk
+++ b/qadevOOo/JunitTest_qadevOOo_unoapi.mk
@@ -1,4 +1,4 @@
-#**************************************************************
+###############################################################
 #  
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
@@ -17,32 +17,30 @@
 #  specific language governing permissions and limitations
 #  under the License.
 #  
-#**************************************************************
+###############################################################
 
 
 
-PRJ=..$/..
+$(eval $(call gb_JunitTest_JunitTest,qadevOOo_unoapi,SRCDIR))
 
-PRJNAME = OOoRunner
-PACKAGE = base
-TARGET = runner_base
+#$(eval $(call gb_JunitTest_set_defs,sm_unoapi,\
+#	$$(DEFS) \
+#	-Dorg.openoffice.test.arg.sce=$(SRCDIR)/starmath/qa/unoapi/sm.sce \
+#	-Dorg.openoffice.test.arg.xcl=$(SRCDIR)/starmath/qa/unoapi/knownissues.xcl \
+#))
 
-# --- Settings -----------------------------------------------------
+$(eval $(call gb_JunitTest_add_jars,qadevOOo_unoapi,\
+	$(OUTDIR)/bin/OOoRunner.jar \
+	$(OUTDIR)/bin/ridl.jar \
+	$(OUTDIR)/bin/test.jar \
+))
 
-.INCLUDE :  settings.mk
+$(eval $(call gb_JunitTest_add_sourcefiles,qadevOOo_unoapi,\
+	qadevOOo/qa/unoapi/Test \
+))
 
-# --- Files --------------------------------------------------------
+$(eval $(call gb_JunitTest_add_classes,qadevOOo_unoapi,\
+	org.openoffice.qadevOOo.qa.unoapi.Test \
+))
 
-JARFILES = ridl.jar jurt.jar unoil.jar
-JAVAFILES = TestBase.java           \
-            java_complex.java       \
-            java_fat.java           \
-            java_fat_service.java   \
-            java_cmp.java           \
-            basic_fat.java
-
-JAVACLASSFILES=	$(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
+# vim: set noet sw=4 ts=4:
diff --git a/qadevOOo/Makefile b/qadevOOo/Makefile
new file mode 100644
index 000000000000..c1d144cbd4c9
--- /dev/null
+++ b/qadevOOo/Makefile
@@ -0,0 +1,32 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/qadevOOo/makefile.mk b/qadevOOo/Module_qadevOOo.mk
similarity index 66%
rename from qadevOOo/makefile.mk
rename to qadevOOo/Module_qadevOOo.mk
index 2e19a2493676..16f4c9216c1b 100644
--- a/qadevOOo/makefile.mk
+++ b/qadevOOo/Module_qadevOOo.mk
@@ -20,26 +20,19 @@
 #**************************************************************
 
 
-PRJNAME = OOoRunner
-TARGET=qadevOOo
-PRJ=.
 
-# ------------------------------------------------
-# NEVER REMOVE THIS!
-# The OOoRunner.jar and OOoRunnerLight.jar should build with debug information all the time, also in the .pro builds.
-# If you have any questions about this, ask the qadevOOo Maintainer.
-debug=true
-# ------------------------------------------------
+$(eval $(call gb_Module_Module,qadevOOo))
 
-.INCLUDE : ant.mk
-TST:
-    echo $(SOLAR_JAVA)
+$(eval $(call gb_Module_add_targets,qadevOOo,\
+	Ant_OOoRunner \
+	Ant_OOoRunnerLight \
+))
 
-.IF "$(SOLAR_JAVA)"=="TRUE"	
-.IF "$(ANT_HOME)"!="NO_ANT_HOME"
-ANT_FLAGS+=-Dbuild.source=1.6
-.IF "$(L10N_framework)"==""
-ALLTAR: ANTBUILD
-.ENDIF
-.ENDIF
-.ENDIF 
+ifneq ($(OOO_JUNIT_JAR),)
+$(eval $(call gb_Module_add_subsequentcheck_targets,qadevOOo,\
+	JunitTest_qadevOOo_unoapi \
+))
+endif
+
+
+# vim: set noet sw=4 ts=4:
diff --git a/qadevOOo/build.xml b/qadevOOo/build.xml
deleted file mode 100644
index 6323c14aed2e..000000000000
--- a/qadevOOo/build.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<!--***********************************************************
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- ***********************************************************-->
-<project name="qadevOOo" default="main" basedir=".">
-  <description>
-    Build file for qadevOOo project
-  </description>
-
-  <!-- set global properties for this build -->
-  <property name="qadevOOo.output" location="${out}"/>
-  <property name="qadevOOo.class"  location="${qadevOOo.output}/class"/>
-  <property name="qadevOOo.runner" location="${prj}/runner"/>
-  <property name="qadevOOo.tests" location="${prj}/tests/java"/>
-  <property name="qadevOOo.office_jars" location="${solar.jar}"/>
-
-  <!-- ================================================================================== -->
-
-  <!-- the main target -->
-  <target name="main" depends="qadevOOo_tests_build,qadevOOo_runner_build"/>
-
-  <!-- ================================================================================== -->
-
-  <!-- target for building the runner -->
-  <target name="qadevOOo_runner_build">
-    <javac srcdir="${qadevOOo.runner}" destdir="${qadevOOo.class}" includes="**/*.java"
-         debug="${debug}" source="${build.source}" includeantruntime="false">
-        <classpath>
-            <pathelement location="${qadevOOo.class}"/>
-            <fileset dir="${qadevOOo.office_jars}">
-                <include name="**/ridl.jar"/>
-                <include name="**/unoil.jar"/>
-                <include name="**/jurt.jar"/>
-                <include name="**/juh.jar"/>
-                <include name="**/java_uno.jar"/>
-            </fileset>
-        </classpath>
-    </javac>
-  </target>
-
-  <!-- target for building the tests -->
-  <target name="qadevOOo_tests_build" depends="qadevOOo_runner_build">
-    <javac srcdir="${qadevOOo.tests}" destdir="${qadevOOo.class}" includes="**/*.java"
-        debug="${debug}" source="${build.source}" includeantruntime="false">
-        <classpath>
-            <pathelement location="${qadevOOo.class}"/>
-            <fileset dir="${qadevOOo.office_jars}">
-                <include name="**/ridl.jar"/>
-                <include name="**/unoil.jar"/>
-                <include name="**/jurt.jar"/>
-                <include name="**/juh.jar"/>
-                <include name="**/java_uno.jar"/>
-            </fileset>
-        </classpath>
-    </javac>
-  </target>
-
-</project>
diff --git a/qadevOOo/java/OOoRunner/build.xml b/qadevOOo/java/OOoRunner/build.xml
new file mode 100644
index 000000000000..12d29b02cdf7
--- /dev/null
+++ b/qadevOOo/java/OOoRunner/build.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--***********************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ ***********************************************************-->
+
+
+<project name="OOoRunner" default="main" xmlns:if="ant:if" xmlns:unless="ant:unless">
+
+    <property file="../../../ant.properties"/>
+    <import file="${SRC_ROOT}/solenv/ant/aoo-ant.xml"/>
+
+    <target name="init-project">
+        <property name="jar.manifest" value="manifest"/>
+        <path id="main.classpath">
+            <pathelement location="${OUTDIR}/bin/ridl.jar"/>
+            <pathelement location="${OUTDIR}/bin/unoil.jar"/>
+            <pathelement location="${OUTDIR}/bin/jurt.jar"/>
+            <pathelement location="${OUTDIR}/bin/juh.jar"/>
+            <pathelement location="${OUTDIR}/bin/java_uno.jar"/>
+        </path>
+    </target>
+
+</project>
+
diff --git a/qadevOOo/runner/manifest b/qadevOOo/java/OOoRunner/manifest
similarity index 100%
rename from qadevOOo/runner/manifest
rename to qadevOOo/java/OOoRunner/manifest
diff --git a/qadevOOo/runner/base/TestBase.java b/qadevOOo/java/OOoRunner/src/main/java/base/TestBase.java
similarity index 100%
rename from qadevOOo/runner/base/TestBase.java
rename to qadevOOo/java/OOoRunner/src/main/java/base/TestBase.java
diff --git a/qadevOOo/runner/base/basic_fat.java b/qadevOOo/java/OOoRunner/src/main/java/base/basic_fat.java
similarity index 100%
rename from qadevOOo/runner/base/basic_fat.java
rename to qadevOOo/java/OOoRunner/src/main/java/base/basic_fat.java
diff --git a/qadevOOo/runner/base/java_cmp.java b/qadevOOo/java/OOoRunner/src/main/java/base/java_cmp.java
similarity index 100%
rename from qadevOOo/runner/base/java_cmp.java
rename to qadevOOo/java/OOoRunner/src/main/java/base/java_cmp.java
diff --git a/qadevOOo/runner/base/java_complex.java b/qadevOOo/java/OOoRunner/src/main/java/base/java_complex.java
similarity index 100%
rename from qadevOOo/runner/base/java_complex.java
rename to qadevOOo/java/OOoRunner/src/main/java/base/java_complex.java
diff --git a/qadevOOo/runner/base/java_fat.java b/qadevOOo/java/OOoRunner/src/main/java/base/java_fat.java
similarity index 100%
rename from qadevOOo/runner/base/java_fat.java
rename to qadevOOo/java/OOoRunner/src/main/java/base/java_fat.java
diff --git a/qadevOOo/runner/base/java_fat_service.java b/qadevOOo/java/OOoRunner/src/main/java/base/java_fat_service.java
similarity index 100%
rename from qadevOOo/runner/base/java_fat_service.java
rename to qadevOOo/java/OOoRunner/src/main/java/base/java_fat_service.java
diff --git a/qadevOOo/runner/basicrunner/BasicException.java b/qadevOOo/java/OOoRunner/src/main/java/basicrunner/BasicException.java
similarity index 100%
rename from qadevOOo/runner/basicrunner/BasicException.java
rename to qadevOOo/java/OOoRunner/src/main/java/basicrunner/BasicException.java
diff --git a/qadevOOo/runner/basicrunner/BasicHandler.java b/qadevOOo/java/OOoRunner/src/main/java/basicrunner/BasicHandler.java
similarity index 100%
rename from qadevOOo/runner/basicrunner/BasicHandler.java
rename to qadevOOo/java/OOoRunner/src/main/java/basicrunner/BasicHandler.java
diff --git a/qadevOOo/runner/basicrunner/BasicHandlerProvider.java b/qadevOOo/java/OOoRunner/src/main/java/basicrunner/BasicHandlerProvider.java
similarity index 100%
rename from qadevOOo/runner/basicrunner/BasicHandlerProvider.java
rename to qadevOOo/java/OOoRunner/src/main/java/basicrunner/BasicHandlerProvider.java
diff --git a/qadevOOo/runner/basicrunner/BasicIfcTest.java b/qadevOOo/java/OOoRunner/src/main/java/basicrunner/BasicIfcTest.java
similarity index 100%
rename from qadevOOo/runner/basicrunner/BasicIfcTest.java
rename to qadevOOo/java/OOoRunner/src/main/java/basicrunner/BasicIfcTest.java
diff --git a/qadevOOo/runner/basicrunner/BasicTestCase.java b/qadevOOo/java/OOoRunner/src/main/java/basicrunner/BasicTestCase.java
similarity index 100%
rename from qadevOOo/runner/basicrunner/BasicTestCase.java
rename to qadevOOo/java/OOoRunner/src/main/java/basicrunner/BasicTestCase.java
diff --git a/qadevOOo/runner/basicrunner/basichelper/AttributeList.java b/qadevOOo/java/OOoRunner/src/main/java/basicrunner/basichelper/AttributeList.java
similarity index 100%
rename from qadevOOo/runner/basicrunner/basichelper/AttributeList.java
rename to qadevOOo/java/OOoRunner/src/main/java/basicrunner/basichelper/AttributeList.java
diff --git a/qadevOOo/runner/basicrunner/basichelper/Connector.java b/qadevOOo/java/OOoRunner/src/main/java/basicrunner/basichelper/Connector.java
similarity index 100%
rename from qadevOOo/runner/basicrunner/basichelper/Connector.java
rename to qadevOOo/java/OOoRunner/src/main/java/basicrunner/basichelper/Connector.java
diff --git a/qadevOOo/runner/basicrunner/basichelper/DispatchProviderInterceptor.java b/qadevOOo/java/OOoRunner/src/main/java/basicrunner/basichelper/DispatchProviderInterceptor.java
similarity index 100%
rename from qadevOOo/runner/basicrunner/basichelper/DispatchProviderInterceptor.java
rename to qadevOOo/java/OOoRunner/src/main/java/basicrunner/basichelper/DispatchProviderInterceptor.java
diff --git a/qadevOOo/runner/basicrunner/basichelper/DocumentHandler.java b/qadevOOo/java/OOoRunner/src/main/java/basicrunner/basichelper/DocumentHandler.java
similarity index 100%
rename from qadevOOo/runner/basicrunner/basichelper/DocumentHandler.java
rename to qadevOOo/java/OOoRunner/src/main/java/basicrunner/basichelper/DocumentHandler.java
diff --git a/qadevOOo/runner/basicrunner/basichelper/Filter.java b/qadevOOo/java/OOoRunner/src/main/java/basicrunner/basichelper/Filter.java
similarity index 100%
rename from qadevOOo/runner/basicrunner/basichelper/Filter.java
rename to qadevOOo/java/OOoRunner/src/main/java/basicrunner/basichelper/Filter.java
diff --git a/qadevOOo/runner/basicrunner/basichelper/ThreadRunner.java b/qadevOOo/java/OOoRunner/src/main/java/basicrunner/basichelper/ThreadRunner.java
similarity index 100%
rename from qadevOOo/runner/basicrunner/basichelper/ThreadRunner.java
rename to qadevOOo/java/OOoRunner/src/main/java/basicrunner/basichelper/ThreadRunner.java
diff --git a/qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java b/qadevOOo/java/OOoRunner/src/main/java/complex/unoapi/CheckModuleAPI.java
similarity index 100%
rename from qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java
rename to qadevOOo/java/OOoRunner/src/main/java/complex/unoapi/CheckModuleAPI.java
diff --git a/qadevOOo/runner/complexlib/Assurance.java b/qadevOOo/java/OOoRunner/src/main/java/complexlib/Assurance.java
similarity index 100%
rename from qadevOOo/runner/complexlib/Assurance.java
rename to qadevOOo/java/OOoRunner/src/main/java/complexlib/Assurance.java
diff --git a/qadevOOo/runner/complexlib/ComplexTestCase.java b/qadevOOo/java/OOoRunner/src/main/java/complexlib/ComplexTestCase.java
similarity index 100%
rename from qadevOOo/runner/complexlib/ComplexTestCase.java
rename to qadevOOo/java/OOoRunner/src/main/java/complexlib/ComplexTestCase.java
diff --git a/qadevOOo/runner/complexlib/MethodThread.java b/qadevOOo/java/OOoRunner/src/main/java/complexlib/MethodThread.java
similarity index 100%
rename from qadevOOo/runner/complexlib/MethodThread.java
rename to qadevOOo/java/OOoRunner/src/main/java/complexlib/MethodThread.java
diff --git a/qadevOOo/runner/complexlib/ShowTargets.java b/qadevOOo/java/OOoRunner/src/main/java/complexlib/ShowTargets.java
similarity index 100%
rename from qadevOOo/runner/complexlib/ShowTargets.java
rename to qadevOOo/java/OOoRunner/src/main/java/complexlib/ShowTargets.java
diff --git a/qadevOOo/runner/complexlib/makefile.mk b/qadevOOo/java/OOoRunner/src/main/java/complexlib/makefile.mk
similarity index 100%
rename from qadevOOo/runner/complexlib/makefile.mk
rename to qadevOOo/java/OOoRunner/src/main/java/complexlib/makefile.mk
diff --git a/qadevOOo/runner/convwatch/Basename.java b/qadevOOo/java/OOoRunner/src/main/java/convwatch/Basename.java
similarity index 100%
rename from qadevOOo/runner/convwatch/Basename.java
rename to qadevOOo/java/OOoRunner/src/main/java/convwatch/Basename.java
diff --git a/qadevOOo/runner/convwatch/BorderRemover.java b/qadevOOo/java/OOoRunner/src/main/java/convwatch/BorderRemover.java
similarity index 100%
rename from qadevOOo/runner/convwatch/BorderRemover.java
rename to qadevOOo/java/OOoRunner/src/main/java/convwatch/BorderRemover.java
diff --git a/qadevOOo/runner/convwatch/BuildID.java b/qadevOOo/java/OOoRunner/src/main/java/convwatch/BuildID.java
similarity index 100%
rename from qadevOOo/runner/convwatch/BuildID.java
rename to qadevOOo/java/OOoRunner/src/main/java/convwatch/BuildID.java
diff --git a/qadevOOo/runner/convwatch/ConvWatch.java b/qadevOOo/java/OOoRunner/src/main/java/convwatch/ConvWatch.java
similarity index 100%
rename from qadevOOo/runner/convwatch/ConvWatch.java
rename to qadevOOo/java/OOoRunner/src/main/java/convwatch/ConvWatch.java
diff --git a/qadevOOo/runner/convwatch/ConvWatchCancelException.java b/qadevOOo/java/OOoRunner/src/main/java/convwatch/ConvWatchCancelException.java
similarity index 100%
rename from qadevOOo/runner/convwatch/ConvWatchCancelException.java
rename to qadevOOo/java/OOoRunner/src/main/java/convwatch/ConvWatchCancelException.java
diff --git a/qadevOOo/runner/convwatch/ConvWatchException.java b/qadevOOo/java/OOoRunner/src/main/java/convwatch/ConvWatchException.java
similarity index 100%
rename from qadevOOo/runner/convwatch/ConvWatchException.java
rename to qadevOOo/java/OOoRunner/src/main/java/convwatch/ConvWatchException.java
diff --git a/qadevOOo/runner/convwatch/ConvWatchStarter.java b/qadevOOo/java/OOoRunner/src/main/java/convwatch/ConvWatchStarter.java
similarity index 100%
rename from qadevOOo/runner/convwatch/ConvWatchStarter.java
rename to qadevOOo/java/OOoRunner/src/main/java/convwatch/ConvWatchStarter.java
diff --git a/qadevOOo/runner/convwatch/CrashLoopTest.java b/qadevOOo/java/OOoRunner/src/main/java/convwatch/CrashLoopTest.java
similarity index 100%
rename from qadevOOo/runner/convwatch/CrashLoopTest.java
rename to qadevOOo/java/OOoRunner/src/main/java/convwatch/CrashLoopTest.java
diff --git a/qadevOOo/runner/convwatch/DB.java b/qadevOOo/java/OOoRunner/src/main/java/convwatch/DB.java
similarity index 100%
rename from qadevOOo/runner/convwatch/DB.java
rename to qadevOOo/java/OOoRunner/src/main/java/convwatch/DB.java
diff --git a/qadevOOo/runner/convwatch/DBHelper.java b/qadevOOo/java/OOoRunner/src/main/java/convwatch/DBHelper.java
similarity index 100%
rename from qadevOOo/runner/convwatch/DBHelper.java
rename to qadevOOo/java/OOoRunner/src/main/java/convwatch/DBHelper.java
diff --git a/qadevOOo/runner/convwatch/DateHelper.java b/qadevOOo/java/OOoRunner/src/main/java/convwatch/DateHelper.java
similarity index 100%
rename from qadevOOo/runner/convwatch/DateHelper.java
rename to qadevOOo/java/OOoRunner/src/main/java/convwatch/DateHelper.java
diff --git a/qadevOOo/runner/convwatch/DirectoryHelper.java b/qadevOOo/java/OOoRunner/src/main/java/convwatch/DirectoryHelper.java
similarity index 100%
rename from qadevOOo/runner/convwatch/DirectoryHelper.java
rename to qadevOOo/java/OOoRunner/src/main/java/convwatch/DirectoryHelper.java
diff --git a/qadevOOo/runner/convwatch/DocumentConverter.java b/qadevOOo/java/OOoRunner/src/main/java/convwatch/DocumentConverter.java
similarity index 100%
rename from qadevOOo/runner/convwatch/DocumentConverter.java
rename to qadevOOo/java/OOoRunner/src/main/java/convwatch/DocumentConverter.java
diff --git a/qadevOOo/runner/convwatch/EnhancedComplexTestCase.java b/qadevOOo/java/OOoRunner/src/main/java/convwatch/EnhancedComplexTestCase.java
similarity index 100%
rename from qadevOOo/runner/convwatch/EnhancedComplexTestCase.java
rename to qadevOOo/java/OOoRunner/src/main/java/convwatch/EnhancedComplexTestCase.java
diff --git a/qadevOOo/runner/convwatch/FileHelper.java b/qadevOOo/java/OOoRunner/src/main/java/convwatch/FileHelper.java
similarity index 100%
rename from qadevOOo/runner/convwatch/FileHelper.java
rename to qadevOOo/java/OOoRunner/src/main/java/convwatch/FileHelper.java
diff --git a/qadevOOo/runner/convwatch/FilenameHelper.java b/qadevOOo/java/OOoRunner/src/main/java/convwatch/FilenameHelper.java
similarity index 100%
rename from qadevOOo/runner/convwatch/FilenameHelper.java
rename to qadevOOo/java/OOoRunner/src/main/java/convwatch/FilenameHelper.java
diff --git a/qadevOOo/runner/convwatch/GfxCompare.java b/qadevOOo/java/OOoRunner/src/main/java/convwatch/GfxCompare.java
similarity index 100%
rename from qadevOOo/runner/convwatch/GfxCompare.java
rename to qadevOOo/java/OOoRunner/src/main/java/convwatch/GfxCompare.java
diff --git a/qadevOOo/runner/convwatch/GlobalLogWriter.java b/qadevOOo/java/OOoRunner/src/main/java/convwatch/GlobalLogWriter.java
similarity index 100%
rename from qadevOOo/runner/convwatch/GlobalLogWriter.java
rename to qadevOOo/java/OOoRunner/src/main/java/convwatch/GlobalLogWriter.java
diff --git a/qadevOOo/runner/convwatch/GraphicalDifferenceCheck.java b/qadevOOo/java/OOoRunner/src/main/java/convwatch/GraphicalDifferenceCheck.java
similarity index 100%
rename from qadevOOo/runner/convwatch/GraphicalDifferenceCheck.java
rename to qadevOOo/java/OOoRunner/src/main/java/convwatch/GraphicalDifferenceCheck.java
diff --git a/qadevOOo/runner/convwatch/GraphicalTestArguments.java b/qadevOOo/java/OOoRunner/src/main/java/convwatch/GraphicalTestArguments.java
similarity index 100%
rename from qadevOOo/runner/convwatch/GraphicalTestArguments.java
rename to qadevOOo/java/OOoRunner/src/main/java/convwatch/GraphicalTestArguments.java
diff --git a/qadevOOo/runner/convwatch/HTMLOutputter.java b/qadevOOo/java/OOoRunner/src/main/java/convwatch/HTMLOutputter.java
similarity index 100%
rename from qadevOOo/runner/convwatch/HTMLOutputter.java
rename to qadevOOo/java/OOoRunner/src/main/java/convwatch/HTMLOutputter.java
diff --git a/qadevOOo/runner/convwatch/INIOutputter.java b/qadevOOo/java/OOoRunner/src/main/java/convwatch/INIOutputter.java
similarity index 100%
rename from qadevOOo/runner/convwatch/INIOutputter.java
rename to qadevOOo/java/OOoRunner/src/main/java/convwatch/INIOutputter.java
diff --git a/qadevOOo/runner/convwatch/ImageHelper.java b/qadevOOo/java/OOoRunner/src/main/java/convwatch/ImageHelper.java
similarity index 100%
rename from qadevOOo/runner/convwatch/ImageHelper.java
rename to qadevOOo/java/OOoRunner/src/main/java/convwatch/ImageHelper.java
diff --git a/qadevOOo/runner/convwatch/IniFile.java b/qadevOOo/java/OOoRunner/src/main/java/convwatch/IniFile.java
similarity index 100%
rename from qadevOOo/runner/convwatch/IniFile.java
rename to qadevOOo/java/OOoRunner/src/main/java/convwatch/IniFile.java
diff --git a/qadevOOo/runner/convwatch/LISTOutputter.java b/qadevOOo/java/OOoRunner/src/main/java/convwatch/LISTOutputter.java
similarity index 100%
rename from qadevOOo/runner/convwatch/LISTOutputter.java
rename to qadevOOo/java/OOoRunner/src/main/java/convwatch/LISTOutputter.java
diff --git a/qadevOOo/runner/convwatch/MSOfficePrint.java b/qadevOOo/java/OOoRunner/src/main/java/convwatch/MSOfficePrint.java
similarity index 100%
rename from qadevOOo/runner/convwatch/MSOfficePrint.java
rename to qadevOOo/java/OOoRunner/src/main/java/convwatch/MSOfficePrint.java
diff --git a/qadevOOo/runner/convwatch/NameHelper.java b/qadevOOo/java/OOoRunner/src/main/java/convwatch/NameHelper.java
similarity index 100%
rename from qadevOOo/runner/convwatch/NameHelper.java
rename to qadevOOo/java/OOoRunner/src/main/java/convwatch/NameHelper.java
diff --git a/qadevOOo/runner/convwatch/OSHelper.java b/qadevOOo/java/OOoRunner/src/main/java/convwatch/OSHelper.java
similarity index 100%
rename from qadevOOo/runner/convwatch/OSHelper.java
rename to qadevOOo/java/OOoRunner/src/main/java/convwatch/OSHelper.java
diff --git a/qadevOOo/runner/convwatch/OfficePrint.java b/qadevOOo/java/OOoRunner/src/main/java/convwatch/OfficePrint.java
similarity index 100%
rename from qadevOOo/runner/convwatch/OfficePrint.java
rename to qadevOOo/java/OOoRunner/src/main/java/convwatch/OfficePrint.java
diff --git a/qadevOOo/runner/convwatch/PRNCompare.java b/qadevOOo/java/OOoRunner/src/main/java/convwatch/PRNCompare.java
similarity index 100%
rename from qadevOOo/runner/convwatch/PRNCompare.java
rename to qadevOOo/java/OOoRunner/src/main/java/convwatch/PRNCompare.java
diff --git a/qadevOOo/runner/convwatch/PerformanceContainer.java b/qadevOOo/java/OOoRunner/src/main/java/convwatch/PerformanceContainer.java
similarity index 100%
rename from qadevOOo/runner/convwatch/PerformanceContainer.java
rename to qadevOOo/java/OOoRunner/src/main/java/convwatch/PerformanceContainer.java
diff --git a/qadevOOo/runner/convwatch/PixelCounter.java b/qadevOOo/java/OOoRunner/src/main/java/convwatch/PixelCounter.java
similarity index 100%
rename from qadevOOo/runner/convwatch/PixelCounter.java
rename to qadevOOo/java/OOoRunner/src/main/java/convwatch/PixelCounter.java
diff --git a/qadevOOo/runner/convwatch/PropertyName.java b/qadevOOo/java/OOoRunner/src/main/java/convwatch/PropertyName.java
similarity index 100%
rename from qadevOOo/runner/convwatch/PropertyName.java
rename to qadevOOo/java/OOoRunner/src/main/java/convwatch/PropertyName.java
diff --git a/qadevOOo/runner/convwatch/ReferenceBuilder.java b/qadevOOo/java/OOoRunner/src/main/java/convwatch/ReferenceBuilder.java
similarity index 100%
rename from qadevOOo/runner/convwatch/ReferenceBuilder.java
rename to qadevOOo/java/OOoRunner/src/main/java/convwatch/ReferenceBuilder.java
diff --git a/qadevOOo/runner/convwatch/ReportDesignerTest.java b/qadevOOo/java/OOoRunner/src/main/java/convwatch/ReportDesignerTest.java
similarity index 100%
rename from qadevOOo/runner/convwatch/ReportDesignerTest.java
rename to qadevOOo/java/OOoRunner/src/main/java/convwatch/ReportDesignerTest.java
diff --git a/qadevOOo/runner/convwatch/SimpleFileSemaphore.java b/qadevOOo/java/OOoRunner/src/main/java/convwatch/SimpleFileSemaphore.java
similarity index 100%
rename from qadevOOo/runner/convwatch/SimpleFileSemaphore.java
rename to qadevOOo/java/OOoRunner/src/main/java/convwatch/SimpleFileSemaphore.java
diff --git a/qadevOOo/runner/convwatch/StatusHelper.java b/qadevOOo/java/OOoRunner/src/main/java/convwatch/StatusHelper.java
similarity index 100%
rename from qadevOOo/runner/convwatch/StatusHelper.java
rename to qadevOOo/java/OOoRunner/src/main/java/convwatch/StatusHelper.java
diff --git a/qadevOOo/runner/convwatch/StringHelper.java b/qadevOOo/java/OOoRunner/src/main/java/convwatch/StringHelper.java
similarity index 100%
rename from qadevOOo/runner/convwatch/StringHelper.java
rename to qadevOOo/java/OOoRunner/src/main/java/convwatch/StringHelper.java
diff --git a/qadevOOo/runner/convwatch/TimeHelper.java b/qadevOOo/java/OOoRunner/src/main/java/convwatch/TimeHelper.java
similarity index 100%
rename from qadevOOo/runner/convwatch/TimeHelper.java
rename to qadevOOo/java/OOoRunner/src/main/java/convwatch/TimeHelper.java
diff --git a/qadevOOo/runner/convwatch/TriState.java b/qadevOOo/java/OOoRunner/src/main/java/convwatch/TriState.java
similarity index 100%
rename from qadevOOo/runner/convwatch/TriState.java
rename to qadevOOo/java/OOoRunner/src/main/java/convwatch/TriState.java
diff --git a/qadevOOo/runner/convwatch/ValueNotFoundException.java b/qadevOOo/java/OOoRunner/src/main/java/convwatch/ValueNotFoundException.java
similarity index 100%
rename from qadevOOo/runner/convwatch/ValueNotFoundException.java
rename to qadevOOo/java/OOoRunner/src/main/java/convwatch/ValueNotFoundException.java
diff --git a/qadevOOo/runner/convwatch/makefile.mk b/qadevOOo/java/OOoRunner/src/main/java/convwatch/makefile.mk
similarity index 100%
rename from qadevOOo/runner/convwatch/makefile.mk
rename to qadevOOo/java/OOoRunner/src/main/java/convwatch/makefile.mk
diff --git a/qadevOOo/runner/graphical/BuildID.java b/qadevOOo/java/OOoRunner/src/main/java/graphical/BuildID.java
similarity index 100%
rename from qadevOOo/runner/graphical/BuildID.java
rename to qadevOOo/java/OOoRunner/src/main/java/graphical/BuildID.java
diff --git a/qadevOOo/runner/graphical/DateHelper.java b/qadevOOo/java/OOoRunner/src/main/java/graphical/DateHelper.java
similarity index 100%
rename from qadevOOo/runner/graphical/DateHelper.java
rename to qadevOOo/java/OOoRunner/src/main/java/graphical/DateHelper.java
diff --git a/qadevOOo/runner/graphical/DirectoryHelper.java b/qadevOOo/java/OOoRunner/src/main/java/graphical/DirectoryHelper.java
similarity index 100%
rename from qadevOOo/runner/graphical/DirectoryHelper.java
rename to qadevOOo/java/OOoRunner/src/main/java/graphical/DirectoryHelper.java
diff --git a/qadevOOo/runner/graphical/EnhancedComplexTestCase.java b/qadevOOo/java/OOoRunner/src/main/java/graphical/EnhancedComplexTestCase.java
similarity index 100%
rename from qadevOOo/runner/graphical/EnhancedComplexTestCase.java
rename to qadevOOo/java/OOoRunner/src/main/java/graphical/EnhancedComplexTestCase.java
diff --git a/qadevOOo/runner/graphical/FileHelper.java b/qadevOOo/java/OOoRunner/src/main/java/graphical/FileHelper.java
similarity index 100%
rename from qadevOOo/runner/graphical/FileHelper.java
rename to qadevOOo/java/OOoRunner/src/main/java/graphical/FileHelper.java
diff --git a/qadevOOo/runner/graphical/GlobalLogWriter.java b/qadevOOo/java/OOoRunner/src/main/java/graphical/GlobalLogWriter.java
similarity index 100%
rename from qadevOOo/runner/graphical/GlobalLogWriter.java
rename to qadevOOo/java/OOoRunner/src/main/java/graphical/GlobalLogWriter.java
diff --git a/qadevOOo/runner/graphical/GraphicalComparator.java b/qadevOOo/java/OOoRunner/src/main/java/graphical/GraphicalComparator.java
similarity index 100%
rename from qadevOOo/runner/graphical/GraphicalComparator.java
rename to qadevOOo/java/OOoRunner/src/main/java/graphical/GraphicalComparator.java
diff --git a/qadevOOo/runner/graphical/HTMLResult.java b/qadevOOo/java/OOoRunner/src/main/java/graphical/HTMLResult.java
similarity index 100%
rename from qadevOOo/runner/graphical/HTMLResult.java
rename to qadevOOo/java/OOoRunner/src/main/java/graphical/HTMLResult.java
diff --git a/qadevOOo/runner/graphical/IDocument.java b/qadevOOo/java/OOoRunner/src/main/java/graphical/IDocument.java
similarity index 100%
rename from qadevOOo/runner/graphical/IDocument.java
rename to qadevOOo/java/OOoRunner/src/main/java/graphical/IDocument.java
diff --git a/qadevOOo/runner/graphical/IOffice.java b/qadevOOo/java/OOoRunner/src/main/java/graphical/IOffice.java
similarity index 100%
rename from qadevOOo/runner/graphical/IOffice.java
rename to qadevOOo/java/OOoRunner/src/main/java/graphical/IOffice.java
diff --git a/qadevOOo/runner/graphical/ImageHelper.java b/qadevOOo/java/OOoRunner/src/main/java/graphical/ImageHelper.java
similarity index 100%
rename from qadevOOo/runner/graphical/ImageHelper.java
rename to qadevOOo/java/OOoRunner/src/main/java/graphical/ImageHelper.java
diff --git a/qadevOOo/runner/graphical/IniFile.java b/qadevOOo/java/OOoRunner/src/main/java/graphical/IniFile.java
similarity index 100%
rename from qadevOOo/runner/graphical/IniFile.java
rename to qadevOOo/java/OOoRunner/src/main/java/graphical/IniFile.java
diff --git a/qadevOOo/runner/graphical/JPEGComparator.java b/qadevOOo/java/OOoRunner/src/main/java/graphical/JPEGComparator.java
similarity index 100%
rename from qadevOOo/runner/graphical/JPEGComparator.java
rename to qadevOOo/java/OOoRunner/src/main/java/graphical/JPEGComparator.java
diff --git a/qadevOOo/runner/graphical/JPEGCreator.java b/qadevOOo/java/OOoRunner/src/main/java/graphical/JPEGCreator.java
similarity index 100%
rename from qadevOOo/runner/graphical/JPEGCreator.java
rename to qadevOOo/java/OOoRunner/src/main/java/graphical/JPEGCreator.java
diff --git a/qadevOOo/runner/graphical/JPEGEvaluator.java b/qadevOOo/java/OOoRunner/src/main/java/graphical/JPEGEvaluator.java
similarity index 100%
rename from qadevOOo/runner/graphical/JPEGEvaluator.java
rename to qadevOOo/java/OOoRunner/src/main/java/graphical/JPEGEvaluator.java
diff --git a/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java b/qadevOOo/java/OOoRunner/src/main/java/graphical/MSOfficePostscriptCreator.java
similarity index 100%
rename from qadevOOo/runner/graphical/MSOfficePostscriptCreator.java
rename to qadevOOo/java/OOoRunner/src/main/java/graphical/MSOfficePostscriptCreator.java
diff --git a/qadevOOo/runner/graphical/Office.java b/qadevOOo/java/OOoRunner/src/main/java/graphical/Office.java
similarity index 100%
rename from qadevOOo/runner/graphical/Office.java
rename to qadevOOo/java/OOoRunner/src/main/java/graphical/Office.java
diff --git a/qadevOOo/runner/graphical/OfficeException.java b/qadevOOo/java/OOoRunner/src/main/java/graphical/OfficeException.java
similarity index 100%
rename from qadevOOo/runner/graphical/OfficeException.java
rename to qadevOOo/java/OOoRunner/src/main/java/graphical/OfficeException.java
diff --git a/qadevOOo/runner/graphical/OpenOfficeDatabaseReportExtractor.java b/qadevOOo/java/OOoRunner/src/main/java/graphical/OpenOfficeDatabaseReportExtractor.java
similarity index 100%
rename from qadevOOo/runner/graphical/OpenOfficeDatabaseReportExtractor.java
rename to qadevOOo/java/OOoRunner/src/main/java/graphical/OpenOfficeDatabaseReportExtractor.java
diff --git a/qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java b/qadevOOo/java/OOoRunner/src/main/java/graphical/OpenOfficePostscriptCreator.java
similarity index 100%
rename from qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java
rename to qadevOOo/java/OOoRunner/src/main/java/graphical/OpenOfficePostscriptCreator.java
diff --git a/qadevOOo/runner/graphical/ParameterHelper.java b/qadevOOo/java/OOoRunner/src/main/java/graphical/ParameterHelper.java
similarity index 100%
rename from qadevOOo/runner/graphical/ParameterHelper.java
rename to qadevOOo/java/OOoRunner/src/main/java/graphical/ParameterHelper.java
diff --git a/qadevOOo/runner/graphical/PerformanceContainer.java b/qadevOOo/java/OOoRunner/src/main/java/graphical/PerformanceContainer.java
similarity index 100%
rename from qadevOOo/runner/graphical/PerformanceContainer.java
rename to qadevOOo/java/OOoRunner/src/main/java/graphical/PerformanceContainer.java
diff --git a/qadevOOo/runner/graphical/PixelCounter.java b/qadevOOo/java/OOoRunner/src/main/java/graphical/PixelCounter.java
similarity index 100%
rename from qadevOOo/runner/graphical/PixelCounter.java
rename to qadevOOo/java/OOoRunner/src/main/java/graphical/PixelCounter.java
diff --git a/qadevOOo/runner/graphical/PostscriptCreator.java b/qadevOOo/java/OOoRunner/src/main/java/graphical/PostscriptCreator.java
similarity index 100%
rename from qadevOOo/runner/graphical/PostscriptCreator.java
rename to qadevOOo/java/OOoRunner/src/main/java/graphical/PostscriptCreator.java
diff --git a/qadevOOo/runner/graphical/PropertyName.java b/qadevOOo/java/OOoRunner/src/main/java/graphical/PropertyName.java
similarity index 100%
rename from qadevOOo/runner/graphical/PropertyName.java
rename to qadevOOo/java/OOoRunner/src/main/java/graphical/PropertyName.java
diff --git a/qadevOOo/runner/graphical/TimeHelper.java b/qadevOOo/java/OOoRunner/src/main/java/graphical/TimeHelper.java
similarity index 100%
rename from qadevOOo/runner/graphical/TimeHelper.java
rename to qadevOOo/java/OOoRunner/src/main/java/graphical/TimeHelper.java
diff --git a/qadevOOo/runner/graphical/Tolerance.java b/qadevOOo/java/OOoRunner/src/main/java/graphical/Tolerance.java
similarity index 100%
rename from qadevOOo/runner/graphical/Tolerance.java
rename to qadevOOo/java/OOoRunner/src/main/java/graphical/Tolerance.java
diff --git a/qadevOOo/runner/graphical/WrongEnvironmentException.java b/qadevOOo/java/OOoRunner/src/main/java/graphical/WrongEnvironmentException.java
similarity index 100%
rename from qadevOOo/runner/graphical/WrongEnvironmentException.java
rename to qadevOOo/java/OOoRunner/src/main/java/graphical/WrongEnvironmentException.java
diff --git a/qadevOOo/runner/graphical/WrongSuffixException.java b/qadevOOo/java/OOoRunner/src/main/java/graphical/WrongSuffixException.java
similarity index 100%
rename from qadevOOo/runner/graphical/WrongSuffixException.java
rename to qadevOOo/java/OOoRunner/src/main/java/graphical/WrongSuffixException.java
diff --git a/qadevOOo/runner/graphical/makefile.mk b/qadevOOo/java/OOoRunner/src/main/java/graphical/makefile.mk
similarity index 100%
rename from qadevOOo/runner/graphical/makefile.mk
rename to qadevOOo/java/OOoRunner/src/main/java/graphical/makefile.mk
diff --git a/qadevOOo/runner/helper/APIDescGetter.java b/qadevOOo/java/OOoRunner/src/main/java/helper/APIDescGetter.java
similarity index 100%
rename from qadevOOo/runner/helper/APIDescGetter.java
rename to qadevOOo/java/OOoRunner/src/main/java/helper/APIDescGetter.java
diff --git a/qadevOOo/runner/helper/AppProvider.java b/qadevOOo/java/OOoRunner/src/main/java/helper/AppProvider.java
similarity index 100%
rename from qadevOOo/runner/helper/AppProvider.java
rename to qadevOOo/java/OOoRunner/src/main/java/helper/AppProvider.java
diff --git a/qadevOOo/runner/helper/BuildEnvTools.java b/qadevOOo/java/OOoRunner/src/main/java/helper/BuildEnvTools.java
similarity index 100%
rename from qadevOOo/runner/helper/BuildEnvTools.java
rename to qadevOOo/java/OOoRunner/src/main/java/helper/BuildEnvTools.java
diff --git a/qadevOOo/runner/helper/CfgParser.java b/qadevOOo/java/OOoRunner/src/main/java/helper/CfgParser.java
similarity index 100%
rename from qadevOOo/runner/helper/CfgParser.java
rename to qadevOOo/java/OOoRunner/src/main/java/helper/CfgParser.java
diff --git a/qadevOOo/runner/helper/ClParser.java b/qadevOOo/java/OOoRunner/src/main/java/helper/ClParser.java
similarity index 100%
rename from qadevOOo/runner/helper/ClParser.java
rename to qadevOOo/java/OOoRunner/src/main/java/helper/ClParser.java
diff --git a/qadevOOo/runner/helper/ComplexDescGetter.java b/qadevOOo/java/OOoRunner/src/main/java/helper/ComplexDescGetter.java
similarity index 100%
rename from qadevOOo/runner/helper/ComplexDescGetter.java
rename to qadevOOo/java/OOoRunner/src/main/java/helper/ComplexDescGetter.java
diff --git a/qadevOOo/runner/helper/ConfigHelper.java b/qadevOOo/java/OOoRunner/src/main/java/helper/ConfigHelper.java
similarity index 100%
rename from qadevOOo/runner/helper/ConfigHelper.java
rename to qadevOOo/java/OOoRunner/src/main/java/helper/ConfigHelper.java
diff --git a/qadevOOo/runner/helper/ConfigurationRead.java b/qadevOOo/java/OOoRunner/src/main/java/helper/ConfigurationRead.java
similarity index 100%
rename from qadevOOo/runner/helper/ConfigurationRead.java
rename to qadevOOo/java/OOoRunner/src/main/java/helper/ConfigurationRead.java
diff --git a/qadevOOo/runner/helper/ContextMenuInterceptor.java b/qadevOOo/java/OOoRunner/src/main/java/helper/ContextMenuInterceptor.java
similarity index 100%
rename from qadevOOo/runner/helper/ContextMenuInterceptor.java
rename to qadevOOo/java/OOoRunner/src/main/java/helper/ContextMenuInterceptor.java
diff --git a/qadevOOo/runner/helper/CwsDataExchangeImpl.java b/qadevOOo/java/OOoRunner/src/main/java/helper/CwsDataExchangeImpl.java
similarity index 100%
rename from qadevOOo/runner/helper/CwsDataExchangeImpl.java
rename to qadevOOo/java/OOoRunner/src/main/java/helper/CwsDataExchangeImpl.java
diff --git a/qadevOOo/runner/helper/FileTools.java b/qadevOOo/java/OOoRunner/src/main/java/helper/FileTools.java
similarity index 100%
rename from qadevOOo/runner/helper/FileTools.java
rename to qadevOOo/java/OOoRunner/src/main/java/helper/FileTools.java
diff --git a/qadevOOo/runner/helper/InetTools.java b/qadevOOo/java/OOoRunner/src/main/java/helper/InetTools.java
similarity index 100%
rename from qadevOOo/runner/helper/InetTools.java
rename to qadevOOo/java/OOoRunner/src/main/java/helper/InetTools.java
diff --git a/qadevOOo/runner/helper/LoggingThread.java b/qadevOOo/java/OOoRunner/src/main/java/helper/LoggingThread.java
similarity index 100%
rename from qadevOOo/runner/helper/LoggingThread.java
rename to qadevOOo/java/OOoRunner/src/main/java/helper/LoggingThread.java
diff --git a/qadevOOo/runner/helper/OSHelper.java b/qadevOOo/java/OOoRunner/src/main/java/helper/OSHelper.java
similarity index 100%
rename from qadevOOo/runner/helper/OSHelper.java
rename to qadevOOo/java/OOoRunner/src/main/java/helper/OSHelper.java
diff --git a/qadevOOo/runner/helper/ObjectInspectorModelImpl.java b/qadevOOo/java/OOoRunner/src/main/java/helper/ObjectInspectorModelImpl.java
similarity index 100%
rename from qadevOOo/runner/helper/ObjectInspectorModelImpl.java
rename to qadevOOo/java/OOoRunner/src/main/java/helper/ObjectInspectorModelImpl.java
diff --git a/qadevOOo/runner/helper/OfficeProvider.java b/qadevOOo/java/OOoRunner/src/main/java/helper/OfficeProvider.java
similarity index 100%
rename from qadevOOo/runner/helper/OfficeProvider.java
rename to qadevOOo/java/OOoRunner/src/main/java/helper/OfficeProvider.java
diff --git a/qadevOOo/runner/helper/OfficeWatcher.java b/qadevOOo/java/OOoRunner/src/main/java/helper/OfficeWatcher.java
similarity index 100%
rename from qadevOOo/runner/helper/OfficeWatcher.java
rename to qadevOOo/java/OOoRunner/src/main/java/helper/OfficeWatcher.java
diff --git a/qadevOOo/runner/helper/ParameterNotFoundException.java b/qadevOOo/java/OOoRunner/src/main/java/helper/ParameterNotFoundException.java
similarity index 100%
rename from qadevOOo/runner/helper/ParameterNotFoundException.java
rename to qadevOOo/java/OOoRunner/src/main/java/helper/ParameterNotFoundException.java
diff --git a/qadevOOo/runner/helper/ProcessHandler.java b/qadevOOo/java/OOoRunner/src/main/java/helper/ProcessHandler.java
similarity index 100%
rename from qadevOOo/runner/helper/ProcessHandler.java
rename to qadevOOo/java/OOoRunner/src/main/java/helper/ProcessHandler.java
diff --git a/qadevOOo/runner/helper/PropertyHandlerFactroy.java b/qadevOOo/java/OOoRunner/src/main/java/helper/PropertyHandlerFactroy.java
similarity index 100%
rename from qadevOOo/runner/helper/PropertyHandlerFactroy.java
rename to qadevOOo/java/OOoRunner/src/main/java/helper/PropertyHandlerFactroy.java
diff --git a/qadevOOo/runner/helper/PropertyHandlerImpl.java b/qadevOOo/java/OOoRunner/src/main/java/helper/PropertyHandlerImpl.java
similarity index 100%
rename from qadevOOo/runner/helper/PropertyHandlerImpl.java
rename to qadevOOo/java/OOoRunner/src/main/java/helper/PropertyHandlerImpl.java
diff --git a/qadevOOo/runner/helper/PropertyHelper.java b/qadevOOo/java/OOoRunner/src/main/java/helper/PropertyHelper.java
similarity index 100%
rename from qadevOOo/runner/helper/PropertyHelper.java
rename to qadevOOo/java/OOoRunner/src/main/java/helper/PropertyHelper.java
diff --git a/qadevOOo/runner/helper/SimpleMailSender.java b/qadevOOo/java/OOoRunner/src/main/java/helper/SimpleMailSender.java
similarity index 100%
rename from qadevOOo/runner/helper/SimpleMailSender.java
rename to qadevOOo/java/OOoRunner/src/main/java/helper/SimpleMailSender.java
diff --git a/qadevOOo/runner/helper/StreamSimulator.java b/qadevOOo/java/OOoRunner/src/main/java/helper/StreamSimulator.java
similarity index 100%
rename from qadevOOo/runner/helper/StreamSimulator.java
rename to qadevOOo/java/OOoRunner/src/main/java/helper/StreamSimulator.java
diff --git a/qadevOOo/runner/helper/StringHelper.java b/qadevOOo/java/OOoRunner/src/main/java/helper/StringHelper.java
similarity index 100%
rename from qadevOOo/runner/helper/StringHelper.java
rename to qadevOOo/java/OOoRunner/src/main/java/helper/StringHelper.java
diff --git a/qadevOOo/runner/helper/URLHelper.java b/qadevOOo/java/OOoRunner/src/main/java/helper/URLHelper.java
similarity index 100%
rename from qadevOOo/runner/helper/URLHelper.java
rename to qadevOOo/java/OOoRunner/src/main/java/helper/URLHelper.java
diff --git a/qadevOOo/runner/helper/UnoProvider.java b/qadevOOo/java/OOoRunner/src/main/java/helper/UnoProvider.java
similarity index 100%
rename from qadevOOo/runner/helper/UnoProvider.java
rename to qadevOOo/java/OOoRunner/src/main/java/helper/UnoProvider.java
diff --git a/qadevOOo/runner/helper/WindowListener.java b/qadevOOo/java/OOoRunner/src/main/java/helper/WindowListener.java
similarity index 100%
rename from qadevOOo/runner/helper/WindowListener.java
rename to qadevOOo/java/OOoRunner/src/main/java/helper/WindowListener.java
diff --git a/qadevOOo/runner/helper/makefile.mk b/qadevOOo/java/OOoRunner/src/main/java/helper/makefile.mk
similarity index 100%
rename from qadevOOo/runner/helper/makefile.mk
rename to qadevOOo/java/OOoRunner/src/main/java/helper/makefile.mk
diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessible.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/accessibility/_XAccessible.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/accessibility/_XAccessible.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/accessibility/_XAccessible.java
diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleAction.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/accessibility/_XAccessibleAction.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/accessibility/_XAccessibleAction.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/accessibility/_XAccessibleAction.java
diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleComponent.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/accessibility/_XAccessibleComponent.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/accessibility/_XAccessibleComponent.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/accessibility/_XAccessibleComponent.java
diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleContext.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/accessibility/_XAccessibleContext.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/accessibility/_XAccessibleContext.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/accessibility/_XAccessibleContext.java
diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleEditableText.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/accessibility/_XAccessibleEditableText.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/accessibility/_XAccessibleEditableText.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/accessibility/_XAccessibleEditableText.java
diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleEventBroadcaster.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/accessibility/_XAccessibleEventBroadcaster.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/accessibility/_XAccessibleEventBroadcaster.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/accessibility/_XAccessibleEventBroadcaster.java
diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleExtendedComponent.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/accessibility/_XAccessibleExtendedComponent.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/accessibility/_XAccessibleExtendedComponent.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/accessibility/_XAccessibleExtendedComponent.java
diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleImage.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/accessibility/_XAccessibleImage.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/accessibility/_XAccessibleImage.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/accessibility/_XAccessibleImage.java
diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleSelection.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/accessibility/_XAccessibleSelection.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/accessibility/_XAccessibleSelection.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/accessibility/_XAccessibleSelection.java
diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleTable.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/accessibility/_XAccessibleTable.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/accessibility/_XAccessibleTable.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/accessibility/_XAccessibleTable.java
diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleText.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/accessibility/_XAccessibleText.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/accessibility/_XAccessibleText.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/accessibility/_XAccessibleText.java
diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleValue.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/accessibility/_XAccessibleValue.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/accessibility/_XAccessibleValue.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/accessibility/_XAccessibleValue.java
diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlButtonModel.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_UnoControlButtonModel.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/awt/_UnoControlButtonModel.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_UnoControlButtonModel.java
diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlCheckBoxModel.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_UnoControlCheckBoxModel.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/awt/_UnoControlCheckBoxModel.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_UnoControlCheckBoxModel.java
diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlComboBoxModel.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_UnoControlComboBoxModel.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/awt/_UnoControlComboBoxModel.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_UnoControlComboBoxModel.java
diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlContainerModel.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_UnoControlContainerModel.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/awt/_UnoControlContainerModel.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_UnoControlContainerModel.java
diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlCurrencyFieldModel.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_UnoControlCurrencyFieldModel.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/awt/_UnoControlCurrencyFieldModel.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_UnoControlCurrencyFieldModel.java
diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlDateFieldModel.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_UnoControlDateFieldModel.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/awt/_UnoControlDateFieldModel.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_UnoControlDateFieldModel.java
diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlDialogElement.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_UnoControlDialogElement.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/awt/_UnoControlDialogElement.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_UnoControlDialogElement.java
diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlDialogModel.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_UnoControlDialogModel.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/awt/_UnoControlDialogModel.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_UnoControlDialogModel.java
diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlEditModel.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_UnoControlEditModel.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/awt/_UnoControlEditModel.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_UnoControlEditModel.java
diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlFileControlModel.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_UnoControlFileControlModel.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/awt/_UnoControlFileControlModel.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_UnoControlFileControlModel.java
diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlFixedLineModel.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_UnoControlFixedLineModel.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/awt/_UnoControlFixedLineModel.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_UnoControlFixedLineModel.java
diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlFixedTextModel.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_UnoControlFixedTextModel.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/awt/_UnoControlFixedTextModel.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_UnoControlFixedTextModel.java
diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlFormattedFieldModel.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_UnoControlFormattedFieldModel.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/awt/_UnoControlFormattedFieldModel.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_UnoControlFormattedFieldModel.java
diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlGroupBoxModel.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_UnoControlGroupBoxModel.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/awt/_UnoControlGroupBoxModel.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_UnoControlGroupBoxModel.java
diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlImageControlModel.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_UnoControlImageControlModel.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/awt/_UnoControlImageControlModel.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_UnoControlImageControlModel.java
diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlListBoxModel.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_UnoControlListBoxModel.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/awt/_UnoControlListBoxModel.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_UnoControlListBoxModel.java
diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlModel.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_UnoControlModel.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/awt/_UnoControlModel.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_UnoControlModel.java
diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlNumericFieldModel.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_UnoControlNumericFieldModel.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/awt/_UnoControlNumericFieldModel.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_UnoControlNumericFieldModel.java
diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlPatternFieldModel.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_UnoControlPatternFieldModel.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/awt/_UnoControlPatternFieldModel.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_UnoControlPatternFieldModel.java
diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlProgressBarModel.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_UnoControlProgressBarModel.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/awt/_UnoControlProgressBarModel.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_UnoControlProgressBarModel.java
diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlRadioButtonModel.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_UnoControlRadioButtonModel.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/awt/_UnoControlRadioButtonModel.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_UnoControlRadioButtonModel.java
diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlScrollBarModel.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_UnoControlScrollBarModel.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/awt/_UnoControlScrollBarModel.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_UnoControlScrollBarModel.java
diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlSpinButtonModel.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_UnoControlSpinButtonModel.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/awt/_UnoControlSpinButtonModel.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_UnoControlSpinButtonModel.java
diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlTimeFieldModel.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_UnoControlTimeFieldModel.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/awt/_UnoControlTimeFieldModel.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_UnoControlTimeFieldModel.java
diff --git a/qadevOOo/tests/java/ifc/awt/_XButton.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_XButton.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/awt/_XButton.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_XButton.java
diff --git a/qadevOOo/tests/java/ifc/awt/_XCheckBox.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_XCheckBox.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/awt/_XCheckBox.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_XCheckBox.java
diff --git a/qadevOOo/tests/java/ifc/awt/_XComboBox.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_XComboBox.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/awt/_XComboBox.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_XComboBox.java
diff --git a/qadevOOo/tests/java/ifc/awt/_XControl.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_XControl.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/awt/_XControl.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_XControl.java
diff --git a/qadevOOo/tests/java/ifc/awt/_XControlContainer.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_XControlContainer.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/awt/_XControlContainer.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_XControlContainer.java
diff --git a/qadevOOo/tests/java/ifc/awt/_XCurrencyField.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_XCurrencyField.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/awt/_XCurrencyField.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_XCurrencyField.java
diff --git a/qadevOOo/tests/java/ifc/awt/_XDataTransferProviderAccess.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_XDataTransferProviderAccess.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/awt/_XDataTransferProviderAccess.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_XDataTransferProviderAccess.java
diff --git a/qadevOOo/tests/java/ifc/awt/_XDateField.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_XDateField.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/awt/_XDateField.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_XDateField.java
diff --git a/qadevOOo/tests/java/ifc/awt/_XDialog.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_XDialog.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/awt/_XDialog.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_XDialog.java
diff --git a/qadevOOo/tests/java/ifc/awt/_XFixedText.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_XFixedText.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/awt/_XFixedText.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_XFixedText.java
diff --git a/qadevOOo/tests/java/ifc/awt/_XImageConsumer.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_XImageConsumer.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/awt/_XImageConsumer.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_XImageConsumer.java
diff --git a/qadevOOo/tests/java/ifc/awt/_XImageProducer.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_XImageProducer.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/awt/_XImageProducer.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_XImageProducer.java
diff --git a/qadevOOo/tests/java/ifc/awt/_XItemListener.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_XItemListener.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/awt/_XItemListener.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_XItemListener.java
diff --git a/qadevOOo/tests/java/ifc/awt/_XLayoutConstrains.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_XLayoutConstrains.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/awt/_XLayoutConstrains.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_XLayoutConstrains.java
diff --git a/qadevOOo/tests/java/ifc/awt/_XListBox.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_XListBox.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/awt/_XListBox.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_XListBox.java
diff --git a/qadevOOo/tests/java/ifc/awt/_XMessageBoxFactory.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_XMessageBoxFactory.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/awt/_XMessageBoxFactory.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_XMessageBoxFactory.java
diff --git a/qadevOOo/tests/java/ifc/awt/_XNumericField.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_XNumericField.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/awt/_XNumericField.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_XNumericField.java
diff --git a/qadevOOo/tests/java/ifc/awt/_XPatternField.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_XPatternField.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/awt/_XPatternField.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_XPatternField.java
diff --git a/qadevOOo/tests/java/ifc/awt/_XRadioButton.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_XRadioButton.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/awt/_XRadioButton.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_XRadioButton.java
diff --git a/qadevOOo/tests/java/ifc/awt/_XScrollBar.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_XScrollBar.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/awt/_XScrollBar.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_XScrollBar.java
diff --git a/qadevOOo/tests/java/ifc/awt/_XSpinField.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_XSpinField.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/awt/_XSpinField.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_XSpinField.java
diff --git a/qadevOOo/tests/java/ifc/awt/_XSpinValue.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_XSpinValue.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/awt/_XSpinValue.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_XSpinValue.java
diff --git a/qadevOOo/tests/java/ifc/awt/_XSystemChildFactory.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_XSystemChildFactory.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/awt/_XSystemChildFactory.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_XSystemChildFactory.java
diff --git a/qadevOOo/tests/java/ifc/awt/_XTabController.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_XTabController.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/awt/_XTabController.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_XTabController.java
diff --git a/qadevOOo/tests/java/ifc/awt/_XTabControllerModel.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_XTabControllerModel.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/awt/_XTabControllerModel.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_XTabControllerModel.java
diff --git a/qadevOOo/tests/java/ifc/awt/_XTextComponent.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_XTextComponent.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/awt/_XTextComponent.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_XTextComponent.java
diff --git a/qadevOOo/tests/java/ifc/awt/_XTextLayoutConstrains.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_XTextLayoutConstrains.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/awt/_XTextLayoutConstrains.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_XTextLayoutConstrains.java
diff --git a/qadevOOo/tests/java/ifc/awt/_XTextListener.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_XTextListener.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/awt/_XTextListener.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_XTextListener.java
diff --git a/qadevOOo/tests/java/ifc/awt/_XTimeField.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_XTimeField.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/awt/_XTimeField.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_XTimeField.java
diff --git a/qadevOOo/tests/java/ifc/awt/_XToolkit.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_XToolkit.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/awt/_XToolkit.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_XToolkit.java
diff --git a/qadevOOo/tests/java/ifc/awt/_XTopWindow.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_XTopWindow.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/awt/_XTopWindow.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_XTopWindow.java
diff --git a/qadevOOo/tests/java/ifc/awt/_XUnoControlContainer.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_XUnoControlContainer.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/awt/_XUnoControlContainer.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_XUnoControlContainer.java
diff --git a/qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_XUserInputInterception.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_XUserInputInterception.java
diff --git a/qadevOOo/tests/java/ifc/awt/_XView.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_XView.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/awt/_XView.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_XView.java
diff --git a/qadevOOo/tests/java/ifc/awt/_XWindow.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_XWindow.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/awt/_XWindow.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/awt/_XWindow.java
diff --git a/qadevOOo/tests/java/ifc/awt/tree/_TreeControlModel.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/awt/tree/_TreeControlModel.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/awt/tree/_TreeControlModel.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/awt/tree/_TreeControlModel.java
diff --git a/qadevOOo/tests/java/ifc/awt/tree/_XMutableTreeDataModel.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/awt/tree/_XMutableTreeDataModel.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/awt/tree/_XMutableTreeDataModel.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/awt/tree/_XMutableTreeDataModel.java
diff --git a/qadevOOo/tests/java/ifc/awt/tree/_XMutableTreeNode.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/awt/tree/_XMutableTreeNode.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/awt/tree/_XMutableTreeNode.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/awt/tree/_XMutableTreeNode.java
diff --git a/qadevOOo/tests/java/ifc/awt/tree/_XTreeControl.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/awt/tree/_XTreeControl.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/awt/tree/_XTreeControl.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/awt/tree/_XTreeControl.java
diff --git a/qadevOOo/tests/java/ifc/awt/tree/_XTreeDataModel.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/awt/tree/_XTreeDataModel.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/awt/tree/_XTreeDataModel.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/awt/tree/_XTreeDataModel.java
diff --git a/qadevOOo/tests/java/ifc/awt/tree/_XTreeNode.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/awt/tree/_XTreeNode.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/awt/tree/_XTreeNode.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/awt/tree/_XTreeNode.java
diff --git a/qadevOOo/tests/java/ifc/beans/_XExactName.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/beans/_XExactName.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/beans/_XExactName.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/beans/_XExactName.java
diff --git a/qadevOOo/tests/java/ifc/beans/_XFastPropertySet.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/beans/_XFastPropertySet.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/beans/_XFastPropertySet.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/beans/_XFastPropertySet.java
diff --git a/qadevOOo/tests/java/ifc/beans/_XHierarchicalPropertySet.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/beans/_XHierarchicalPropertySet.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/beans/_XHierarchicalPropertySet.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/beans/_XHierarchicalPropertySet.java
diff --git a/qadevOOo/tests/java/ifc/beans/_XIntrospection.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/beans/_XIntrospection.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/beans/_XIntrospection.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/beans/_XIntrospection.java
diff --git a/qadevOOo/tests/java/ifc/beans/_XMultiHierarchicalPropertySet.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/beans/_XMultiHierarchicalPropertySet.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/beans/_XMultiHierarchicalPropertySet.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/beans/_XMultiHierarchicalPropertySet.java
diff --git a/qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/beans/_XMultiPropertySet.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/beans/_XMultiPropertySet.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/beans/_XMultiPropertySet.java
diff --git a/qadevOOo/tests/java/ifc/beans/_XMultiPropertyStates.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/beans/_XMultiPropertyStates.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/beans/_XMultiPropertyStates.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/beans/_XMultiPropertyStates.java
diff --git a/qadevOOo/tests/java/ifc/beans/_XProperty.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/beans/_XProperty.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/beans/_XProperty.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/beans/_XProperty.java
diff --git a/qadevOOo/tests/java/ifc/beans/_XPropertyAccess.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/beans/_XPropertyAccess.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/beans/_XPropertyAccess.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/beans/_XPropertyAccess.java
diff --git a/qadevOOo/tests/java/ifc/beans/_XPropertyContainer.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/beans/_XPropertyContainer.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/beans/_XPropertyContainer.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/beans/_XPropertyContainer.java
diff --git a/qadevOOo/tests/java/ifc/beans/_XPropertySet.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/beans/_XPropertySet.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/beans/_XPropertySet.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/beans/_XPropertySet.java
diff --git a/qadevOOo/tests/java/ifc/beans/_XPropertySetInfo.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/beans/_XPropertySetInfo.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/beans/_XPropertySetInfo.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/beans/_XPropertySetInfo.java
diff --git a/qadevOOo/tests/java/ifc/beans/_XPropertyState.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/beans/_XPropertyState.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/beans/_XPropertyState.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/beans/_XPropertyState.java
diff --git a/qadevOOo/tests/java/ifc/beans/_XPropertyWithState.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/beans/_XPropertyWithState.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/beans/_XPropertyWithState.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/beans/_XPropertyWithState.java
diff --git a/qadevOOo/tests/java/ifc/beans/_XTolerantMultiPropertySet.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/beans/_XTolerantMultiPropertySet.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/beans/_XTolerantMultiPropertySet.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/beans/_XTolerantMultiPropertySet.java
diff --git a/qadevOOo/tests/java/ifc/bridge/_XBridge.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/bridge/_XBridge.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/bridge/_XBridge.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/bridge/_XBridge.java
diff --git a/qadevOOo/tests/java/ifc/bridge/_XBridgeFactory.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/bridge/_XBridgeFactory.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/bridge/_XBridgeFactory.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/bridge/_XBridgeFactory.java
diff --git a/qadevOOo/tests/java/ifc/bridge/_XUnoUrlResolver.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/bridge/_XUnoUrlResolver.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/bridge/_XUnoUrlResolver.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/bridge/_XUnoUrlResolver.java
diff --git a/qadevOOo/tests/java/ifc/chart/_BarDiagram.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/chart/_BarDiagram.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/chart/_BarDiagram.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/chart/_BarDiagram.java
diff --git a/qadevOOo/tests/java/ifc/chart/_Chart3DBarProperties.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/chart/_Chart3DBarProperties.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/chart/_Chart3DBarProperties.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/chart/_Chart3DBarProperties.java
diff --git a/qadevOOo/tests/java/ifc/chart/_ChartAxis.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/chart/_ChartAxis.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/chart/_ChartAxis.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/chart/_ChartAxis.java
diff --git a/qadevOOo/tests/java/ifc/chart/_ChartAxisXSupplier.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/chart/_ChartAxisXSupplier.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/chart/_ChartAxisXSupplier.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/chart/_ChartAxisXSupplier.java
diff --git a/qadevOOo/tests/java/ifc/chart/_ChartAxisYSupplier.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/chart/_ChartAxisYSupplier.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/chart/_ChartAxisYSupplier.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/chart/_ChartAxisYSupplier.java
diff --git a/qadevOOo/tests/java/ifc/chart/_ChartAxisZSupplier.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/chart/_ChartAxisZSupplier.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/chart/_ChartAxisZSupplier.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/chart/_ChartAxisZSupplier.java
diff --git a/qadevOOo/tests/java/ifc/chart/_ChartDataPointProperties.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/chart/_ChartDataPointProperties.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/chart/_ChartDataPointProperties.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/chart/_ChartDataPointProperties.java
diff --git a/qadevOOo/tests/java/ifc/chart/_ChartDataRowProperties.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/chart/_ChartDataRowProperties.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/chart/_ChartDataRowProperties.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/chart/_ChartDataRowProperties.java
diff --git a/qadevOOo/tests/java/ifc/chart/_ChartDocument.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/chart/_ChartDocument.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/chart/_ChartDocument.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/chart/_ChartDocument.java
diff --git a/qadevOOo/tests/java/ifc/chart/_ChartLegend.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/chart/_ChartLegend.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/chart/_ChartLegend.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/chart/_ChartLegend.java
diff --git a/qadevOOo/tests/java/ifc/chart/_ChartStatistics.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/chart/_ChartStatistics.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/chart/_ChartStatistics.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/chart/_ChartStatistics.java
diff --git a/qadevOOo/tests/java/ifc/chart/_ChartTableAddressSupplier.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/chart/_ChartTableAddressSupplier.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/chart/_ChartTableAddressSupplier.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/chart/_ChartTableAddressSupplier.java
diff --git a/qadevOOo/tests/java/ifc/chart/_ChartTitle.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/chart/_ChartTitle.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/chart/_ChartTitle.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/chart/_ChartTitle.java
diff --git a/qadevOOo/tests/java/ifc/chart/_ChartTwoAxisXSupplier.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/chart/_ChartTwoAxisXSupplier.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/chart/_ChartTwoAxisXSupplier.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/chart/_ChartTwoAxisXSupplier.java
diff --git a/qadevOOo/tests/java/ifc/chart/_ChartTwoAxisYSupplier.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/chart/_ChartTwoAxisYSupplier.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/chart/_ChartTwoAxisYSupplier.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/chart/_ChartTwoAxisYSupplier.java
diff --git a/qadevOOo/tests/java/ifc/chart/_Diagram.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/chart/_Diagram.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/chart/_Diagram.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/chart/_Diagram.java
diff --git a/qadevOOo/tests/java/ifc/chart/_Dim3DDiagram.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/chart/_Dim3DDiagram.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/chart/_Dim3DDiagram.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/chart/_Dim3DDiagram.java
diff --git a/qadevOOo/tests/java/ifc/chart/_LineDiagram.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/chart/_LineDiagram.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/chart/_LineDiagram.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/chart/_LineDiagram.java
diff --git a/qadevOOo/tests/java/ifc/chart/_StackableDiagram.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/chart/_StackableDiagram.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/chart/_StackableDiagram.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/chart/_StackableDiagram.java
diff --git a/qadevOOo/tests/java/ifc/chart/_StockDiagram.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/chart/_StockDiagram.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/chart/_StockDiagram.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/chart/_StockDiagram.java
diff --git a/qadevOOo/tests/java/ifc/chart/_X3DDisplay.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/chart/_X3DDisplay.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/chart/_X3DDisplay.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/chart/_X3DDisplay.java
diff --git a/qadevOOo/tests/java/ifc/chart/_XAxisXSupplier.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/chart/_XAxisXSupplier.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/chart/_XAxisXSupplier.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/chart/_XAxisXSupplier.java
diff --git a/qadevOOo/tests/java/ifc/chart/_XAxisYSupplier.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/chart/_XAxisYSupplier.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/chart/_XAxisYSupplier.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/chart/_XAxisYSupplier.java
diff --git a/qadevOOo/tests/java/ifc/chart/_XAxisZSupplier.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/chart/_XAxisZSupplier.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/chart/_XAxisZSupplier.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/chart/_XAxisZSupplier.java
diff --git a/qadevOOo/tests/java/ifc/chart/_XChartData.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/chart/_XChartData.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/chart/_XChartData.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/chart/_XChartData.java
diff --git a/qadevOOo/tests/java/ifc/chart/_XChartDataArray.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/chart/_XChartDataArray.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/chart/_XChartDataArray.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/chart/_XChartDataArray.java
diff --git a/qadevOOo/tests/java/ifc/chart/_XChartDocument.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/chart/_XChartDocument.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/chart/_XChartDocument.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/chart/_XChartDocument.java
diff --git a/qadevOOo/tests/java/ifc/chart/_XDiagram.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/chart/_XDiagram.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/chart/_XDiagram.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/chart/_XDiagram.java
diff --git a/qadevOOo/tests/java/ifc/chart/_XStatisticDisplay.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/chart/_XStatisticDisplay.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/chart/_XStatisticDisplay.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/chart/_XStatisticDisplay.java
diff --git a/qadevOOo/tests/java/ifc/chart/_XTwoAxisXSupplier.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/chart/_XTwoAxisXSupplier.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/chart/_XTwoAxisXSupplier.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/chart/_XTwoAxisXSupplier.java
diff --git a/qadevOOo/tests/java/ifc/chart/_XTwoAxisYSupplier.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/chart/_XTwoAxisYSupplier.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/chart/_XTwoAxisYSupplier.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/chart/_XTwoAxisYSupplier.java
diff --git a/qadevOOo/tests/java/ifc/configuration/_XTemplateContainer.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/configuration/_XTemplateContainer.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/configuration/_XTemplateContainer.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/configuration/_XTemplateContainer.java
diff --git a/qadevOOo/tests/java/ifc/configuration/_XTemplateInstance.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/configuration/_XTemplateInstance.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/configuration/_XTemplateInstance.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/configuration/_XTemplateInstance.java
diff --git a/qadevOOo/tests/java/ifc/configuration/backend/_XBackend.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/configuration/backend/_XBackend.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/configuration/backend/_XBackend.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/configuration/backend/_XBackend.java
diff --git a/qadevOOo/tests/java/ifc/configuration/backend/_XBackendEntities.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/configuration/backend/_XBackendEntities.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/configuration/backend/_XBackendEntities.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/configuration/backend/_XBackendEntities.java
diff --git a/qadevOOo/tests/java/ifc/configuration/backend/_XLayer.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/configuration/backend/_XLayer.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/configuration/backend/_XLayer.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/configuration/backend/_XLayer.java
diff --git a/qadevOOo/tests/java/ifc/configuration/backend/_XLayerHandler.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/configuration/backend/_XLayerHandler.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/configuration/backend/_XLayerHandler.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/configuration/backend/_XLayerHandler.java
diff --git a/qadevOOo/tests/java/ifc/configuration/backend/_XLayerImporter.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/configuration/backend/_XLayerImporter.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/configuration/backend/_XLayerImporter.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/configuration/backend/_XLayerImporter.java
diff --git a/qadevOOo/tests/java/ifc/configuration/backend/_XMultiLayerStratum.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/configuration/backend/_XMultiLayerStratum.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/configuration/backend/_XMultiLayerStratum.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/configuration/backend/_XMultiLayerStratum.java
diff --git a/qadevOOo/tests/java/ifc/configuration/backend/_XSchema.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/configuration/backend/_XSchema.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/configuration/backend/_XSchema.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/configuration/backend/_XSchema.java
diff --git a/qadevOOo/tests/java/ifc/configuration/backend/_XSchemaSupplier.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/configuration/backend/_XSchemaSupplier.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/configuration/backend/_XSchemaSupplier.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/configuration/backend/_XSchemaSupplier.java
diff --git a/qadevOOo/tests/java/ifc/configuration/backend/_XSingleLayerStratum.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/configuration/backend/_XSingleLayerStratum.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/configuration/backend/_XSingleLayerStratum.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/configuration/backend/_XSingleLayerStratum.java
diff --git a/qadevOOo/tests/java/ifc/configuration/backend/_XUpdateHandler.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/configuration/backend/_XUpdateHandler.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/configuration/backend/_XUpdateHandler.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/configuration/backend/_XUpdateHandler.java
diff --git a/qadevOOo/tests/java/ifc/connection/_XAcceptor.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/connection/_XAcceptor.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/connection/_XAcceptor.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/connection/_XAcceptor.java
diff --git a/qadevOOo/tests/java/ifc/connection/_XConnector.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/connection/_XConnector.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/connection/_XConnector.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/connection/_XConnector.java
diff --git a/qadevOOo/tests/java/ifc/container/_XChild.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/container/_XChild.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/container/_XChild.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/container/_XChild.java
diff --git a/qadevOOo/tests/java/ifc/container/_XContainer.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/container/_XContainer.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/container/_XContainer.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/container/_XContainer.java
diff --git a/qadevOOo/tests/java/ifc/container/_XContainerQuery.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/container/_XContainerQuery.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/container/_XContainerQuery.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/container/_XContainerQuery.java
diff --git a/qadevOOo/tests/java/ifc/container/_XContentEnumerationAccess.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/container/_XContentEnumerationAccess.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/container/_XContentEnumerationAccess.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/container/_XContentEnumerationAccess.java
diff --git a/qadevOOo/tests/java/ifc/container/_XElementAccess.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/container/_XElementAccess.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/container/_XElementAccess.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/container/_XElementAccess.java
diff --git a/qadevOOo/tests/java/ifc/container/_XEnumeration.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/container/_XEnumeration.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/container/_XEnumeration.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/container/_XEnumeration.java
diff --git a/qadevOOo/tests/java/ifc/container/_XEnumerationAccess.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/container/_XEnumerationAccess.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/container/_XEnumerationAccess.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/container/_XEnumerationAccess.java
diff --git a/qadevOOo/tests/java/ifc/container/_XHierarchicalName.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/container/_XHierarchicalName.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/container/_XHierarchicalName.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/container/_XHierarchicalName.java
diff --git a/qadevOOo/tests/java/ifc/container/_XHierarchicalNameAccess.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/container/_XHierarchicalNameAccess.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/container/_XHierarchicalNameAccess.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/container/_XHierarchicalNameAccess.java
diff --git a/qadevOOo/tests/java/ifc/container/_XIndexAccess.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/container/_XIndexAccess.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/container/_XIndexAccess.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/container/_XIndexAccess.java
diff --git a/qadevOOo/tests/java/ifc/container/_XIndexContainer.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/container/_XIndexContainer.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/container/_XIndexContainer.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/container/_XIndexContainer.java
diff --git a/qadevOOo/tests/java/ifc/container/_XIndexReplace.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/container/_XIndexReplace.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/container/_XIndexReplace.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/container/_XIndexReplace.java
diff --git a/qadevOOo/tests/java/ifc/container/_XNameAccess.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/container/_XNameAccess.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/container/_XNameAccess.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/container/_XNameAccess.java
diff --git a/qadevOOo/tests/java/ifc/container/_XNameContainer.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/container/_XNameContainer.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/container/_XNameContainer.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/container/_XNameContainer.java
diff --git a/qadevOOo/tests/java/ifc/container/_XNameReplace.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/container/_XNameReplace.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/container/_XNameReplace.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/container/_XNameReplace.java
diff --git a/qadevOOo/tests/java/ifc/container/_XNamed.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/container/_XNamed.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/container/_XNamed.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/container/_XNamed.java
diff --git a/qadevOOo/tests/java/ifc/container/_XSet.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/container/_XSet.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/container/_XSet.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/container/_XSet.java
diff --git a/qadevOOo/tests/java/ifc/datatransfer/_XDataFormatTranslator.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/datatransfer/_XDataFormatTranslator.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/datatransfer/_XDataFormatTranslator.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/datatransfer/_XDataFormatTranslator.java
diff --git a/qadevOOo/tests/java/ifc/datatransfer/_XMimeContentTypeFactory.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/datatransfer/_XMimeContentTypeFactory.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/datatransfer/_XMimeContentTypeFactory.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/datatransfer/_XMimeContentTypeFactory.java
diff --git a/qadevOOo/tests/java/ifc/datatransfer/clipboard/_XClipboard.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/datatransfer/clipboard/_XClipboard.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/datatransfer/clipboard/_XClipboard.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/datatransfer/clipboard/_XClipboard.java
diff --git a/qadevOOo/tests/java/ifc/datatransfer/clipboard/_XClipboardEx.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/datatransfer/clipboard/_XClipboardEx.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/datatransfer/clipboard/_XClipboardEx.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/datatransfer/clipboard/_XClipboardEx.java
diff --git a/qadevOOo/tests/java/ifc/datatransfer/clipboard/_XClipboardNotifier.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/datatransfer/clipboard/_XClipboardNotifier.java
similarity index 100%
rename from qadevOOo/tests/java/ifc/datatransfer/clipboard/_XClipboardNotifier.java
rename to qadevOOo/java/OOoRunner/src/main/java/ifc/datatransfer/clipboard/_XClipboardNotifier.java
diff --git a/qadevOOo/tests/java/ifc/datatransfer/clipboard/_XFlushableClipboard.java b/qadevOOo/java/OOoRunner/src/main/java/ifc/datatransfer/clipboard/_XFlushableClipboard.java
similarity index 100%

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list