46 files changed, 34 insertions, 42 deletions

diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 513498a9fbd2..4920dbcc2fc4 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -969,12 +969,12 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
     qadevOOo/tests/java/ifc/xml/sax/_XDocumentHandler \
     qadevOOo/tests/java/ifc/xml/_UserDefinedAttributeSupplier \
     qadevOOo/tests/java/mod/_acceptor/Acceptor \
-    qadevOOo/tests/java/mod/_acceptor.uno/Acceptor \
+    qadevOOo/tests/java/mod/_acceptor/uno/Acceptor \
     qadevOOo/tests/java/mod/_adabas/ODriver \
     qadevOOo/tests/java/mod/_ado/ODriver \
     qadevOOo/tests/java/mod/_basctl/AccessibleShape \
     qadevOOo/tests/java/mod/_brdgfctr/BridgeFactory \
-    qadevOOo/tests/java/mod/_bridgefac.uno/BridgeFactory \
+    qadevOOo/tests/java/mod/_bridgefac/uno/BridgeFactory \
     qadevOOo/tests/java/mod/_cached/CachedContentResultSetFactory \
     qadevOOo/tests/java/mod/_cached/CachedContentResultSetStubFactory \
     qadevOOo/tests/java/mod/_cached/CachedDynamicResultSetFactory \
@@ -986,10 +986,10 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
     qadevOOo/tests/java/mod/_configmgr/ConfigurationProvider \
     qadevOOo/tests/java/mod/_configmgr/DefaultProvider \
     qadevOOo/tests/java/mod/_configmgr/ProviderTestEnvironment \
-    qadevOOo/tests/java/mod/_connector.uno/Connector \
+    qadevOOo/tests/java/mod/_connector/uno/Connector \
     qadevOOo/tests/java/mod/_connectr/Connector \
     qadevOOo/tests/java/mod/_corefl/CoreReflection \
-    qadevOOo/tests/java/mod/_corereflection.uno/CoreReflection \
+    qadevOOo/tests/java/mod/_corereflection/uno/CoreReflection \
     qadevOOo/tests/java/mod/_cpld/DLLComponentLoader \
     qadevOOo/tests/java/mod/_dbaccess/ConnectionLineAccessibility \
     qadevOOo/tests/java/mod/_dbaccess/DBContentLoader \
@@ -1105,17 +1105,17 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
     qadevOOo/tests/java/mod/_i18n/NumberFormatCodeMapper \
     qadevOOo/tests/java/mod/_i18n/TextSearch \
     qadevOOo/tests/java/mod/_i18n/Transliteration \
-    qadevOOo/tests/java/mod/_implreg.uno/ImplementationRegistration \
+    qadevOOo/tests/java/mod/_implreg/uno/ImplementationRegistration \
     qadevOOo/tests/java/mod/_impreg/ImplementationRegistration \
     qadevOOo/tests/java/mod/_insp/Introspection \
-    qadevOOo/tests/java/mod/_introspection.uno/Introspection \
+    qadevOOo/tests/java/mod/_introspection/uno/Introspection \
     qadevOOo/tests/java/mod/_invadp/InvocationAdapterFactory \
     qadevOOo/tests/java/mod/_inv/Invocation \
-    qadevOOo/tests/java/mod/_invocadapt.uno/InvocationAdapterFactory \
-    qadevOOo/tests/java/mod/_invocation.uno/Invocation \
+    qadevOOo/tests/java/mod/_invocadapt/uno/InvocationAdapterFactory \
+    qadevOOo/tests/java/mod/_invocation/uno/Invocation \
     qadevOOo/tests/java/mod/_javaloader/JavaComponentLoader \
-    qadevOOo/tests/java/mod/_javaloader.uno/JavaComponentLoader \
-    qadevOOo/tests/java/mod/_javavm.uno/JavaVirtualMachine \
+    qadevOOo/tests/java/mod/_javaloader/uno/JavaComponentLoader \
+    qadevOOo/tests/java/mod/_javavm/uno/JavaVirtualMachine \
     qadevOOo/tests/java/mod/_jdbc/JDBCDriver \
     qadevOOo/tests/java/mod/_jen/JavaVirtualMachine \
     qadevOOo/tests/java/mod/_lng/DicList \
@@ -1127,19 +1127,19 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
     qadevOOo/tests/java/mod/_mcnttype/MimeContentTypeFactory \
     qadevOOo/tests/java/mod/_mozab/MozabDriver \
     qadevOOo/tests/java/mod/_namingservice/NamingService \
