11 files changed, 48 insertions, 445 deletions
diff --git a/jurt/test/com/sun/star/comp/bridgefactory/makefile.mk b/jurt/test/com/sun/star/comp/bridgefactory/makefile.mk
deleted file mode 100644
index 6de5c582ec83..000000000000
--- a/jurt/test/com/sun/star/comp/bridgefactory/makefile.mk
+++ /dev/null
@@ -1,36 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ := ..$/..$/..$/..$/..$/..
-PRJNAME := jurt
-TARGET := test_com_sun_star_comp_bridgefactory
-
-PACKAGE := com$/sun$/star$/comp$/bridgefactory
-JAVATESTFILES := BridgeFactory_Test.java
-JARFILES := ridl.jar
-
-.INCLUDE: javaunittest.mk
diff --git a/jurt/test/com/sun/star/comp/connections/makefile.mk b/jurt/test/com/sun/star/comp/connections/makefile.mk
deleted file mode 100644
index d311cd0b9c07..000000000000
--- a/jurt/test/com/sun/star/comp/connections/makefile.mk
+++ /dev/null
@@ -1,36 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ := ..$/..$/..$/..$/..$/..
-PRJNAME := jurt
-TARGET := test_com_sun_star_comp_connections
-
-PACKAGE := com$/sun$/star$/comp$/connections
-JAVATESTFILES := PipedConnection_Test.java
-JARFILES := ridl.jar
-
-.INCLUDE: javaunittest.mk
diff --git a/jurt/test/com/sun/star/lib/uno/bridges/java_remote/makefile.mk b/jurt/test/com/sun/star/lib/uno/bridges/java_remote/makefile.mk
deleted file mode 100644
index 49ae7f408837..000000000000
--- a/jurt/test/com/sun/star/lib/uno/bridges/java_remote/makefile.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ := ..$/..$/..$/..$/..$/..$/..$/..
-PRJNAME := jurt
-TARGET := test_com_sun_star_lib_uno_bridges_java_remote
-
-PACKAGE := com$/sun$/star$/lib$/uno$/bridges$/java_remote
-JAVATESTFILES := \
-    BridgedObject_Test.java \
-    ProxyFactory_Test.java \
-    java_remote_bridge_Test.java
-JARFILES := ridl.jar
-
-.INCLUDE: javaunittest.mk
diff --git a/jurt/test/com/sun/star/lib/uno/environments/java/makefile.mk b/jurt/test/com/sun/star/lib/uno/environments/java/makefile.mk
deleted file mode 100644
index ad49dccef88b..000000000000
--- a/jurt/test/com/sun/star/lib/uno/environments/java/makefile.mk
+++ /dev/null
@@ -1,36 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ := ..$/..$/..$/..$/..$/..$/..$/..
-PRJNAME := jurt
-TARGET := test_com_sun_star_lib_uno_environments_java
-
-PACKAGE := com$/sun$/star$/lib$/uno$/environments$/java
-JAVATESTFILES := java_environment_Test.java
-JARFILES := ridl.jar
-
-.INCLUDE: javaunittest.mk
diff --git a/jurt/test/com/sun/star/lib/uno/environments/remote/TestMessage.java b/jurt/test/com/sun/star/lib/uno/environments/remote/TestMessage.java
deleted file mode 100644
index f47048e423ed..000000000000
--- a/jurt/test/com/sun/star/lib/uno/environments/remote/TestMessage.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-package com.sun.star.lib.uno.environments.remote;
-
-
-import com.sun.star.uno.Type;
-
-import com.sun.star.uno.ITypeDescription;
-
-
-class TestMessage implements IMessage {
-    boolean  _synchron;
-    ITypeDescription     _iTypeDescription;
-    String   _oid;
-    ThreadId _threadId;
-    Object   _result;
-    String   _operation;
-    Object   _params[];
-
-    TestMessage(boolean synchron, ITypeDescription iTypeDescription, String oid, ThreadId threadId, Object result, String operation, Object params[]) {
-        _synchron  = synchron;
-        _iTypeDescription      = iTypeDescription;
-        _oid       = oid;
-        _threadId  = threadId;
-        _result    = result;
-        _operation = operation;
-        _params    = params;
-    }
-
-    public String getOperation() {
-        return _operation;
-    }
-
-    public ThreadId getThreadId() {
-        return _threadId;
-    }
-
-    public ITypeDescription getInterface() {
-        return _iTypeDescription;
-    }
-
-    public boolean isSynchron() {
-        return _synchron;
-    }
-
-    public boolean mustReply() {
-        return _synchron;
-    }
-
-    public boolean isException() {
-        return false;
-    }
-
-    public String getOid() {
-        return _oid;
-    }
-
-    public Object getData(Object params[][]) {
-        params[0] = _params;
-        return _result;
-//              return new Integer(_requestId);
-    }
-}
-
-
diff --git a/jurt/test/com/sun/star/lib/uno/environments/remote/makefile.mk b/jurt/test/com/sun/star/lib/uno/environments/remote/makefile.mk
deleted file mode 100644
index e2323a54b497..000000000000
--- a/jurt/test/com/sun/star/lib/uno/environments/remote/makefile.mk
+++ /dev/null
@@ -1,44 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ := ..$/..$/..$/..$/..$/..$/..$/..
-PRJNAME := jurt
-TARGET := test_com_sun_star_lib_uno_environments_remote
-
-PACKAGE := com$/sun$/star$/lib$/uno$/environments$/remote
-JAVATESTFILES := \
-    JavaThreadPoolFactory_Test.java \
-    JobQueue_Test.java \
-    ThreadId_Test.java \
-    ThreadPool_Test.java
-JAVAFILES := \
-    TestIWorkAt.java \
-    TestReceiver.java \
-    TestWorkAt.java
-JARFILES := ridl.jar
-
-.INCLUDE: javaunittest.mk
diff --git a/jurt/test/com/sun/star/lib/uno/protocols/urp/Makefile b/jurt/test/com/sun/star/lib/uno/protocols/urp/Makefile
new file mode 100644
index 000000000000..ffc0cd8c73dd
--- /dev/null
+++ b/jurt/test/com/sun/star/lib/uno/protocols/urp/Makefile
@@ -0,0 +1,48 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+gb_PARTIALBUILD := T
+include $(GBUILDDIR)/gbuild_simple.mk
+
+done : registry.rdb
+	$(call gb_Helper_execute,javamaker -BUCR -O$(dir .) -nD $< -X$(OUTDIR)/bin/types.rdb) && \
+	touch $@
+
+# TODO: would it be possible to reuse UnoApiTarget for this?
+registry.rdb : interfaces.urd
+	rm -f $@ && \
+	$(call gb_Helper_execute,regmerge $@ /UCR $<)
+
+interfaces.urd : $(SRCDIR)/jurt/test/com/sun/star/lib/uno/protocols/urp/interfaces.idl
+	mkdir urd && \
+	$(call gb_Helper_execute,idlc -O$(dir ./urd) -I$(OUTDIR)/idl -cid -we $<)
+
+.DEFAULT_GOAL := all
+.PHONY : all
+all : done
+
+# vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/jurt/test/com/sun/star/lib/uno/protocols/urp/makefile.mk b/jurt/test/com/sun/star/lib/uno/protocols/urp/makefile.mk
deleted file mode 100644
index 8403b2bd71ed..000000000000
--- a/jurt/test/com/sun/star/lib/uno/protocols/urp/makefile.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ := ..$/..$/..$/..$/..$/..$/..$/..
-PRJNAME := jurt
-TARGET := test_com_sun_star_lib_uno_protocols_urp
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE := com$/sun$/star$/lib$/uno$/protocols$/urp
-JAVATESTFILES := \
-    Cache_Test.java \
-    Marshaling_Test.java \
-    Protocol_Test.java
-JAVAFILES := \
-    TestBridge.java \
-    TestObject.java
-JARFILES := ridl.jar
-IDLTESTFILES := interfaces.idl
-.END
-
-.INCLUDE: javaunittest.mk
-
-.END
diff --git a/jurt/test/com/sun/star/lib/util/makefile.mk b/jurt/test/com/sun/star/lib/util/makefile.mk
deleted file mode 100644
index dd411062329f..000000000000
--- a/jurt/test/com/sun/star/lib/util/makefile.mk
+++ /dev/null
@@ -1,36 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ := ..$/..$/..$/..$/..$/..
-PRJNAME := jurt
-TARGET := test_com_sun_star_lib_util
-
-PACKAGE := com$/sun$/star$/lib$/util
-JAVATESTFILES := \
-    NativeLibraryLoader_Test.java
-
-.INCLUDE: javaunittest.mk
diff --git a/jurt/test/com/sun/star/uno/makefile.mk b/jurt/test/com/sun/star/uno/makefile.mk
deleted file mode 100644
index ecf0115c3441..000000000000
--- a/jurt/test/com/sun/star/uno/makefile.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ := ..$/..$/..$/..$/..
-PRJNAME := jurt
-TARGET := test_com_sun_star_uno
-
-PACKAGE := com$/sun$/star$/uno
-JAVATESTFILES := \
-    AnyConverter_Test.java \
-    UnoRuntime_EnvironmentTest.java \
-    WeakReference_Test.java
-JARFILES := ridl.jar
-
-.INCLUDE: javaunittest.mk
diff --git a/jurt/test/makefile.mk b/jurt/test/makefile.mk
deleted file mode 100644
index 146480c6db39..000000000000
--- a/jurt/test/makefile.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-# Quick and dirty way to run all tests in sub-directories; probably only works
-# on Unix.
-# Can be removed once tests are included in regular builds.
-
-all .PHONY:
-    cd com/sun/star/comp/bridgefactory && dmake
-    cd com/sun/star/comp/connections && dmake
-    cd com/sun/star/lib/uno/bridges/java_remote && dmake
-    cd com/sun/star/lib/uno/environments/java && dmake
-    cd com/sun/star/lib/uno/environments/remote && dmake
-    cd com/sun/star/lib/uno/protocols/urp && dmake
-    cd com/sun/star/lib/util && dmake
-    cd com/sun/star/uno && dmake