#104367# added Bootstrap.defaultBootstrap_InitialComponentContext() and native code for bootstrapping out of cppuhelper

5 files changed, 448 insertions, 10 deletions

diff --git a/javaunohelper/com/sun/star/comp/helper/Bootstrap.java b/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
index e2beebea14fd..47f4c96f565f 100644
--- a/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
+++ b/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: Bootstrap.java,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: jl $ $Date: 2002-01-22 10:49:27 $
+ *  last change: $Author: dbo $ $Date: 2002-10-21 15:30:32 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -78,6 +78,7 @@ import com.sun.star.loader.XImplementationLoader;
 import com.sun.star.uno.UnoRuntime;
 
 import java.util.Hashtable;
+import java.util.Enumeration;
 
 /** Bootstrap offers functionality to obtain a context or simply
     a service manager.
@@ -190,4 +191,56 @@ public class Bootstrap {
         return (XMultiServiceFactory)UnoRuntime.queryInterface(
             XMultiServiceFactory.class, createInitialComponentContext( null ).getServiceManager() );
     }
+
+
+    /** Bootstraps the initial component context from a native UNO installation.
+
+        @see cppuhelper/defaultBootstrap_InitialComponentContext()
+    */
+    static public final XComponentContext defaultBootstrap_InitialComponentContext()
+        throws Exception
+    {
+        return defaultBootstrap_InitialComponentContext( null, null );
+    }
+    /** Bootstraps the initial component context from a native UNO installation.
+
+        @param ini_file
+               ini_file (may be null: uno.rc besides cppuhelper lib)
+        @param bootstrap_parameters
+               bootstrap parameters (maybe null)
+
+        @see cppuhelper/defaultBootstrap_InitialComponentContext()
+    */
+    static public final XComponentContext defaultBootstrap_InitialComponentContext(
+        String ini_file, Hashtable bootstrap_parameters )
+        throws Exception
+    {
+        // jni convenience: easier to iterate over array than calling Hashtable
+        String pairs [] = null;
+        if (null != bootstrap_parameters)
+        {
+            pairs = new String [ 2 * bootstrap_parameters.size() ];
+            Enumeration enum = bootstrap_parameters.keys();
+            int n = 0;
+            while (enum.hasMoreElements())
+            {
+                String name = (String)enum.nextElement();
+                pairs[ n++ ] = name;
+                pairs[ n++ ] = (String)bootstrap_parameters.get( name );
+            }
+        }
+
+        if (! m_loaded_juh)
+        {
+            System.loadLibrary( "juh" );
+            m_loaded_juh = true;
+        }
+        return (XComponentContext)UnoRuntime.queryInterface(
+            XComponentContext.class, cppuhelper_bootstrap( ini_file, pairs ) );
+    }
+
+    static private boolean m_loaded_juh = false;
+    static private native final Object cppuhelper_bootstrap(
+        String ini_file, String bootstrap_parameters [] )
+        throws Exception;
 }