-    qadevOOo/tests/java/mod/_namingservice.uno/NamingService \
-    qadevOOo/tests/java/mod/_nestedreg.uno/NestedRegistry \
+    qadevOOo/tests/java/mod/_namingservice/uno/NamingService \
+    qadevOOo/tests/java/mod/_nestedreg/uno/NestedRegistry \
     qadevOOo/tests/java/mod/_odbc/ODBCDriver \
     qadevOOo/tests/java/mod/_pcr/ObjectInspector \
     qadevOOo/tests/java/mod/_pcr/ObjectInspectorModel \
     qadevOOo/tests/java/mod/_proxyfac/ProxyFactory \
-    qadevOOo/tests/java/mod/_proxyfac.uno/ProxyFactory \
+    qadevOOo/tests/java/mod/_proxyfac/uno/ProxyFactory \
     qadevOOo/tests/java/mod/_proxyset/SOffice52ProxySettings \
     qadevOOo/tests/java/mod/_proxyset/SystemProxySettings \
     qadevOOo/tests/java/mod/_qadevOOo/SelfTest \
     qadevOOo/tests/java/mod/_rdbtdp/RegistryTypeDescriptionProvider \
-    qadevOOo/tests/java/mod/_regtypeprov.uno/RegistryTypeDescriptionProvider \
-    qadevOOo/tests/java/mod/_remotebridge.uno/various \
+    qadevOOo/tests/java/mod/_regtypeprov/uno/RegistryTypeDescriptionProvider \
+    qadevOOo/tests/java/mod/_remotebridge/uno/various \
     qadevOOo/tests/java/mod/_remotebridge/various \
     qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_HeaderFooter \
     qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_PreviewCell \
@@ -1319,14 +1319,14 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
     qadevOOo/tests/java/mod/_sd/SdXImpressDocument \
     qadevOOo/tests/java/mod/_sd/SdXPresentation \
     qadevOOo/tests/java/mod/_sd/SdXShape \
-    qadevOOo/tests/java/mod/_servicemgr.uno/OServiceManager \
+    qadevOOo/tests/java/mod/_servicemgr/uno/OServiceManager \
     qadevOOo/tests/java/mod/_sfx/AppDispatchProvider \
     qadevOOo/tests/java/mod/_sfx/DocumentTemplates \
     qadevOOo/tests/java/mod/_sfx/FrameLoader \
     qadevOOo/tests/java/mod/_sfx/SfxMacroLoader \
     qadevOOo/tests/java/mod/_sfx/StandaloneDocumentInfo \
-    qadevOOo/tests/java/mod/_shlibloader.uno/DLLComponentLoader \
-    qadevOOo/tests/java/mod/_simplereg.uno/SimpleRegistry \
+    qadevOOo/tests/java/mod/_shlibloader/uno/DLLComponentLoader \
+    qadevOOo/tests/java/mod/_simplereg/uno/SimpleRegistry \
     qadevOOo/tests/java/mod/_simreg/SimpleRegistry \
     qadevOOo/tests/java/mod/_smgr/OServiceManager \
     qadevOOo/tests/java/mod/_smplmail/SimpleSystemMail \
@@ -1348,14 +1348,14 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
     qadevOOo/tests/java/mod/_stm/ObjectOutputStream \
     qadevOOo/tests/java/mod/_stm/Pipe \
     qadevOOo/tests/java/mod/_stm/Pump \
-    qadevOOo/tests/java/mod/_streams.uno/DataInputStream \
-    qadevOOo/tests/java/mod/_streams.uno/DataOutputStream \
-    qadevOOo/tests/java/mod/_streams.uno/MarkableInputStream \
-    qadevOOo/tests/java/mod/_streams.uno/MarkableOutputStream \
-    qadevOOo/tests/java/mod/_streams.uno/ObjectInputStream \
-    qadevOOo/tests/java/mod/_streams.uno/ObjectOutputStream \
-    qadevOOo/tests/java/mod/_streams.uno/Pipe \
-    qadevOOo/tests/java/mod/_streams.uno/Pump \
+    qadevOOo/tests/java/mod/_streams/uno/DataInputStream \
+    qadevOOo/tests/java/mod/_streams/uno/DataOutputStream \
+    qadevOOo/tests/java/mod/_streams/uno/MarkableInputStream \
+    qadevOOo/tests/java/mod/_streams/uno/MarkableOutputStream \
+    qadevOOo/tests/java/mod/_streams/uno/ObjectInputStream \
+    qadevOOo/tests/java/mod/_streams/uno/ObjectOutputStream \
+    qadevOOo/tests/java/mod/_streams/uno/Pipe \
+    qadevOOo/tests/java/mod/_streams/uno/Pump \
     qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBox \
     qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderBar \
     qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderCell \
@@ -1571,8 +1571,8 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
     qadevOOo/tests/java/mod/_toolkit/UnoSpinButtonControlModel \
     qadevOOo/tests/java/mod/_toolkit/UnoTreeControl \
     qadevOOo/tests/java/mod/_toolkit/UnoTreeModel \
-    qadevOOo/tests/java/mod/_typeconverter.uno/TypeConverter \
-    qadevOOo/tests/java/mod/_typemgr.uno/TypeDescriptionManager \
+    qadevOOo/tests/java/mod/_typeconverter/uno/TypeConverter \
+    qadevOOo/tests/java/mod/_typemgr/uno/TypeDescriptionManager \
     qadevOOo/tests/java/mod/_ucb/UcbContentProviderProxyFactory \
     qadevOOo/tests/java/mod/_ucb/UcbPropertiesManager \
     qadevOOo/tests/java/mod/_ucb/UcbStore \
@@ -1588,7 +1588,7 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
     qadevOOo/tests/java/mod/_ucprmt/ProviderAcceptor \
     qadevOOo/tests/java/mod/_ucprmt/ProxyProvider \
     qadevOOo/tests/java/mod/_uui/UUIInteractionHandler \
-    qadevOOo/tests/java/mod/_uuresolver.uno/UnoUrlResolver \
+    qadevOOo/tests/java/mod/_uuresolver/uno/UnoUrlResolver \
     qadevOOo/tests/java/mod/_uuresolver/UnoUrlResolver \
     qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentExporter \
     qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentImporter \
diff --git a/qadevOOo/tests/java/mod/_acceptor.uno/Acceptor.java b/qadevOOo/tests/java/mod/_acceptor/uno/Acceptor.java
index decfa8dc07a6..bc0d1be8f8c0 100644
--- a/qadevOOo/tests/java/mod/_acceptor.uno/Acceptor.java
+++ b/qadevOOo/tests/java/mod/_acceptor/uno/Acceptor.java
@@ -108,6 +108,4 @@ public class Acceptor extends TestCase {
 
         curPort = ((Integer)tEnv.getObjRelation("Acceptor.Port")).intValue();
     }
-}
-
-
+}
\ No newline at end of file
diff --git a/qadevOOo/tests/java/mod/_bridgefac.uno/BridgeFactory.java b/qadevOOo/tests/java/mod/_bridgefac/uno/BridgeFactory.java
index 1f701e660f05..6ed4835b6efa 100644
--- a/qadevOOo/tests/java/mod/_bridgefac.uno/BridgeFactory.java
+++ b/qadevOOo/tests/java/mod/_bridgefac/uno/BridgeFactory.java
@@ -102,6 +102,4 @@ public class BridgeFactory extends TestCase {
             TestParameters tParam) {
         curPort = ((Integer)tEnv.getObjRelation("Connector.Port")).intValue() ;
     }
-}
-
-
+}
\ No newline at end of file
diff --git a/qadevOOo/tests/java/mod/_bridgefac.uno/package.html b/qadevOOo/tests/java/mod/_bridgefac/uno/package.html
index 856de26fca94..856de26fca94 100644
--- a/qadevOOo/tests/java/mod/_bridgefac.uno/package.html
+++ b/qadevOOo/tests/java/mod/_bridgefac/uno/package.html
diff --git a/qadevOOo/tests/java/mod/_connector.uno/Connector.java b/qadevOOo/tests/java/mod/_connector/uno/Connector.java
index 07b9a5deb05e..4e98ca91e979 100644
--- a/qadevOOo/tests/java/mod/_connector.uno/Connector.java
+++ b/qadevOOo/tests/java/mod/_connector/uno/Connector.java
@@ -108,6 +108,4 @@ public class Connector extends TestCase {
 
         curPort = ((Integer)tEnv.getObjRelation("Connector.Port")).intValue();
     }
