#87233# modified bootstrapping process; added component context helpers

2 files changed, 137 insertions, 3 deletions

diff --git a/javaunohelper/test/com/sun/star/comp/helper/ComponentContext_Test.java b/javaunohelper/test/com/sun/star/comp/helper/ComponentContext_Test.java
new file mode 100644
index 000000000000..26dd521795f6
--- /dev/null
+++ b/javaunohelper/test/com/sun/star/comp/helper/ComponentContext_Test.java
@@ -0,0 +1,133 @@
+/*************************************************************************
+ *
+ *  $RCSfile: ComponentContext_Test.java,v $
+ *
+ *  $Revision: 1.1 $
+ *
+ *  last change: $Author: dbo $ $Date: 2001-06-14 11:58:23 $
+ *
+ *  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.XComponentContext;
+import com.sun.star.lang.XComponent;
+import com.sun.star.lang.XMultiComponentFactory;
+
+import com.sun.star.comp.helper.ComponentContext;
+import com.sun.star.comp.helper.ComponentContextEntry;
+import com.sun.star.uno.UnoRuntime;
+
+import java.util.Hashtable;
+
+
+public class ComponentContext_Test {
+    public static void main(String args[]) {
+        try {
+            Hashtable table = new Hashtable();
+            table.put( "bla1", new ComponentContextEntry( null, new Integer( 1 ) ) );
+            XComponentContext xInitialContext = Bootstrap.createInitialComponentContext( table );
+
+            table = new Hashtable();
+            table.put( "bla2", new ComponentContextEntry( new Integer( 2 ) ) );
+            table.put( "bla3", new Integer( 3 ) );
+            XComponentContext xContext = new ComponentContext( table, xInitialContext );
+
+            XMultiComponentFactory xSMgr = xContext.getServiceManager();
+            Object o = xSMgr.createInstanceWithContext( "com.sun.star.loader.Java", xContext );
+            if (o == null)
+                System.err.println( "### failed raising service: 1!" );
+            o = xSMgr.createInstanceWithContext( "com.sun.star.bridge.BridgeFactory", xContext );
+            if (o == null)
+                System.err.println( "### failed raising service: 2!" );
+            o = xSMgr.createInstanceWithContext( "com.sun.star.bridge.UnoUrlResolver", xContext );
+            if (o == null)
+                System.err.println( "### failed raising service: 3!" );
+            o = xSMgr.createInstanceWithContext( "com.sun.star.connection.Connector", xContext );
+            if (o == null)
+                System.err.println( "### failed raising service: 4!" );
+            o = xSMgr.createInstanceWithContext( "com.sun.star.connection.Acceptor", xContext );
+            if (o == null)
+                System.err.println( "### failed raising service: 5!" );
+            o = xSMgr.createInstanceWithContext( "com.sun.star.lang.ServiceManager", xContext );
+            if (o == null)
+                System.err.println( "### failed raising service: 6!" );
+
+            if (xContext.getValueByName( "bla1" ) == null ||
+                xContext.getValueByName( "bla2" ) == null ||
+                xContext.getValueByName( "bla3" ) == null ||
+                xInitialContext.getValueByName( "bla2" ) != null ||
+                xInitialContext.getValueByName( "bla3" ) != null)
+            {
+                System.err.println( "### bootstrap context test failed: 1!" );
+            }
+            if (((Integer)xContext.getValueByName( "bla1" )).intValue() != 1 ||
+                ((Integer)xContext.getValueByName( "bla2" )).intValue() != 2 ||
+                ((Integer)xContext.getValueByName( "bla3" )).intValue() != 3 ||
+                ((Integer)xInitialContext.getValueByName( "bla1" )).intValue() != 1)
+            {
+                System.err.println( "### bootstrap context test failed: 2!" );
+            }
+
+            XComponent xComp = (XComponent)UnoRuntime.queryInterface(
+                XComponent.class, xInitialContext );
+            xComp.dispose();
+        }
+        catch(Exception exception) {
+            System.err.println("exception occurred:" + exception);
+            exception.printStackTrace();
+        }
+    }
+}
+
+
diff --git a/javaunohelper/test/com/sun/star/comp/helper/makefile.mk b/javaunohelper/test/com/sun/star/comp/helper/makefile.mk
index 96d2f1dd03ee..4b17b53e5ea7 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.1.1.1 $
+#   $Revision: 1.2 $
 #
-#   last change: $Author: hr $ $Date: 2000-09-18 16:31:32 $
+#   last change: $Author: dbo $ $Date: 2001-06-14 11:58:23 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -71,9 +71,10 @@ TARGET  = com_sun_star_comp_helper_test
 
 # --- Files --------------------------------------------------------
 
-JARFILES = sandbox.jar jurt.jar unoil.jar
+JARFILES = sandbox.jar jurt.jar ridl.jar
 
 JAVACLASSFILES=	\
+    $(CLASSDIR)$/$(PACKAGE)$/ComponentContext_Test.class \
     $(CLASSDIR)$/$(PACKAGE)$/SharedLibraryLoader_Test.class \
     $(CLASSDIR)$/$(PACKAGE)$/RegistryServiceFactory_Test.class