diff options
-rw-r--r-- | qadevOOo/qa/unoapi/Test.java | 2 | ||||
-rw-r--r-- | qadevOOo/qa/unoapi/makefile.mk | 2 | ||||
-rw-r--r-- | sfx2/JunitTest_sfx2_unoapi.mk | 2 | ||||
-rw-r--r-- | sfx2/qa/unoapi/Test.java | 2 | ||||
-rw-r--r-- | testtools/source/servicetests/LocalServiceTest.java | 2 | ||||
-rw-r--r-- | testtools/source/servicetests/RemoteServiceTest.java | 2 | ||||
-rw-r--r-- | testtools/source/servicetests/TestBase.java | 2 | ||||
-rw-r--r-- | testtools/source/servicetests/TestService.java | 2 | ||||
-rw-r--r-- | testtools/source/servicetests/TestService1.idl | 4 | ||||
-rw-r--r-- | testtools/source/servicetests/TestService2.idl | 4 | ||||
-rw-r--r-- | testtools/source/servicetests/XTestService1.idl | 4 | ||||
-rw-r--r-- | testtools/source/servicetests/XTestService2.idl | 4 | ||||
-rw-r--r-- | testtools/source/servicetests/XTestService3.idl | 4 | ||||
-rw-r--r-- | testtools/source/servicetests/XTestService4.idl | 4 | ||||
-rw-r--r-- | testtools/source/servicetests/makefile.mk | 2 |
15 files changed, 21 insertions, 21 deletions
diff --git a/qadevOOo/qa/unoapi/Test.java b/qadevOOo/qa/unoapi/Test.java index 1c124fcd5be9..cecd71c797c2 100644 --- a/qadevOOo/qa/unoapi/Test.java +++ b/qadevOOo/qa/unoapi/Test.java @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -package org.openoffice.qadevOOo.qa.unoapi; +package unoapi; import org.openoffice.Runner; import org.openoffice.test.OfficeConnection; diff --git a/qadevOOo/qa/unoapi/makefile.mk b/qadevOOo/qa/unoapi/makefile.mk index 080db7cfee13..1f0ec5e7cca6 100644 --- a/qadevOOo/qa/unoapi/makefile.mk +++ b/qadevOOo/qa/unoapi/makefile.mk @@ -25,7 +25,7 @@ PRJNAME = qadevOOo TARGET = qa_unoapi .IF "$(OOO_JUNIT_JAR)" != "" -PACKAGE = org/openoffice/qadevOOo/qa/unoapi +PACKAGE = unoapi JAVATESTFILES = Test.java JAVAFILES = $(JAVATESTFILES) JARFILES = OOoRunner.jar ridl.jar test.jar diff --git a/sfx2/JunitTest_sfx2_unoapi.mk b/sfx2/JunitTest_sfx2_unoapi.mk index 436ed6e50004..eb0735f59ed0 100644 --- a/sfx2/JunitTest_sfx2_unoapi.mk +++ b/sfx2/JunitTest_sfx2_unoapi.mk @@ -39,7 +39,7 @@ $(eval $(call gb_JunitTest_add_sourcefiles,sfx2_unoapi,\ )) $(eval $(call gb_JunitTest_add_classes,sfx2_unoapi,\ - org.openoffice.sfx2.qa.unoapi.Test \ + unoapi.Test \ )) # vim: set noet sw=4 ts=4: diff --git a/sfx2/qa/unoapi/Test.java b/sfx2/qa/unoapi/Test.java index b61698e95067..4b20ae0750db 100644 --- a/sfx2/qa/unoapi/Test.java +++ b/sfx2/qa/unoapi/Test.java @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -package org.openoffice.sfx2.qa.unoapi; +package unoapi; import org.openoffice.Runner; import org.openoffice.test.OfficeConnection; diff --git a/testtools/source/servicetests/LocalServiceTest.java b/testtools/source/servicetests/LocalServiceTest.java index 3d1ef0e12dce..713b9129b1af 100644 --- a/testtools/source/servicetests/LocalServiceTest.java +++ b/testtools/source/servicetests/LocalServiceTest.java @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -package testtools.servicetests; +package servicetests; import com.sun.star.comp.helper.Bootstrap; import com.sun.star.container.XSet; diff --git a/testtools/source/servicetests/RemoteServiceTest.java b/testtools/source/servicetests/RemoteServiceTest.java index ef01a25c223a..a474e373efb3 100644 --- a/testtools/source/servicetests/RemoteServiceTest.java +++ b/testtools/source/servicetests/RemoteServiceTest.java @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -package testtools.servicetests; +package servicetests; import com.sun.star.bridge.XBridgeFactory; import com.sun.star.bridge.XInstanceProvider; diff --git a/testtools/source/servicetests/TestBase.java b/testtools/source/servicetests/TestBase.java index 567744587d27..f3d2651ac453 100644 --- a/testtools/source/servicetests/TestBase.java +++ b/testtools/source/servicetests/TestBase.java @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -package testtools.servicetests; +package servicetests; import com.sun.star.uno.UnoRuntime; import complexlib.ComplexTestCase; diff --git a/testtools/source/servicetests/TestService.java b/testtools/source/servicetests/TestService.java index d563d7bae12e..6124aaade59e 100644 --- a/testtools/source/servicetests/TestService.java +++ b/testtools/source/servicetests/TestService.java @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -package testtools.servicetests; +package servicetests; import com.sun.star.lang.NoSupportException; import com.sun.star.lang.XServiceInfo; diff --git a/testtools/source/servicetests/TestService1.idl b/testtools/source/servicetests/TestService1.idl index adcf6ebaa469..45e56a6f22a9 100644 --- a/testtools/source/servicetests/TestService1.idl +++ b/testtools/source/servicetests/TestService1.idl @@ -21,7 +21,7 @@ #include <XTestService1.idl> -module testtools { module servicetests { +module servicetests { interface TestService1 { interface XTestService1; @@ -41,6 +41,6 @@ interface TestService1 { [attribute/*, optional*/] long Prop8Long; }; -}; }; +}; #endif diff --git a/testtools/source/servicetests/TestService2.idl b/testtools/source/servicetests/TestService2.idl index 048f633c16b2..43195945bcbf 100644 --- a/testtools/source/servicetests/TestService2.idl +++ b/testtools/source/servicetests/TestService2.idl @@ -24,7 +24,7 @@ #include <XTestService3.idl> #include <XTestService4.idl> -module testtools { module servicetests { +module servicetests { interface TestService2 { interface TestService1; @@ -33,6 +33,6 @@ interface TestService2 { /*[optional] interface XTestService4;*/ }; -}; }; +}; #endif diff --git a/testtools/source/servicetests/XTestService1.idl b/testtools/source/servicetests/XTestService1.idl index 8e949c78ee64..17fd87c0cf71 100644 --- a/testtools/source/servicetests/XTestService1.idl +++ b/testtools/source/servicetests/XTestService1.idl @@ -21,12 +21,12 @@ #include <com/sun/star/uno/XInterface.idl> -module testtools { module servicetests { +module servicetests { interface XTestService1: com::sun::star::uno::XInterface { long fn1(); }; -}; }; +}; #endif diff --git a/testtools/source/servicetests/XTestService2.idl b/testtools/source/servicetests/XTestService2.idl index 69adba443f34..081f0317e05f 100644 --- a/testtools/source/servicetests/XTestService2.idl +++ b/testtools/source/servicetests/XTestService2.idl @@ -21,12 +21,12 @@ #include <com/sun/star/uno/XInterface.idl> -module testtools { module servicetests { +module servicetests { interface XTestService2: com::sun::star::uno::XInterface { long fn2(); }; -}; }; +}; #endif diff --git a/testtools/source/servicetests/XTestService3.idl b/testtools/source/servicetests/XTestService3.idl index d20a66085d82..478454ebef8b 100644 --- a/testtools/source/servicetests/XTestService3.idl +++ b/testtools/source/servicetests/XTestService3.idl @@ -21,12 +21,12 @@ #include <com/sun/star/uno/XInterface.idl> -module testtools { module servicetests { +module servicetests { interface XTestService3: com::sun::star::uno::XInterface { long fn3(); }; -}; }; +}; #endif diff --git a/testtools/source/servicetests/XTestService4.idl b/testtools/source/servicetests/XTestService4.idl index 9b53e982a444..7bae2741195c 100644 --- a/testtools/source/servicetests/XTestService4.idl +++ b/testtools/source/servicetests/XTestService4.idl @@ -21,12 +21,12 @@ #include <com/sun/star/uno/XInterface.idl> -module testtools { module servicetests { +module servicetests { interface XTestService4: com::sun::star::uno::XInterface { long fn4(); }; -}; }; +}; #endif diff --git a/testtools/source/servicetests/makefile.mk b/testtools/source/servicetests/makefile.mk index f1352411ebdb..fd59d8415b32 100644 --- a/testtools/source/servicetests/makefile.mk +++ b/testtools/source/servicetests/makefile.mk @@ -20,7 +20,7 @@ PRJ := ..$/.. PRJNAME := testtools TARGET := testtools_servicetests -PACKAGE := testtools$/servicetests +PACKAGE := servicetests JAVATESTFILES := LocalServiceTest.java RemoteServiceTest.java JAVAFILES := TestBase.java TestService.java IDLTESTFILES := \ |