-}
-
-
+}
\ No newline at end of file
diff --git a/qadevOOo/tests/java/mod/_connector.uno/package.html b/qadevOOo/tests/java/mod/_connector/uno/package.html
index 0fb225c0ef64..0fb225c0ef64 100644
--- a/qadevOOo/tests/java/mod/_connector.uno/package.html
+++ b/qadevOOo/tests/java/mod/_connector/uno/package.html
diff --git a/qadevOOo/tests/java/mod/_corereflection.uno/CoreReflection.java b/qadevOOo/tests/java/mod/_corereflection/uno/CoreReflection.java
index a5142c1ce068..439d119bc979 100644
--- a/qadevOOo/tests/java/mod/_corereflection.uno/CoreReflection.java
+++ b/qadevOOo/tests/java/mod/_corereflection/uno/CoreReflection.java
@@ -70,5 +70,4 @@ public class CoreReflection extends TestCase {
         return tEnv;
     } // finish method getTestEnvironment
 
-}    // finish class CoreReflection
-
+}    // finish class CoreReflection
\ No newline at end of file
diff --git a/qadevOOo/tests/java/mod/_corereflection.uno/package.html b/qadevOOo/tests/java/mod/_corereflection/uno/package.html
index a6d0129f42bf..a6d0129f42bf 100644
--- a/qadevOOo/tests/java/mod/_corereflection.uno/package.html
+++ b/qadevOOo/tests/java/mod/_corereflection/uno/package.html
diff --git a/qadevOOo/tests/java/mod/_implreg.uno/ImplementationRegistration.java b/qadevOOo/tests/java/mod/_implreg/uno/ImplementationRegistration.java
index 752756898977..a120df1c5175 100644
--- a/qadevOOo/tests/java/mod/_implreg.uno/ImplementationRegistration.java
+++ b/qadevOOo/tests/java/mod/_implreg/uno/ImplementationRegistration.java
@@ -68,5 +68,4 @@ public class ImplementationRegistration extends TestCase {
         return tEnv;
     } // finish method getTestEnvironment
 