diff --git a/javaunohelper/source/bootstrap.cxx b/javaunohelper/source/bootstrap.cxx
new file mode 100644
index 000000000000..30fcd27b967c
--- /dev/null
+++ b/javaunohelper/source/bootstrap.cxx
@@ -0,0 +1,229 @@
+/*************************************************************************
+ *
+ *  $RCSfile: bootstrap.cxx,v $
+ *
+ *  $Revision: 1.1 $
+ *
+ *  last change: $Author: dbo $ $Date: 2002-10-21 15:30:33 $
+ *
+ *  The Contents of this file are made available subject to the terms of
+ *  either of the following licenses
+ *
+ *         - GNU Lesser General Public License Version 2.1
+ *         - Sun Industry Standards Source License Version 1.1
+ *
+ *  Sun Microsystems Inc., October, 2000
+ *
+ *  GNU Lesser General Public License Version 2.1
+ *  =============================================
+ *  Copyright 2000 by Sun Microsystems, Inc.
+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License version 2.1, as published by the Free Software Foundation.
+ *
+ *  This library 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 for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *  MA  02111-1307  USA
+ *
+ *
+ *  Sun Industry Standards Source License Version 1.1
+ *  =================================================
+ *  The contents of this file are subject to the Sun Industry Standards
+ *  Source License Version 1.1 (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.openoffice.org/license.html.
+ *
+ *  Software provided under this License is provided on an "AS IS" basis,
+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ *  See the License for the specific provisions governing your rights and
+ *  obligations concerning the Software.
+ *
+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *
+ *  Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *  All Rights Reserved.
+ *
+ *  Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+
+#include <jni.h>
+
+#include <osl/diagnose.h>
+#include <rtl/alloc.h>
+#include <rtl/bootstrap.hxx>
+#include <rtl/string.hxx>
+
+#include <uno/environment.hxx>
+#include <uno/mapping.hxx>
+
+#include <cppuhelper/bootstrap.hxx>
+
+#include <bridges/java/jvmcontext.hxx>
+
+#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) )
+
+
+using namespace ::rtl;
+using namespace ::com::sun::star::uno;
+
+//--------------------------------------------------------------------------------------------------
+inline OUString jstring_to_oustring( jstring jstr, JNIEnv * jni_env )
+{
+    OSL_ASSERT( sizeof (sal_Unicode) == sizeof (jchar) );
+    jsize len = jni_env->GetStringLength( jstr );
+    rtl_uString * ustr =
+        (rtl_uString *)rtl_allocateMemory( sizeof (rtl_uString) + (len * sizeof (sal_Unicode)) );
+    jni_env->GetStringRegion( jstr, 0, len, ustr->buffer );
+    if (JNI_FALSE != jni_env->ExceptionCheck())
+    {
+        jni_env->ExceptionClear();
+        rtl_freeMemory( ustr );
+        throw RuntimeException( OUSTR("string error!"), Reference< XInterface >() );
+    }
+    ustr->refCount = 1;
+    ustr->length = len;
+    ustr->buffer[ len ] = '\0';
+    return OUString( ustr, SAL_NO_ACQUIRE );
+}
+
+//==================================================================================================
+extern "C" JNIEXPORT jobject JNICALL Java_com_sun_star_comp_helper_Bootstrap_cppuhelper_1bootstrap(
+    JNIEnv * jni_env, jclass jClass, jstring juno_rc, jobjectArray jpairs )
+{
+    try
+    {
+        if (0 != jpairs)
+        {
+            jsize nPos = 0, len = jni_env->GetArrayLength( jpairs );
+            while (nPos < len)
+            {
+                // name
+                jstring jstr = (jstring)jni_env->GetObjectArrayElement( jpairs, nPos );
+                if (JNI_FALSE != jni_env->ExceptionCheck())
+                {
+                    jni_env->ExceptionClear();
+                    throw RuntimeException(
+                        OUSTR("index out of bounds?!"), Reference< XInterface >() );
+                }
+                if (0 != jstr)
+                {
+                    OUString name( jstring_to_oustring( jstr, jni_env ) );
+                    // value
+                    jstr = (jstring)jni_env->GetObjectArrayElement( jpairs, nPos +1 );
+                    if (JNI_FALSE != jni_env->ExceptionCheck())
+                    {
+                        jni_env->ExceptionClear();
+                        throw RuntimeException(
+                            OUSTR("index out of bounds?!"), Reference< XInterface >() );
+                    }
+                    if (0 != jstr)
+                    {
+                        OUString value( jstring_to_oustring( jstr, jni_env ) );
+
+                        // set bootstrap parameter
+                        Bootstrap::set( name, value );
+                    }
+                }
+                nPos += 2;
+            }
+        }
+
+        Reference< XComponentContext > xContext;
+
+        // bootstrap uno
+        if (0 == juno_rc)
+        {
+            xContext = ::cppu::defaultBootstrap_InitialComponentContext();
+        }
+        else
+        {
+            OUString uno_rc( jstring_to_oustring( juno_rc, jni_env ) );
+            xContext = ::cppu::defaultBootstrap_InitialComponentContext( uno_rc );
+        }
+
+        // map to java
+        OUString java_env_name = OUSTR(UNO_LB_JAVA);
+        OUString cpp_env_name = OUSTR(CPPU_CURRENT_LANGUAGE_BINDING_NAME);
+        Environment cpp_env, java_env;
+        uno_getEnvironment( (uno_Environment **)&cpp_env, cpp_env_name.pData, 0 );
+        if (! cpp_env.is())
+            throw RuntimeException( OUSTR("cannot get cpp env!"), Reference< XInterface >() );
+
+        JavaVMContext * jvm_context;
+
+        uno_Environment ** java_envs;
+        sal_Int32 nSize;
+        uno_getRegisteredEnvironments(
+            &java_envs, &nSize, (uno_memAlloc)rtl_allocateMemory, java_env_name.pData );
+        if (nSize)
+        {
+            *(uno_Environment **)&java_env = java_envs[ 0 ];
+            jvm_context = (JavaVMContext *)java_env.getContext();
+
+            for( sal_Int32 i = 1; i < nSize; ++ i )
+            {
+                (*java_envs[ i ]->release)( java_envs[ i ] );
+            }
+            rtl_freeMemory( java_envs );
+        }
+        else
+        {
+            JavaVM * vm;
+            jni_env->GetJavaVM( &vm );
+            jvm_context = new JavaVMContext( vm );
+            uno_getEnvironment( (uno_Environment **)&java_env, java_env_name.pData, jvm_context );
+        }
+
+        if (! java_env.is())
+            throw RuntimeException( OUSTR("cannot get java env!"), Reference< XInterface >() );
+
+        jvm_context->registerThread();
+
+        Mapping mapping( cpp_env.get(), java_env.get() );
+        if (! mapping.is())
+            throw RuntimeException( OUSTR("cannot get mapping!"), Reference< XInterface >() );
+
+        jobject jret = (jobject)mapping.mapInterface( xContext.get(), ::getCppuType( &xContext ) );
+        jobject jlocal = jni_env->NewLocalRef( jret );
+        jni_env->DeleteGlobalRef( jret );
+
+        jvm_context->revokeThread();
+        return jlocal;
+    }
+    catch (RuntimeException & exc)
+    {
+        jclass c = jni_env->FindClass( "com/sun/star/uno/RuntimeException" );
+        if (0 != c)
+        {
+            OString cstr( OUStringToOString( exc.Message, RTL_TEXTENCODING_ASCII_US ) );
+            OSL_TRACE( __FILE__": forwarding RuntimeException: %s", cstr.getStr() );
+            jni_env->ThrowNew( c, cstr.getStr() );
+        }
+    }
+    catch (Exception & exc)
+    {
+        jclass c = jni_env->FindClass( "com/sun/star/uno/Exception" );
+        if (0 != c)
+        {
+            OString cstr( OUStringToOString( exc.Message, RTL_TEXTENCODING_ASCII_US ) );
+            OSL_TRACE( __FILE__": forwarding Exception: %s", cstr.getStr() );
+            jni_env->ThrowNew( c, cstr.getStr() );
+        }
+    }
+
+    return 0;
+}
+
diff --git a/javaunohelper/source/makefile.mk b/javaunohelper/source/makefile.mk
index 940ec4c74e86..5ba7b9a279eb 100644
--- a/javaunohelper/source/makefile.mk
+++ b/javaunohelper/source/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.7 $
+#   $Revision: 1.8 $
 #
-#   last change: $Author: jbu $ $Date: 2001-05-15 07:47:44 $
+#   last change: $Author: dbo $ $Date: 2002-10-21 15:30:34 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -90,22 +90,25 @@ INCPRE+=	$(OUT)$/inc
 .ENDIF
 
 UNOTYPES= \
+        com.sun.star.container.XHierarchicalNameAccess	\
         com.sun.star.loader.XImplementationLoader	\
         com.sun.star.registry.XRegistryKey			\
+        com.sun.star.registry.XSimpleRegistry			\
         com.sun.star.lang.IllegalArgumentException	\
         com.sun.star.lang.XTypeProvider				\
         com.sun.star.lang.XServiceInfo				\
         com.sun.star.lang.XMultiServiceFactory		\
         com.sun.star.lang.XSingleServiceFactory		\
-        com.sun.star.lang.XSingleComponentFactory   \
+            com.sun.star.lang.XSingleComponentFactory   \
         com.sun.star.uno.TypeClass					\
         com.sun.star.uno.XWeak						\
         com.sun.star.uno.XAggregation				\
-        com.sun.star.uno.XComponentContext          \
+            com.sun.star.uno.XComponentContext          \
         com.sun.star.lang.XInitialization
 
 SLOFILES= \
-        $(SLO)$/javaunohelper.obj
+        $(SLO)$/javaunohelper.obj		\
+        $(SLO)$/bootstrap.obj
 
 SHL1TARGET=	$(TARGET)
 
diff --git a/javaunohelper/test/com/sun/star/comp/helper/Bootstrap_Test.java b/javaunohelper/test/com/sun/star/comp/helper/Bootstrap_Test.java
new file mode 100644
index 000000000000..2468916f4a6b
--- /dev/null
+++ b/javaunohelper/test/com/sun/star/comp/helper/Bootstrap_Test.java
@@ -0,0 +1,151 @@
+/*************************************************************************
+ *
+ *  $RCSfile: Bootstrap_Test.java,v $
+ *
+ *  $Revision: 1.1 $
+ *
+ *  last change: $Author: dbo $ $Date: 2002-10-21 15:30:35 $
+ *
+ *  The Contents of this file are made available subject to the terms of
+ *  either of the following licenses
+ *
+ *         - GNU Lesser General Public License Version 2.1
+ *         - Sun Industry Standards Source License Version 1.1
+ *
+ *  Sun Microsystems Inc., October, 2000
+ *
+ *  GNU Lesser General Public License Version 2.1
+ *  =============================================
+ *  Copyright 2000 by Sun Microsystems, Inc.
+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License version 2.1, as published by the Free Software Foundation.
+ *
+ *  This library 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 for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *  MA  02111-1307  USA
+ *
+ *
+ *  Sun Industry Standards Source License Version 1.1
+ *  =================================================
+ *  The contents of this file are subject to the Sun Industry Standards
+ *  Source License Version 1.1 (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.openoffice.org/license.html.
+ *
+ *  Software provided under this License is provided on an "AS IS" basis,
+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ *  See the License for the specific provisions governing your rights and
+ *  obligations concerning the Software.
+ *
+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *
+ *  Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *  All Rights Reserved.
+ *
+ *  Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+
+package com.sun.star.comp.helper;
+
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.uno.AnyConverter;
+
+import com.sun.star.uno.XComponentContext;
+import com.sun.star.lang.XComponent;
+import com.sun.star.lang.XMultiServiceFactory;
+
+
+public class Bootstrap_Test {
+
+    static public boolean test( String ini_file, java.util.Hashtable bootstrap_parameters )
+        throws java.lang.Exception
+    {
+        boolean passed = false;
+        System.err.println();
+        System.out.println("*******************************************************************");
+        System.err.println("Bootstrap - doing tests...");
+        System.err.println();
+
+        try {
+            XComponentContext xContext =
+                com.sun.star.comp.helper.Bootstrap.defaultBootstrap_InitialComponentContext(
+                    ini_file, bootstrap_parameters );
+
+            if (AnyConverter.isVoid(
+                    xContext.getValueByName(
+                        "/singletons/com.sun.star.reflection.theTypeDescriptionManager" ) ))
+            {
+                throw new Exception(
+                    "no /singletons/com.sun.star.reflection.theTypeDescriptionManager!" );
+            }
+
+            XMultiServiceFactory msf = (XMultiServiceFactory)UnoRuntime.queryInterface(
+                XMultiServiceFactory.class, xContext.getServiceManager() );
+            String services[] = msf.getAvailableServiceNames();
+            System.out.println("Available services are:");
+            System.err.println();
+            if (services.length == 0)
+                System.out.println("No services avialable!");
+
+            else
+                for ( int i=0; i<services.length; i++ )
+                    System.out.println(services[i]);
+
+            XComponent xComp = (XComponent)UnoRuntime.queryInterface(
+                XComponent.class, xContext );
+            xComp.dispose();
+
+            passed = true;
+        }
+        catch (Exception e) {
+            e.printStackTrace();
+        }
+        System.err.println();
+        System.err.println("Bootstrap test passed? " + passed);
+        System.out.println("*******************************************************************");
+        System.err.println();
+        return passed;
+    }
+
+    private static void usage() {
+        System.out.println();
+        System.out.println("usage:");
+        System.out.println("java com.sun.star.comp.helper.Bootstrap_Test ini-file name=value ...");
+        System.out.println("example:");
+        System.out.println("java com.sun.star.comp.helper.Bootstrap_Test file:///c:/ooo10/program/uno.ini BINDIR=file:///c:/ooo10/program");
+        System.exit( -1 );
+    }
+
+    static public void main(String args[]) throws java.lang.Exception {
+        if ( args.length == 0 )
+            usage();
+
+        java.util.Hashtable bootstrap_parameters = new java.util.Hashtable();
+        for ( int nPos = 1; nPos < args.length; ++nPos )
+        {
+            String arg = args[ nPos ];
+            int n = arg.indexOf( '=' );
+            if (n > 0)
+            {
+                bootstrap_parameters.put( arg.substring( 0, n ), arg.substring( n +1 ) );
+            }
+        }
+
+        System.exit( test(args[0], bootstrap_parameters) == true ? 0: -1 );
+    }
+}
+
diff --git a/javaunohelper/test/com/sun/star/comp/helper/makefile.mk b/javaunohelper/test/com/sun/star/comp/helper/makefile.mk
index 4b17b53e5ea7..b543103422db 100644
--- a/javaunohelper/test/com/sun/star/comp/helper/makefile.mk
+++ b/javaunohelper/test/com/sun/star/comp/helper/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.2 $
+#   $Revision: 1.3 $
 #
-#   last change: $Author: dbo $ $Date: 2001-06-14 11:58:23 $
+#   last change: $Author: dbo $ $Date: 2002-10-21 15:30:36 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -76,10 +76,12 @@ JARFILES = sandbox.jar jurt.jar ridl.jar
 JAVACLASSFILES=	\
     $(CLASSDIR)$/$(PACKAGE)$/ComponentContext_Test.class \
     $(CLASSDIR)$/$(PACKAGE)$/SharedLibraryLoader_Test.class \
-    $(CLASSDIR)$/$(PACKAGE)$/RegistryServiceFactory_Test.class
+    $(CLASSDIR)$/$(PACKAGE)$/RegistryServiceFactory_Test.class \
+    $(CLASSDIR)$/$(PACKAGE)$/Bootstrap_Test.class
 
 JAVAFILES= $(subst,$(CLASSDIR)$/$(PACKAGE)$/, $(subst,.class,.java $(JAVACLASSFILES)))
 
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
+