From ab7f5365ae31a6fb0b13b423d1f4419bdd877fe6 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 30 Aug 2012 16:15:18 +0200 Subject: Make it easier to use IDE with Java Java IDE's get upset if the package does not match the path, so move some files to make them match. Change-Id: Ia6a1f3dc572cc1d30492491de9cf1462f2887e6f --- qadevOOo/Jar_OOoRunner.mk | 58 ++-- .../tests/java/mod/_acceptor.uno/Acceptor.java | 113 -------- .../tests/java/mod/_acceptor/uno/Acceptor.java | 111 ++++++++ .../java/mod/_bridgefac.uno/BridgeFactory.java | 107 ------- .../tests/java/mod/_bridgefac.uno/package.html | 23 -- .../java/mod/_bridgefac/uno/BridgeFactory.java | 105 +++++++ .../tests/java/mod/_bridgefac/uno/package.html | 23 ++ .../tests/java/mod/_connector.uno/Connector.java | 113 -------- .../tests/java/mod/_connector.uno/package.html | 23 -- .../tests/java/mod/_connector/uno/Connector.java | 111 ++++++++ .../tests/java/mod/_connector/uno/package.html | 23 ++ .../mod/_corereflection.uno/CoreReflection.java | 74 ----- .../java/mod/_corereflection.uno/package.html | 23 -- .../mod/_corereflection/uno/CoreReflection.java | 73 +++++ .../java/mod/_corereflection/uno/package.html | 23 ++ .../_implreg.uno/ImplementationRegistration.java | 72 ----- qadevOOo/tests/java/mod/_implreg.uno/package.html | 23 -- .../_implreg/uno/ImplementationRegistration.java | 71 +++++ qadevOOo/tests/java/mod/_implreg/uno/package.html | 23 ++ .../java/mod/_introspection.uno/Introspection.java | 67 ----- .../tests/java/mod/_introspection.uno/package.html | 23 -- .../java/mod/_introspection/uno/Introspection.java | 67 +++++ .../tests/java/mod/_introspection/uno/package.html | 23 ++ .../_invocadapt.uno/InvocationAdapterFactory.java | 65 ----- .../tests/java/mod/_invocadapt.uno/package.html | 23 -- .../_invocadapt/uno/InvocationAdapterFactory.java | 65 +++++ .../tests/java/mod/_invocadapt/uno/package.html | 23 ++ .../tests/java/mod/_invocation.uno/Invocation.java | 95 ------- .../tests/java/mod/_invocation.uno/package.html | 23 -- .../tests/java/mod/_invocation/uno/Invocation.java | 95 +++++++ .../tests/java/mod/_invocation/uno/package.html | 23 ++ .../mod/_javaloader.uno/JavaComponentLoader.java | 87 ------ .../mod/_javaloader/uno/JavaComponentLoader.java | 87 ++++++ .../java/mod/_javavm.uno/JavaVirtualMachine.java | 66 ----- qadevOOo/tests/java/mod/_javavm.uno/package.html | 6 - .../java/mod/_javavm/uno/JavaVirtualMachine.java | 66 +++++ qadevOOo/tests/java/mod/_javavm/uno/package.html | 6 + .../java/mod/_namingservice.uno/NamingService.java | 90 ------ .../java/mod/_namingservice/uno/NamingService.java | 90 ++++++ .../java/mod/_nestedreg.uno/NestedRegistry.java | 189 ------------- .../tests/java/mod/_nestedreg.uno/package.html | 23 -- .../java/mod/_nestedreg/uno/NestedRegistry.java | 189 +++++++++++++ .../tests/java/mod/_nestedreg/uno/package.html | 23 ++ .../tests/java/mod/_proxyfac.uno/ProxyFactory.java | 67 ----- .../tests/java/mod/_proxyfac/uno/ProxyFactory.java | 67 +++++ .../RegistryTypeDescriptionProvider.java | 117 -------- .../uno/RegistryTypeDescriptionProvider.java | 117 ++++++++ .../tests/java/mod/_remotebridge.uno/various.java | 300 -------------------- .../tests/java/mod/_remotebridge/uno/various.java | 300 ++++++++++++++++++++ .../java/mod/_servicemgr.uno/OServiceManager.java | 160 ----------- .../tests/java/mod/_servicemgr.uno/package.html | 23 -- .../java/mod/_servicemgr/uno/OServiceManager.java | 160 +++++++++++ .../tests/java/mod/_servicemgr/uno/package.html | 23 ++ .../mod/_shlibloader.uno/DLLComponentLoader.java | 108 -------- .../tests/java/mod/_shlibloader.uno/package.html | 23 -- .../mod/_shlibloader/uno/DLLComponentLoader.java | 108 ++++++++ .../tests/java/mod/_shlibloader/uno/package.html | 23 ++ .../java/mod/_simplereg.uno/SimpleRegistry.java | 154 ----------- .../tests/java/mod/_simplereg.uno/package.html | 23 -- .../java/mod/_simplereg/uno/SimpleRegistry.java | 154 +++++++++++ .../tests/java/mod/_simplereg/uno/package.html | 23 ++ .../java/mod/_streams.uno/DataInputStream.java | 185 ------------- .../java/mod/_streams.uno/DataOutputStream.java | 170 ------------ .../java/mod/_streams.uno/MarkableInputStream.java | 135 --------- .../mod/_streams.uno/MarkableOutputStream.java | 195 ------------- .../java/mod/_streams.uno/ObjectInputStream.java | 287 ------------------- .../java/mod/_streams.uno/ObjectOutputStream.java | 308 --------------------- qadevOOo/tests/java/mod/_streams.uno/Pipe.java | 102 ------- qadevOOo/tests/java/mod/_streams.uno/Pump.java | 178 ------------ qadevOOo/tests/java/mod/_streams.uno/package.html | 23 -- .../java/mod/_streams/uno/DataInputStream.java | 185 +++++++++++++ .../java/mod/_streams/uno/DataOutputStream.java | 170 ++++++++++++ .../java/mod/_streams/uno/MarkableInputStream.java | 135 +++++++++ .../mod/_streams/uno/MarkableOutputStream.java | 195 +++++++++++++ .../java/mod/_streams/uno/ObjectInputStream.java | 287 +++++++++++++++++++ .../java/mod/_streams/uno/ObjectOutputStream.java | 308 +++++++++++++++++++++ qadevOOo/tests/java/mod/_streams/uno/Pipe.java | 102 +++++++ qadevOOo/tests/java/mod/_streams/uno/Pump.java | 178 ++++++++++++ qadevOOo/tests/java/mod/_streams/uno/package.html | 23 ++ .../java/mod/_typeconverter.uno/TypeConverter.java | 57 ---- .../tests/java/mod/_typeconverter.uno/package.html | 23 -- .../java/mod/_typeconverter/uno/TypeConverter.java | 57 ++++ .../tests/java/mod/_typeconverter/uno/package.html | 23 ++ .../mod/_typemgr.uno/TypeDescriptionManager.java | 75 ----- qadevOOo/tests/java/mod/_typemgr.uno/package.html | 23 -- .../mod/_typemgr/uno/TypeDescriptionManager.java | 75 +++++ qadevOOo/tests/java/mod/_typemgr/uno/package.html | 23 ++ .../java/mod/_uuresolver.uno/UnoUrlResolver.java | 59 ---- .../tests/java/mod/_uuresolver.uno/package.html | 23 -- .../java/mod/_uuresolver/uno/UnoUrlResolver.java | 59 ++++ .../tests/java/mod/_uuresolver/uno/package.html | 23 ++ 91 files changed, 4167 insertions(+), 4175 deletions(-) delete mode 100644 qadevOOo/tests/java/mod/_acceptor.uno/Acceptor.java create mode 100644 qadevOOo/tests/java/mod/_acceptor/uno/Acceptor.java delete mode 100644 qadevOOo/tests/java/mod/_bridgefac.uno/BridgeFactory.java delete mode 100644 qadevOOo/tests/java/mod/_bridgefac.uno/package.html create mode 100644 qadevOOo/tests/java/mod/_bridgefac/uno/BridgeFactory.java create mode 100644 qadevOOo/tests/java/mod/_bridgefac/uno/package.html delete mode 100644 qadevOOo/tests/java/mod/_connector.uno/Connector.java delete mode 100644 qadevOOo/tests/java/mod/_connector.uno/package.html create mode 100644 qadevOOo/tests/java/mod/_connector/uno/Connector.java create mode 100644 qadevOOo/tests/java/mod/_connector/uno/package.html delete mode 100644 qadevOOo/tests/java/mod/_corereflection.uno/CoreReflection.java delete mode 100644 qadevOOo/tests/java/mod/_corereflection.uno/package.html create mode 100644 qadevOOo/tests/java/mod/_corereflection/uno/CoreReflection.java create mode 100644 qadevOOo/tests/java/mod/_corereflection/uno/package.html delete mode 100644 qadevOOo/tests/java/mod/_implreg.uno/ImplementationRegistration.java delete mode 100644 qadevOOo/tests/java/mod/_implreg.uno/package.html create mode 100644 qadevOOo/tests/java/mod/_implreg/uno/ImplementationRegistration.java create mode 100644 qadevOOo/tests/java/mod/_implreg/uno/package.html delete mode 100644 qadevOOo/tests/java/mod/_introspection.uno/Introspection.java delete mode 100644 qadevOOo/tests/java/mod/_introspection.uno/package.html create mode 100644 qadevOOo/tests/java/mod/_introspection/uno/Introspection.java create mode 100644 qadevOOo/tests/java/mod/_introspection/uno/package.html delete mode 100644 qadevOOo/tests/java/mod/_invocadapt.uno/InvocationAdapterFactory.java delete mode 100644 qadevOOo/tests/java/mod/_invocadapt.uno/package.html create mode 100644 qadevOOo/tests/java/mod/_invocadapt/uno/InvocationAdapterFactory.java create mode 100644 qadevOOo/tests/java/mod/_invocadapt/uno/package.html delete mode 100644 qadevOOo/tests/java/mod/_invocation.uno/Invocation.java delete mode 100644 qadevOOo/tests/java/mod/_invocation.uno/package.html create mode 100644 qadevOOo/tests/java/mod/_invocation/uno/Invocation.java create mode 100644 qadevOOo/tests/java/mod/_invocation/uno/package.html delete mode 100644 qadevOOo/tests/java/mod/_javaloader.uno/JavaComponentLoader.java create mode 100644 qadevOOo/tests/java/mod/_javaloader/uno/JavaComponentLoader.java delete mode 100644 qadevOOo/tests/java/mod/_javavm.uno/JavaVirtualMachine.java delete mode 100644 qadevOOo/tests/java/mod/_javavm.uno/package.html create mode 100644 qadevOOo/tests/java/mod/_javavm/uno/JavaVirtualMachine.java create mode 100644 qadevOOo/tests/java/mod/_javavm/uno/package.html delete mode 100644 qadevOOo/tests/java/mod/_namingservice.uno/NamingService.java create mode 100644 qadevOOo/tests/java/mod/_namingservice/uno/NamingService.java delete mode 100644 qadevOOo/tests/java/mod/_nestedreg.uno/NestedRegistry.java delete mode 100644 qadevOOo/tests/java/mod/_nestedreg.uno/package.html create mode 100644 qadevOOo/tests/java/mod/_nestedreg/uno/NestedRegistry.java create mode 100644 qadevOOo/tests/java/mod/_nestedreg/uno/package.html delete mode 100644 qadevOOo/tests/java/mod/_proxyfac.uno/ProxyFactory.java create mode 100644 qadevOOo/tests/java/mod/_proxyfac/uno/ProxyFactory.java delete mode 100644 qadevOOo/tests/java/mod/_regtypeprov.uno/RegistryTypeDescriptionProvider.java create mode 100644 qadevOOo/tests/java/mod/_regtypeprov/uno/RegistryTypeDescriptionProvider.java delete mode 100644 qadevOOo/tests/java/mod/_remotebridge.uno/various.java create mode 100644 qadevOOo/tests/java/mod/_remotebridge/uno/various.java delete mode 100644 qadevOOo/tests/java/mod/_servicemgr.uno/OServiceManager.java delete mode 100644 qadevOOo/tests/java/mod/_servicemgr.uno/package.html create mode 100644 qadevOOo/tests/java/mod/_servicemgr/uno/OServiceManager.java create mode 100644 qadevOOo/tests/java/mod/_servicemgr/uno/package.html delete mode 100644 qadevOOo/tests/java/mod/_shlibloader.uno/DLLComponentLoader.java delete mode 100644 qadevOOo/tests/java/mod/_shlibloader.uno/package.html create mode 100644 qadevOOo/tests/java/mod/_shlibloader/uno/DLLComponentLoader.java create mode 100644 qadevOOo/tests/java/mod/_shlibloader/uno/package.html delete mode 100644 qadevOOo/tests/java/mod/_simplereg.uno/SimpleRegistry.java delete mode 100644 qadevOOo/tests/java/mod/_simplereg.uno/package.html create mode 100644 qadevOOo/tests/java/mod/_simplereg/uno/SimpleRegistry.java create mode 100644 qadevOOo/tests/java/mod/_simplereg/uno/package.html delete mode 100644 qadevOOo/tests/java/mod/_streams.uno/DataInputStream.java delete mode 100644 qadevOOo/tests/java/mod/_streams.uno/DataOutputStream.java delete mode 100644 qadevOOo/tests/java/mod/_streams.uno/MarkableInputStream.java delete mode 100644 qadevOOo/tests/java/mod/_streams.uno/MarkableOutputStream.java delete mode 100644 qadevOOo/tests/java/mod/_streams.uno/ObjectInputStream.java delete mode 100644 qadevOOo/tests/java/mod/_streams.uno/ObjectOutputStream.java delete mode 100644 qadevOOo/tests/java/mod/_streams.uno/Pipe.java delete mode 100644 qadevOOo/tests/java/mod/_streams.uno/Pump.java delete mode 100644 qadevOOo/tests/java/mod/_streams.uno/package.html create mode 100644 qadevOOo/tests/java/mod/_streams/uno/DataInputStream.java create mode 100644 qadevOOo/tests/java/mod/_streams/uno/DataOutputStream.java create mode 100644 qadevOOo/tests/java/mod/_streams/uno/MarkableInputStream.java create mode 100644 qadevOOo/tests/java/mod/_streams/uno/MarkableOutputStream.java create mode 100644 qadevOOo/tests/java/mod/_streams/uno/ObjectInputStream.java create mode 100644 qadevOOo/tests/java/mod/_streams/uno/ObjectOutputStream.java create mode 100644 qadevOOo/tests/java/mod/_streams/uno/Pipe.java create mode 100644 qadevOOo/tests/java/mod/_streams/uno/Pump.java create mode 100644 qadevOOo/tests/java/mod/_streams/uno/package.html delete mode 100644 qadevOOo/tests/java/mod/_typeconverter.uno/TypeConverter.java delete mode 100644 qadevOOo/tests/java/mod/_typeconverter.uno/package.html create mode 100644 qadevOOo/tests/java/mod/_typeconverter/uno/TypeConverter.java create mode 100644 qadevOOo/tests/java/mod/_typeconverter/uno/package.html delete mode 100644 qadevOOo/tests/java/mod/_typemgr.uno/TypeDescriptionManager.java delete mode 100644 qadevOOo/tests/java/mod/_typemgr.uno/package.html create mode 100644 qadevOOo/tests/java/mod/_typemgr/uno/TypeDescriptionManager.java create mode 100644 qadevOOo/tests/java/mod/_typemgr/uno/package.html delete mode 100644 qadevOOo/tests/java/mod/_uuresolver.uno/UnoUrlResolver.java delete mode 100644 qadevOOo/tests/java/mod/_uuresolver.uno/package.html create mode 100644 qadevOOo/tests/java/mod/_uuresolver/uno/UnoUrlResolver.java create mode 100644 qadevOOo/tests/java/mod/_uuresolver/uno/package.html (limited to 'qadevOOo') 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 deleted file mode 100644 index decfa8dc07a6..000000000000 --- a/qadevOOo/tests/java/mod/_acceptor.uno/Acceptor.java +++ /dev/null @@ -1,113 +0,0 @@ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * 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 . - */ - -package mod._acceptor.uno; - -import com.sun.star.uno.XInterface; -import com.sun.star.lang.XMultiServiceFactory; -import java.io.PrintWriter; -import lib.StatusException; -import lib.TestCase; -import lib.TestEnvironment; -import lib.TestParameters; -import util.utils; - -/** -* Here com.sun.star.connection.Acceptor service is tested.

-* Test allows to run object tests in several threads concurently. -* @see com.sun.star.connection.Acceptor -* @see com.sun.star.connection.XAcceptor -* @see com.sun.star.connection.XConnector -* @see ifc.connection._XAcceptor -*/ -public class Acceptor extends TestCase { - /** - * Acceptor chooses the first port after basePort - * which is free. - */ - protected static final int basePort = 10000; - private int curPort ; - private static String sOfficeHost = null ; - - /** - * Retrieves host name where StarOffice is started from test - * parameter 'CNCSTR'. - */ - public void initialize( TestParameters tParam, PrintWriter log ) { - String cncstr = (String) tParam.get("CNCSTR") ; - int idx = cncstr.indexOf("host=") + 5 ; - sOfficeHost = cncstr.substring(idx, cncstr.indexOf(",", idx)) ; - } - - /** - * Creating a Testenvironment for the interfaces to be tested.

- * Creates Acceptor service and passed as relation - * connection string where port for accepting is unique among - * different object test threads.

- * The following object relations are created : - *