-}    // finish class NestedRegistry
-
+}    // finish class NestedRegistry
\ No newline at end of file
diff --git a/qadevOOo/tests/java/mod/_implreg.uno/package.html b/qadevOOo/tests/java/mod/_implreg/uno/package.html
index 446ad28ae893..446ad28ae893 100644
--- a/qadevOOo/tests/java/mod/_implreg.uno/package.html
+++ b/qadevOOo/tests/java/mod/_implreg/uno/package.html
diff --git a/qadevOOo/tests/java/mod/_introspection.uno/Introspection.java b/qadevOOo/tests/java/mod/_introspection/uno/Introspection.java
index 544dcb558683..544dcb558683 100644
--- a/qadevOOo/tests/java/mod/_introspection.uno/Introspection.java
+++ b/qadevOOo/tests/java/mod/_introspection/uno/Introspection.java
diff --git a/qadevOOo/tests/java/mod/_introspection.uno/package.html b/qadevOOo/tests/java/mod/_introspection/uno/package.html
index 6d32765b8f75..6d32765b8f75 100644
--- a/qadevOOo/tests/java/mod/_introspection.uno/package.html
+++ b/qadevOOo/tests/java/mod/_introspection/uno/package.html
diff --git a/qadevOOo/tests/java/mod/_invocadapt.uno/InvocationAdapterFactory.java b/qadevOOo/tests/java/mod/_invocadapt/uno/InvocationAdapterFactory.java
index 0e70b3017c1c..0e70b3017c1c 100644
--- a/qadevOOo/tests/java/mod/_invocadapt.uno/InvocationAdapterFactory.java
+++ b/qadevOOo/tests/java/mod/_invocadapt/uno/InvocationAdapterFactory.java
diff --git a/qadevOOo/tests/java/mod/_invocadapt.uno/package.html b/qadevOOo/tests/java/mod/_invocadapt/uno/package.html
index bf91a1cd2aa6..bf91a1cd2aa6 100644
--- a/qadevOOo/tests/java/mod/_invocadapt.uno/package.html
+++ b/qadevOOo/tests/java/mod/_invocadapt/uno/package.html
diff --git a/qadevOOo/tests/java/mod/_invocation.uno/Invocation.java b/qadevOOo/tests/java/mod/_invocation/uno/Invocation.java
index 42acae957131..42acae957131 100644
--- a/qadevOOo/tests/java/mod/_invocation.uno/Invocation.java
+++ b/qadevOOo/tests/java/mod/_invocation/uno/Invocation.java
diff --git a/qadevOOo/tests/java/mod/_invocation.uno/package.html b/qadevOOo/tests/java/mod/_invocation/uno/package.html
index 4942108a3cda..4942108a3cda 100644
--- a/qadevOOo/tests/java/mod/_invocation.uno/package.html
+++ b/qadevOOo/tests/java/mod/_invocation/uno/package.html
diff --git a/qadevOOo/tests/java/mod/_javaloader.uno/JavaComponentLoader.java b/qadevOOo/tests/java/mod/_javaloader/uno/JavaComponentLoader.java
index 5b66c6275c73..5b66c6275c73 100644
--- a/qadevOOo/tests/java/mod/_javaloader.uno/JavaComponentLoader.java
+++ b/qadevOOo/tests/java/mod/_javaloader/uno/JavaComponentLoader.java
diff --git a/qadevOOo/tests/java/mod/_javavm.uno/JavaVirtualMachine.java b/qadevOOo/tests/java/mod/_javavm/uno/JavaVirtualMachine.java
index 20b229546c34..20b229546c34 100644
--- a/qadevOOo/tests/java/mod/_javavm.uno/JavaVirtualMachine.java
+++ b/qadevOOo/tests/java/mod/_javavm/uno/JavaVirtualMachine.java
diff --git a/qadevOOo/tests/java/mod/_javavm.uno/package.html b/qadevOOo/tests/java/mod/_javavm/uno/package.html
index a58e59cf2325..a58e59cf2325 100644
--- a/qadevOOo/tests/java/mod/_javavm.uno/package.html
+++ b/qadevOOo/tests/java/mod/_javavm/uno/package.html
diff --git a/qadevOOo/tests/java/mod/_namingservice.uno/NamingService.java b/qadevOOo/tests/java/mod/_namingservice/uno/NamingService.java
index d200b8c97270..d200b8c97270 100644
--- a/qadevOOo/tests/java/mod/_namingservice.uno/NamingService.java
+++ b/qadevOOo/tests/java/mod/_namingservice/uno/NamingService.java
diff --git a/qadevOOo/tests/java/mod/_nestedreg.uno/NestedRegistry.java b/qadevOOo/tests/java/mod/_nestedreg/uno/NestedRegistry.java
index 05b02b2fcf42..05b02b2fcf42 100644
--- a/qadevOOo/tests/java/mod/_nestedreg.uno/NestedRegistry.java
+++ b/qadevOOo/tests/java/mod/_nestedreg/uno/NestedRegistry.java
diff --git a/qadevOOo/tests/java/mod/_nestedreg.uno/package.html b/qadevOOo/tests/java/mod/_nestedreg/uno/package.html
index a685f8299cf7..a685f8299cf7 100644
--- a/qadevOOo/tests/java/mod/_nestedreg.uno/package.html
+++ b/qadevOOo/tests/java/mod/_nestedreg/uno/package.html
diff --git a/qadevOOo/tests/java/mod/_proxyfac.uno/ProxyFactory.java b/qadevOOo/tests/java/mod/_proxyfac/uno/ProxyFactory.java
index a4523c031fa4..a4523c031fa4 100644
--- a/qadevOOo/tests/java/mod/_proxyfac.uno/ProxyFactory.java
+++ b/qadevOOo/tests/java/mod/_proxyfac/uno/ProxyFactory.java
diff --git a/qadevOOo/tests/java/mod/_regtypeprov.uno/RegistryTypeDescriptionProvider.java b/qadevOOo/tests/java/mod/_regtypeprov/uno/RegistryTypeDescriptionProvider.java
index f81b9806224e..f81b9806224e 100644
--- a/qadevOOo/tests/java/mod/_regtypeprov.uno/RegistryTypeDescriptionProvider.java
+++ b/qadevOOo/tests/java/mod/_regtypeprov/uno/RegistryTypeDescriptionProvider.java
diff --git a/qadevOOo/tests/java/mod/_remotebridge.uno/various.java b/qadevOOo/tests/java/mod/_remotebridge/uno/various.java
index 34181e91a789..34181e91a789 100644
--- a/qadevOOo/tests/java/mod/_remotebridge.uno/various.java
+++ b/qadevOOo/tests/java/mod/_remotebridge/uno/various.java
diff --git a/qadevOOo/tests/java/mod/_servicemgr.uno/OServiceManager.java b/qadevOOo/tests/java/mod/_servicemgr/uno/OServiceManager.java
index 31bff2937c5d..31bff2937c5d 100644
--- a/qadevOOo/tests/java/mod/_servicemgr.uno/OServiceManager.java
+++ b/qadevOOo/tests/java/mod/_servicemgr/uno/OServiceManager.java
diff --git a/qadevOOo/tests/java/mod/_servicemgr.uno/package.html b/qadevOOo/tests/java/mod/_servicemgr/uno/package.html
index 3d56f5a64d8e..3d56f5a64d8e 100644
--- a/qadevOOo/tests/java/mod/_servicemgr.uno/package.html
+++ b/qadevOOo/tests/java/mod/_servicemgr/uno/package.html
diff --git a/qadevOOo/tests/java/mod/_shlibloader.uno/DLLComponentLoader.java b/qadevOOo/tests/java/mod/_shlibloader/uno/DLLComponentLoader.java
index cb467f5bba68..cb467f5bba68 100644
--- a/qadevOOo/tests/java/mod/_shlibloader.uno/DLLComponentLoader.java
+++ b/qadevOOo/tests/java/mod/_shlibloader/uno/DLLComponentLoader.java
diff --git a/qadevOOo/tests/java/mod/_shlibloader.uno/package.html b/qadevOOo/tests/java/mod/_shlibloader/uno/package.html
index 42b3235df1a0..42b3235df1a0 100644
--- a/qadevOOo/tests/java/mod/_shlibloader.uno/package.html
+++ b/qadevOOo/tests/java/mod/_shlibloader/uno/package.html
diff --git a/qadevOOo/tests/java/mod/_simplereg.uno/SimpleRegistry.java b/qadevOOo/tests/java/mod/_simplereg/uno/SimpleRegistry.java
index e45bc8eea574..e45bc8eea574 100644
--- a/qadevOOo/tests/java/mod/_simplereg.uno/SimpleRegistry.java
+++ b/qadevOOo/tests/java/mod/_simplereg/uno/SimpleRegistry.java
diff --git a/qadevOOo/tests/java/mod/_simplereg.uno/package.html b/qadevOOo/tests/java/mod/_simplereg/uno/package.html
index 01098fe52bc1..01098fe52bc1 100644
--- a/qadevOOo/tests/java/mod/_simplereg.uno/package.html
+++ b/qadevOOo/tests/java/mod/_simplereg/uno/package.html
diff --git a/qadevOOo/tests/java/mod/_streams.uno/DataInputStream.java b/qadevOOo/tests/java/mod/_streams/uno/DataInputStream.java
index ec16d4046d2e..ec16d4046d2e 100644
--- a/qadevOOo/tests/java/mod/_streams.uno/DataInputStream.java
+++ b/qadevOOo/tests/java/mod/_streams/uno/DataInputStream.java
diff --git a/qadevOOo/tests/java/mod/_streams.uno/DataOutputStream.java b/qadevOOo/tests/java/mod/_streams/uno/DataOutputStream.java
index 177ce4bd0001..177ce4bd0001 100644
--- a/qadevOOo/tests/java/mod/_streams.uno/DataOutputStream.java
+++ b/qadevOOo/tests/java/mod/_streams/uno/DataOutputStream.java
diff --git a/qadevOOo/tests/java/mod/_streams.uno/MarkableInputStream.java b/qadevOOo/tests/java/mod/_streams/uno/MarkableInputStream.java
index 971cfb44941a..971cfb44941a 100644
--- a/qadevOOo/tests/java/mod/_streams.uno/MarkableInputStream.java
+++ b/qadevOOo/tests/java/mod/_streams/uno/MarkableInputStream.java
diff --git a/qadevOOo/tests/java/mod/_streams.uno/MarkableOutputStream.java b/qadevOOo/tests/java/mod/_streams/uno/MarkableOutputStream.java
index dd3666207da0..dd3666207da0 100644
--- a/qadevOOo/tests/java/mod/_streams.uno/MarkableOutputStream.java
+++ b/qadevOOo/tests/java/mod/_streams/uno/MarkableOutputStream.java
diff --git a/qadevOOo/tests/java/mod/_streams.uno/ObjectInputStream.java b/qadevOOo/tests/java/mod/_streams/uno/ObjectInputStream.java
index 576076f87f2f..576076f87f2f 100644
--- a/qadevOOo/tests/java/mod/_streams.uno/ObjectInputStream.java
+++ b/qadevOOo/tests/java/mod/_streams/uno/ObjectInputStream.java
diff --git a/qadevOOo/tests/java/mod/_streams.uno/ObjectOutputStream.java b/qadevOOo/tests/java/mod/_streams/uno/ObjectOutputStream.java
index f30870ec2d24..f30870ec2d24 100644
--- a/qadevOOo/tests/java/mod/_streams.uno/ObjectOutputStream.java
+++ b/qadevOOo/tests/java/mod/_streams/uno/ObjectOutputStream.java
diff --git a/qadevOOo/tests/java/mod/_streams.uno/Pipe.java b/qadevOOo/tests/java/mod/_streams/uno/Pipe.java
index a4d32449de14..a4d32449de14 100644
--- a/qadevOOo/tests/java/mod/_streams.uno/Pipe.java
+++ b/qadevOOo/tests/java/mod/_streams/uno/Pipe.java
diff --git a/qadevOOo/tests/java/mod/_streams.uno/Pump.java b/qadevOOo/tests/java/mod/_streams/uno/Pump.java
index f953e557901c..f953e557901c 100644
--- a/qadevOOo/tests/java/mod/_streams.uno/Pump.java
+++ b/qadevOOo/tests/java/mod/_streams/uno/Pump.java
diff --git a/qadevOOo/tests/java/mod/_streams.uno/package.html b/qadevOOo/tests/java/mod/_streams/uno/package.html
index c5c5e1f067d4..c5c5e1f067d4 100644
--- a/qadevOOo/tests/java/mod/_streams.uno/package.html
+++ b/qadevOOo/tests/java/mod/_streams/uno/package.html
diff --git a/qadevOOo/tests/java/mod/_typeconverter.uno/TypeConverter.java b/qadevOOo/tests/java/mod/_typeconverter/uno/TypeConverter.java
index 986adef66d40..986adef66d40 100644
--- a/qadevOOo/tests/java/mod/_typeconverter.uno/TypeConverter.java
+++ b/qadevOOo/tests/java/mod/_typeconverter/uno/TypeConverter.java
diff --git a/qadevOOo/tests/java/mod/_typeconverter.uno/package.html b/qadevOOo/tests/java/mod/_typeconverter/uno/package.html
index 80a52e4fac1a..80a52e4fac1a 100644
--- a/qadevOOo/tests/java/mod/_typeconverter.uno/package.html
+++ b/qadevOOo/tests/java/mod/_typeconverter/uno/package.html
diff --git a/qadevOOo/tests/java/mod/_typemgr.uno/TypeDescriptionManager.java b/qadevOOo/tests/java/mod/_typemgr/uno/TypeDescriptionManager.java
index abee10a5029a..abee10a5029a 100644
--- a/qadevOOo/tests/java/mod/_typemgr.uno/TypeDescriptionManager.java
+++ b/qadevOOo/tests/java/mod/_typemgr/uno/TypeDescriptionManager.java
diff --git a/qadevOOo/tests/java/mod/_typemgr.uno/package.html b/qadevOOo/tests/java/mod/_typemgr/uno/package.html
index 5f6fc4287177..5f6fc4287177 100644
--- a/qadevOOo/tests/java/mod/_typemgr.uno/package.html
+++ b/qadevOOo/tests/java/mod/_typemgr/uno/package.html
diff --git a/qadevOOo/tests/java/mod/_uuresolver.uno/UnoUrlResolver.java b/qadevOOo/tests/java/mod/_uuresolver/uno/UnoUrlResolver.java
index 75f5ae5df9fc..75f5ae5df9fc 100644
--- a/qadevOOo/tests/java/mod/_uuresolver.uno/UnoUrlResolver.java
+++ b/qadevOOo/tests/java/mod/_uuresolver/uno/UnoUrlResolver.java
diff --git a/qadevOOo/tests/java/mod/_uuresolver.uno/package.html b/qadevOOo/tests/java/mod/_uuresolver/uno/package.html
index cb024997432c..cb024997432c 100644
--- a/qadevOOo/tests/java/mod/_uuresolver.uno/package.html
+++ b/qadevOOo/tests/java/mod/_uuresolver/uno/package.html