diff options
Diffstat (limited to 'bridges/test/java_uno/nativethreadpool')
8 files changed, 0 insertions, 596 deletions
diff --git a/bridges/test/java_uno/nativethreadpool/Relay.java b/bridges/test/java_uno/nativethreadpool/Relay.java deleted file mode 100644 index 7b523f3210ab..000000000000 --- a/bridges/test/java_uno/nativethreadpool/Relay.java +++ /dev/null @@ -1,116 +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 test.java_uno.nativethreadpool; - -import com.sun.star.bridge.BridgeExistsException; -import com.sun.star.bridge.XBridgeFactory; -import com.sun.star.bridge.XInstanceProvider; -import com.sun.star.comp.helper.Bootstrap; -import com.sun.star.comp.loader.FactoryHelper; -import com.sun.star.connection.AlreadyAcceptingException; -import com.sun.star.connection.ConnectionSetupException; -import com.sun.star.connection.Acceptor; -import com.sun.star.connection.XAcceptor; -import com.sun.star.lang.WrappedTargetRuntimeException; -import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.lang.XSingleServiceFactory; -import com.sun.star.registry.XRegistryKey; -import com.sun.star.uno.UnoRuntime; -import com.sun.star.uno.XComponentContext; - -public final class Relay implements XRelay, XSource { - public void start(XSource source) { - this.source = source; - XComponentContext context; - try { - context = Bootstrap.createInitialComponentContext(null); - } catch (RuntimeException e) { - throw e; - } catch (com.sun.star.uno.Exception e) { - throw new WrappedTargetRuntimeException(e, e.getMessage(), this, e); - } catch (Exception e) { - throw new com.sun.star.uno.RuntimeException(e, "", this); - } - final XAcceptor acceptor = Acceptor.create(context); - final XBridgeFactory factory; - try { - factory = UnoRuntime.queryInterface( - XBridgeFactory.class, - context.getServiceManager().createInstanceWithContext( - "com.sun.star.bridge.BridgeFactory", context)); - } catch (com.sun.star.uno.Exception e) { - throw new WrappedTargetRuntimeException(e, e.getMessage(), this, e); - } - new Thread() { - @Override - public void run() { - try { - // Use "127.0.0.1" instead of "localhost", see #i32281#: - factory.createBridge( - "", "urp", - acceptor.accept("socket,host=127.0.0.1,port=3831"), - new XInstanceProvider() { - public Object getInstance(String instanceName) { - return Relay.this; - } - }); - } catch (AlreadyAcceptingException e) { - e.printStackTrace(System.err); - } catch (ConnectionSetupException e) { - e.printStackTrace(System.err); - } catch (BridgeExistsException e) { - e.printStackTrace(System.err); - } catch (com.sun.star.lang.IllegalArgumentException e) { - e.printStackTrace(System.err); - } - } - }.start(); - try { - Thread.sleep(3000); // wait for new thread to accept connection - } catch (InterruptedException e) { - Thread.currentThread().interrupt(); - throw new com.sun.star.uno.RuntimeException(e, "", this); - } - } - - public int get() { - return source.get(); - } - - public static XSingleServiceFactory __getServiceFactory( - String implName, XMultiServiceFactory multiFactory, XRegistryKey regKey) - { - return implName.equals(implementationName) - ? FactoryHelper.getServiceFactory( - Relay.class, serviceName, multiFactory, regKey) - : null; - } - - public static boolean __writeRegistryServiceInfo(XRegistryKey regKey) { - return FactoryHelper.writeRegistryServiceInfo( - implementationName, serviceName, regKey); - } - - private static final String implementationName - = "test.javauno.nativethreadpool.comp.Relay"; - private static final String serviceName - = "test.javauno.nativethreadpool.Relay"; - - private XSource source; -} diff --git a/bridges/test/java_uno/nativethreadpool/makefile.mk b/bridges/test/java_uno/nativethreadpool/makefile.mk deleted file mode 100644 index 504bcb1ac2cc..000000000000 --- a/bridges/test/java_uno/nativethreadpool/makefile.mk +++ /dev/null @@ -1,112 +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 . -# - -PRJ := ..$/..$/.. -PRJNAME := bridges - -TARGET := test_javauno_nativethreadpool -PACKAGE := test$/java_uno$/nativethreadpool - -ENABLE_EXCEPTIONS := TRUE - -#TODO: -.IF "$(OS)" == "LINUX" -JVM_LIB_URL := file:///net/grande.germany/develop6/update/dev/Linux_JDK_1.4.1_03/jre/lib/i386/client/libjvm.so -.ELSE -ERROR -- missing platform -.ENDIF - -.INCLUDE: settings.mk - -DLLPRE = # no leading "lib" on .so files -INCPRE += $(MISC)$/$(TARGET)$/inc - -SHL1TARGET = $(ENFORCEDSHLPREFIX)$(TARGET)_client.uno -SHL1OBJS = $(SLO)$/testnativethreadpoolclient.obj -SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB) -SHL1VERSIONMAP = version.map -SHL1IMPLIB = i$(TARGET)_client - -SHL2TARGET = $(ENFORCEDSHLPREFIX)$(TARGET)_server.uno -SHL2OBJS = $(SLO)$/testnativethreadpoolserver.obj -SHL2STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB) -SHL2VERSIONMAP = version.map -SHL2IMPLIB = i$(TARGET)_server - -SLOFILES = $(SHL1OBJS) $(SHL2OBJS) - -JAVAFILES = Relay.java -JARFILES = java_uno.jar juh.jar jurt.jar ridl.jar - -.INCLUDE: target.mk - -ALLTAR: test - -EXEC_CLASSPATH_TMP = $(foreach,i,$(JARFILES) $(SOLARBINDIR)$/$i) -EXEC_CLASSPATH = \ - $(strip $(subst,!,$(LIBO_PATH_SEPARATOR) $(EXEC_CLASSPATH_TMP:s/ /!/))) - -$(MISC)$/$(TARGET)$/types.rdb: types.idl - - rm $@ - - $(MKDIR) $(MISC)$/$(TARGET) - - $(MKDIR) $(MISC)$/$(TARGET)$/inc - $(IDLC) -I$(SOLARIDLDIR) -O$(MISC)$/$(TARGET) $< - $(REGMERGE) $@ /UCR $(MISC)$/$(TARGET)$/types.urd - $(CPPUMAKER) -BUCR -C -O$(MISC)$/$(TARGET)$/inc $@ -X$(SOLARBINDIR)$/types.rdb - $(JAVAMAKER) -BUCR -nD -O$(CLASSDIR) $@ -X$(SOLARBINDIR)$/types.rdb - -$(SLOFILES) $(JAVACLASSFILES): $(MISC)$/$(TARGET)$/types.rdb - -$(BIN)$/$(TARGET).uno.jar: $(JAVACLASSFILES) relay.manifest - jar cfm $@ relay.manifest -C $(CLASSDIR) test/javauno/nativethreadpool - -$(BIN)$/$(TARGET).rdb .ERRREMOVE: $(MISC)$/$(TARGET)$/types.rdb \ - $(BIN)$/$(TARGET).uno.jar - cp $(MISC)$/$(TARGET)$/types.rdb $@ - $(REGMERGE) $@ / $(SOLARBINDIR)$/types.rdb - $(REGCOMP) -register -r $@ -c acceptor.uno$(DLLPOST) \ - -c bridgefac.uno$(DLLPOST) -c connector.uno$(DLLPOST) \ - -c remotebridge.uno$(DLLPOST) -c uuresolver.uno$(DLLPOST) \ - -c javaloader.uno$(DLLPOST) -c javavm.uno$(DLLPOST) \ - -c stocservices.uno$(DLLPOST) - cp $(SOLARBINDIR)$/types.rdb $(MISC)$/$(TARGET)$/bootstrap.rdb - $(REGCOMP) -register -r $(MISC)$/$(TARGET)$/bootstrap.rdb \ - -c javaloader.uno$(DLLPOST) -c javavm.uno$(DLLPOST) \ - -c stocservices.uno$(DLLPOST) -.IF "$(OS)" == "WNT" - ERROR -- missing platform -.ELSE # GUI, WNT - + export OO_JAVA_PROPERTIES='RuntimeLib=$(JVM_LIB_URL)' && \ - $(REGCOMP) -register -r $@ -c file://$(PWD)/$(BIN)$/$(TARGET).uno.jar \ - -br $(MISC)$/$(TARGET)$/bootstrap.rdb -classpath $(EXEC_CLASSPATH) \ - -env:URE_INTERNAL_JAVA_DIR=file://$(SOLARBINDIR) -.ENDIF # GUI, WNT - -test .PHONY: $(SHL1TARGETN) $(BIN)$/$(TARGET).uno.jar $(BIN)$/$(TARGET).rdb -.IF "$(OS)" == "WNT" - ERROR -- missing platform -.ELSE # GUI, WNT - $(AUGMENT_LIBRARY_PATH) uno -c test.javauno.nativethreadpool.server \ - -l $(SHL2TARGETN) -ro $(BIN)$/$(TARGET).rdb \ - -u 'uno:socket,host=localhost,port=3830;urp;test' --singleaccept & - + $(AUGMENT_LIBRARY_PATH) OO_JAVA_PROPERTIES='RuntimeLib=$(JVM_LIB_URL)' \ - CLASSPATH=$(EXEC_CLASSPATH)$(LIBO_PATH_SEPARATOR)$(BIN)$/$(TARGET).uno.jar \ - uno -c test.javauno.nativethreadpool.client -l $(SHL1TARGETN) \ - -ro $(BIN)$/$(TARGET).rdb \ - -env:URE_INTERNAL_JAVA_DIR=file://$(SOLARBINDIR) -.ENDIF # GUI, WNT diff --git a/bridges/test/java_uno/nativethreadpool/readme b/bridges/test/java_uno/nativethreadpool/readme deleted file mode 100644 index f0be4e87fe83..000000000000 --- a/bridges/test/java_uno/nativethreadpool/readme +++ /dev/null @@ -1,30 +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 . -# - -Test that a Java URP bridge started in a native process uses the same thread -pool as a C++ URP bridge. This test currently only works on Linux Intel. - -There are two processes involved. The client starts as a native process. It -first loads a Java component (Relay) via the in-process JNI bridge, which in -turn starts to accept incoming URP connections. The native part of the client -then connects to the server, retrieves a thread-local token from it, and checks -the token for correctness. The server simply waits for a connection from the -native part of the client, creates a connection to the Java part of the client, -and routes all requests from the native part of the client to the Java part of -the client. The Java part of the client in turn uses the in-process JNI bridge -to obtain the thread-local token. diff --git a/bridges/test/java_uno/nativethreadpool/relay.manifest b/bridges/test/java_uno/nativethreadpool/relay.manifest deleted file mode 100644 index 6cd1d9dbd611..000000000000 --- a/bridges/test/java_uno/nativethreadpool/relay.manifest +++ /dev/null @@ -1,2 +0,0 @@ -Manifest-Version: 1.0 -RegistrationClassName: test.javauno.nativethreadpool.Relay diff --git a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx deleted file mode 100644 index 32835e024078..000000000000 --- a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx +++ /dev/null @@ -1,157 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * 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 . - */ - - -#include "test/javauno/nativethreadpool/XRelay.hpp" -#include "test/javauno/nativethreadpool/XSource.hpp" - -#include "com/sun/star/bridge/UnoUrlResolver.hpp" -#include "com/sun/star/bridge/XUnoUrlResolver.hpp" -#include "com/sun/star/connection/ConnectionSetupException.hpp" -#include "com/sun/star/connection/NoConnectException.hpp" -#include "com/sun/star/lang/IllegalArgumentException.hpp" -#include "com/sun/star/lang/WrappedTargetRuntimeException.hpp" -#include "com/sun/star/lang/XMain.hpp" -#include "com/sun/star/lang/XMultiComponentFactory.hpp" -#include "com/sun/star/uno/Exception.hpp" -#include "com/sun/star/uno/Reference.hxx" -#include "com/sun/star/uno/RuntimeException.hpp" -#include "com/sun/star/uno/Sequence.hxx" -#include "com/sun/star/uno/XComponentContext.hpp" -#include "com/sun/star/uno/XInterface.hpp" -#include "cppuhelper/factory.hxx" -#include "cppuhelper/implbase.hxx" -#include "cppuhelper/implementationentry.hxx" -#include "cppuhelper/weak.hxx" -#include "osl/thread.hxx" -#include "rtl/ustring.hxx" -#include "sal/types.h" - -#include <iostream> - -namespace { - -class Client: public cppu::WeakImplHelper< - css::lang::XMain, test::javauno::nativethreadpool::XSource > -{ -public: - explicit Client( - css::uno::Reference< css::uno::XComponentContext > const & theContext): - context(theContext) {} - -private: - virtual ~Client() {} - - virtual sal_Int32 SAL_CALL run(css::uno::Sequence< OUString > const &) - throw (css::uno::RuntimeException); - - virtual sal_Int32 SAL_CALL get() throw (css::uno::RuntimeException); - - css::uno::Reference< css::uno::XComponentContext > context; - osl::ThreadData data; -}; - -sal_Int32 Client::run(css::uno::Sequence< OUString > const &) - throw (css::uno::RuntimeException) -{ - css::uno::Reference< css::lang::XMultiComponentFactory > factory( - context->getServiceManager()); - if (!factory.is()) { - throw css::uno::RuntimeException( - OUString( "no component context service manager" ), - static_cast< cppu::OWeakObject * >(this)); - } - css::uno::Reference< test::javauno::nativethreadpool::XRelay > relay; - try { - relay.set( - factory->createInstanceWithContext( - "test.javauno.nativethreadpool.Relay", - context), - css::uno::UNO_QUERY_THROW); - } catch (css::uno::RuntimeException &) { - throw; - } catch (css::uno::Exception & e) { - throw css::lang::WrappedTargetRuntimeException( - OUString( "creating test.javauno.nativethreadpool.Relay service" ), - static_cast< cppu::OWeakObject * >(this), css::uno::makeAny(e)); - } - relay->start(this); - if (!data.setData(reinterpret_cast< void * >(12345))) { - throw css::uno::RuntimeException( - OUString( "osl::ThreadData::setData failed" ), - static_cast< cppu::OWeakObject * >(this)); - } - css::uno::Reference< test::javauno::nativethreadpool::XSource > source; - try { - source.set( - css::bridge::UnoUrlResolver::create(context)->resolve( - OUString( "uno:socket,host=localhost,port=3830;urp;test" )), - css::uno::UNO_QUERY_THROW); - } catch (css::connection::NoConnectException & e) { - throw css::lang::WrappedTargetRuntimeException( - OUString( "com.sun.star.uno.UnoUrlResolver.resolve" ), - static_cast< cppu::OWeakObject * >(this), css::uno::makeAny(e)); - } catch (css::connection::ConnectionSetupException & e) { - throw css::lang::WrappedTargetRuntimeException( - OUString( "com.sun.star.uno.UnoUrlResolver.resolve" ), - static_cast< cppu::OWeakObject * >(this), css::uno::makeAny(e)); - } catch (css::lang::IllegalArgumentException & e) { - throw css::lang::WrappedTargetRuntimeException( - OUString( "com.sun.star.uno.UnoUrlResolver.resolve" ), - static_cast< cppu::OWeakObject * >(this), css::uno::makeAny(e)); - } - bool success = source->get() == 12345; - std::cout << "success? " << (success ? "yes" : "no") << '\n'; - return success ? 0 : 1; -} - -sal_Int32 Client::get() throw (css::uno::RuntimeException) { - return reinterpret_cast< sal_Int32 >(data.getData()); -} - -css::uno::Reference< css::uno::XInterface > SAL_CALL create( - css::uno::Reference< css::uno::XComponentContext > const & context) -{ - return static_cast< cppu::OWeakObject * >(new Client(context)); -} - -OUString SAL_CALL getImplementationName() { - return OUString( "test.javauno.nativethreadpool.client" ); -} - -css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() { - return css::uno::Sequence< OUString >(); -} - -cppu::ImplementationEntry entries[] = { - { &create, &getImplementationName, &getSupportedServiceNames, - &cppu::createSingleComponentFactory, 0, 0 }, - { 0, 0, 0, 0, 0, 0 } -}; - -} - -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( - char const * implName, void * serviceManager, void * registryKey) -{ - return cppu::component_getFactoryHelper( - implName, serviceManager, registryKey, entries); -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx deleted file mode 100644 index 3ac084fb794e..000000000000 --- a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx +++ /dev/null @@ -1,121 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * 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 . - */ - - -#include "test/javauno/nativethreadpool/XSource.hpp" - -#include "com/sun/star/bridge/UnoUrlResolver.hpp" -#include "com/sun/star/bridge/XUnoUrlResolver.hpp" -#include "com/sun/star/connection/ConnectionSetupException.hpp" -#include "com/sun/star/connection/NoConnectException.hpp" -#include "com/sun/star/lang/IllegalArgumentException.hpp" -#include "com/sun/star/lang/WrappedTargetRuntimeException.hpp" -#include "com/sun/star/lang/XMultiComponentFactory.hpp" -#include "com/sun/star/uno/Exception.hpp" -#include "com/sun/star/uno/Reference.hxx" -#include "com/sun/star/uno/RuntimeException.hpp" -#include "com/sun/star/uno/Sequence.hxx" -#include "com/sun/star/uno/XComponentContext.hpp" -#include "com/sun/star/uno/XInterface.hpp" -#include "cppuhelper/factory.hxx" -#include "cppuhelper/implbase.hxx" -#include "cppuhelper/implementationentry.hxx" -#include "cppuhelper/weak.hxx" -#include "rtl/ustring.hxx" -#include "sal/types.h" - -namespace { - -class Server: - public cppu::WeakImplHelper< test::javauno::nativethreadpool::XSource > -{ -public: - explicit Server( - css::uno::Reference< css::uno::XComponentContext > const & theContext): - context(theContext) {} - -private: - virtual ~Server() {} - - virtual sal_Int32 SAL_CALL get() throw (css::uno::RuntimeException); - - css::uno::Reference< css::uno::XComponentContext > context; -}; - -sal_Int32 Server::get() throw (css::uno::RuntimeException) { - css::uno::Reference< css::lang::XMultiComponentFactory > factory( - context->getServiceManager()); - if (!factory.is()) { - throw css::uno::RuntimeException( - OUString( "no component context service manager" ), - static_cast< cppu::OWeakObject * >(this)); - } - css::uno::Reference< test::javauno::nativethreadpool::XSource > source; - try { - // Use "127.0.0.1" instead of "localhost", see #i32281#: - source.set( - css::bridge::UnoUrlResolver::create(context)->resolve( - OUString( "uno:socket,host=127.0.0.1,port=3831;urp;test" )), - css::uno::UNO_QUERY_THROW); - } catch (css::connection::NoConnectException & e) { - throw css::lang::WrappedTargetRuntimeException( - OUString( "com.sun.star.uno.UnoUrlResolver.resolve" ), - static_cast< cppu::OWeakObject * >(this), css::uno::makeAny(e)); - } catch (css::connection::ConnectionSetupException & e) { - throw css::lang::WrappedTargetRuntimeException( - OUString( "com.sun.star.uno.UnoUrlResolver.resolve" ), - static_cast< cppu::OWeakObject * >(this), css::uno::makeAny(e)); - } catch (css::lang::IllegalArgumentException & e) { - throw css::lang::WrappedTargetRuntimeException( - OUString( "com.sun.star.uno.UnoUrlResolver.resolve" ), - static_cast< cppu::OWeakObject * >(this), css::uno::makeAny(e)); - } - return source->get(); -} - -css::uno::Reference< css::uno::XInterface > SAL_CALL create( - css::uno::Reference< css::uno::XComponentContext > const & context) -{ - return static_cast< cppu::OWeakObject * >(new Server(context)); -} - -OUString SAL_CALL getImplementationName() { - return OUString( "test.javauno.nativethreadpool.server" ); -} - -css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() { - return css::uno::Sequence< OUString >(); -} - -cppu::ImplementationEntry entries[] = { - { &create, &getImplementationName, &getSupportedServiceNames, - &cppu::createSingleComponentFactory, 0, 0 }, - { 0, 0, 0, 0, 0, 0 } -}; - -} - -extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( - char const * implName, void * serviceManager, void * registryKey) -{ - return cppu::component_getFactoryHelper( - implName, serviceManager, registryKey, entries); -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/bridges/test/java_uno/nativethreadpool/types.idl b/bridges/test/java_uno/nativethreadpool/types.idl deleted file mode 100644 index de8256310cd4..000000000000 --- a/bridges/test/java_uno/nativethreadpool/types.idl +++ /dev/null @@ -1,34 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * 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 . - */ - -#include <com/sun/star/uno/XInterface.idl> - -module test { module java_uno { module nativethreadpool { - -interface XSource: com::sun::star::uno::XInterface { - long get(); -}; - -interface XRelay: com::sun::star::uno::XInterface { - void start([in] XSource source); -}; - -}; }; }; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/bridges/test/java_uno/nativethreadpool/version.map b/bridges/test/java_uno/nativethreadpool/version.map deleted file mode 100644 index 35b0683eba6d..000000000000 --- a/bridges/test/java_uno/nativethreadpool/version.map +++ /dev/null @@ -1,24 +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 . -# - -UDK_3_0_0 { - global: - component_getFactory; - local: - *; -}; |