#100232# added new factory helper

2 files changed, 261 insertions, 6 deletions

diff --git a/javaunohelper/test/com/sun/star/lib/uno/helper/Factory_Test.java b/javaunohelper/test/com/sun/star/lib/uno/helper/Factory_Test.java
new file mode 100644
index 000000000000..0f4383b7f578
--- /dev/null
+++ b/javaunohelper/test/com/sun/star/lib/uno/helper/Factory_Test.java
@@ -0,0 +1,241 @@
+/*************************************************************************
+ *
+ *  $RCSfile: Factory_Test.java,v $
+ *
+ *  $Revision: 1.1 $
+ *
+ *  last change: $Author: dbo $ $Date: 2002-08-13 10:35:50 $
+ *
+ *  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: 2002 by Sun Microsystems, Inc.
+ *
+ *  All Rights Reserved.
+ *
+ *  Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+package com.sun.star.lib.uno.helper;
+
+import com.sun.star.uno.XComponentContext;
+import com.sun.star.uno.Type;
+import com.sun.star.uno.AnyConverter;
+import com.sun.star.lang.XServiceInfo;
+import com.sun.star.lang.XSingleComponentFactory;
+import com.sun.star.lang.XMultiServiceFactory;
+import com.sun.star.lang.XComponent;
+import com.sun.star.beans.XPropertySet;
+import com.sun.star.registry.XRegistryKey;
+import com.sun.star.registry.XSimpleRegistry;
+import com.sun.star.registry.XImplementationRegistration;
+import com.sun.star.container.XSet;
+
+import com.sun.star.lib.uno.helper.Factory;
+import com.sun.star.comp.helper.Bootstrap;
+import com.sun.star.comp.helper.RegistryServiceFactory;
+import com.sun.star.uno.UnoRuntime;
+
+
+//==================================================================================================
+public class Factory_Test
+    extends WeakBase
+    implements XServiceInfo
+{
+    static final String m_impl_name = Factory_Test.class.getName();
+    static final String m_supported_services [] = {
+        "Factory_Test.Service0", "Factory_Test.Service1" };
+
+    //______________________________________________________________________________________________
+    public Factory_Test()
+    {
+    }
+    //______________________________________________________________________________________________
+    public Factory_Test( XComponentContext xContext )
+        throws com.sun.star.uno.Exception
+    {
+        if (null == xContext.getValueByName( "/singletons/com.sun.star.lang.theServiceManager" ))
+        {
+            throw new com.sun.star.uno.RuntimeException(
+                "bad component context given!", this );
+        }
+    }
+    //______________________________________________________________________________________________
+    public static Object __create( XComponentContext xContext )
+        throws com.sun.star.uno.Exception
+    {
+        return new Factory_Test( xContext );
+    }
+
+    // XServiceInfo impl
+    //______________________________________________________________________________________________
+    public final String getImplementationName()
+    {
+        return m_impl_name;
+    }
+    //______________________________________________________________________________________________
+    public final boolean supportsService( String service_name )
+    {
+        for ( int nPos = 0; nPos < m_supported_services.length; ++nPos )
+        {
+            if (m_supported_services[ nPos ].equals( service_name ))
+                return true;
+        }
+        return false;
+    }
+    //______________________________________________________________________________________________
+    public final String [] getSupportedServiceNames()
+    {
+        return m_supported_services;
+    }
+
+    //==============================================================================================
+    public static XSingleComponentFactory __getComponentFactory( String implName )
+    {
+          if (implName.equals( m_impl_name ))
+        {
+            return Factory.createComponentFactory(
+                Factory_Test.class, Factory_Test.m_supported_services );
+        }
+        return null;
+    }
+    //==============================================================================================
+    public static boolean __writeRegistryServiceInfo( XRegistryKey xKey )
+    {
+        return Factory.writeRegistryServiceInfo(
+            m_impl_name, Factory_Test.m_supported_services, xKey );
+    }
+
+    //==============================================================================================
+    static void service_info_test( Object inst )
+    {
+        XServiceInfo xInfo = (XServiceInfo)UnoRuntime.queryInterface( XServiceInfo.class, inst );
+
+        if (! xInfo.getImplementationName().equals( m_impl_name ))
+        {
+            System.err.println( "Factory_Test: err -- 1" );
+            System.exit( 1 );
+        }
+        String supported_services [] = xInfo.getSupportedServiceNames();
+        if (supported_services.length != m_supported_services.length)
+        {
+            System.err.println( "Factory_Test: err -- 2" );
+            System.exit( 1 );
+        }
+        for ( int nPos = 0; nPos < supported_services.length; ++nPos )
+        {
+            if (! supported_services[ nPos ].equals( m_supported_services[ nPos ] ))
+            {
+                System.err.println( "Factory_Test: err -- 3" );
+                System.exit( 1 );
+            }
+            if (! xInfo.supportsService( m_supported_services[ nPos ] ))
+            {
+                System.err.println( "Factory_Test: err -- 4" );
+                System.exit( 1 );
+            }
+        }
+    }
+    //==============================================================================================
+    public static void main( String args [] )
+    {
+        try
+        {
+            String jar = "file://" + new java.io.File( args[ 0 ] ).toURL().getPath();
+            String rdb = "file://" + new java.io.File( args[ 1 ] ).toURL().getPath();
+            System.out.println( "jar file = " + jar );
+            System.out.println( "rdb file = " + rdb );
+
+            // bootstrap service manager
+            XMultiServiceFactory xMgr = RegistryServiceFactory.create( rdb );
+            XPropertySet xProps = (XPropertySet)UnoRuntime.queryInterface(
+                XPropertySet.class, xMgr );
+            XComponentContext xContext = (XComponentContext)AnyConverter.toObject(
+                new Type( XComponentContext.class ), xProps.getPropertyValue( "DefaultContext" ) );
+            // insert java loader
+            XSet xSet = (XSet)AnyConverter.toObject(
+                new Type( XSet.class ), xContext.getServiceManager() );
+            xSet.insert( new com.sun.star.comp.loader.JavaLoaderFactory( xMgr ) );
+            // get rdb of smgr
+            XSimpleRegistry xRDB = (XSimpleRegistry)AnyConverter.toObject(
+                new Type( XSimpleRegistry.class ), xProps.getPropertyValue( "Registry" ) );
+            // register impl
+            XImplementationRegistration xImpReg =
+                (XImplementationRegistration)UnoRuntime.queryInterface(
+                    XImplementationRegistration.class,
+                    xContext.getServiceManager().createInstanceWithContext(
+                        "com.sun.star.registry.ImplementationRegistration", xContext ) );
+            xImpReg.registerImplementation( "com.sun.star.loader.Java2", jar, xRDB );
+
+            // tests
+            System.out.println( "testing instance" );
+            service_info_test( new Factory_Test() );
+            System.out.println( "testing instance" );
+            service_info_test( new Factory_Test( xContext ) );
+            System.out.println( "testing instance" );
+            service_info_test( Factory_Test.__create( xContext ) );
+            System.out.println( "testing factory __getComponentFactory()" );
+            service_info_test( __getComponentFactory( m_impl_name ) );
+            for ( int nPos = 0; nPos < m_supported_services.length; ++nPos )
+            {
+                System.out.println( "testing factory " + m_supported_services[ nPos ] );
+                service_info_test(
+                    // create Service
+                    xContext.getServiceManager().createInstanceWithContext(
+                        m_supported_services[ nPos ], xContext ) );
+            }
+
+            XComponent xComp = (XComponent)UnoRuntime.queryInterface( XComponent.class, xContext );
+            xComp.dispose();
+        }
+        catch (Exception exc)
+        {
+            System.err.println( ">>>>>>>>>> exc occured: " + exc.toString() );
+            exc.printStackTrace();
+        }
+        System.exit( 0 );
+    }
+}
+
diff --git a/javaunohelper/test/com/sun/star/lib/uno/helper/makefile.mk b/javaunohelper/test/com/sun/star/lib/uno/helper/makefile.mk
index f1e714c1396e..34dffa38e464 100644
--- a/javaunohelper/test/com/sun/star/lib/uno/helper/makefile.mk
+++ b/javaunohelper/test/com/sun/star/lib/uno/helper/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.4 $
+#   $Revision: 1.5 $
 #
-#   last change: $Author: jl $ $Date: 2002-08-06 13:55:53 $
+#   last change: $Author: dbo $ $Date: 2002-08-13 10:35:51 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -68,7 +68,8 @@ TARGET  = com_sun_star_lib_uno_helper_test
 # --- Settings -----------------------------------------------------
 
 #.INCLUDE :  settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
+.INCLUDE :  $(PRJ)$/util/makefile.pmk
+
 # --- Files --------------------------------------------------------
 
 JARFILES = sandbox.jar jurt.jar ridl.jar juh.jar
@@ -81,10 +82,23 @@ JAVACLASSFILES=	\
     $(CLASSDIR)$/$(PACKAGE)$/ProxyProvider.class \
     $(CLASSDIR)$/$(PACKAGE)$/AWeakBase.class    \
         $(CLASSDIR)$/$(PACKAGE)$/PropertySet_Test.class \
-    $(CLASSDIR)$/$(PACKAGE)$/UnoUrlTest.class
-
-#JAVAFILES= $(subst,$(CLASSDIR)$/$(PACKAGE)$/, $(subst,.class,.java $(JAVACLASSFILES)))
+    $(CLASSDIR)$/$(PACKAGE)$/UnoUrlTest.class	\
+    $(CLASSDIR)$/$(PACKAGE)$/Factory_Test.class
 
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
+
+CPATH_JARS = java_uno.jar $(JARFILES)
+CPATH_TMP1 = $(foreach,j,$(CPATH_JARS) $(SOLARBINDIR)$/$j)
+CPATH_TMP2 = $(strip $(subst,!,$(PATH_SEPERATOR) $(CPATH_TMP1:s/ /!/)))
+CPATH = $(CPATH_TMP2)$(PATH_SEPERATOR)$(OUT)$/bin$/factory_test.jar$(PATH_SEPERATOR)$(XCLASSPATH)
+
+$(OUT)$/bin$/factory_test.jar : $(CLASSDIR)$/$(PACKAGE)$/Factory_Test.class
+    -rm -f $@
+    @echo RegistrationClassName: com.sun.star.lib.uno.helper.Factory_Test > $(OUT)$/bin$/manifest.mf
+    -jar cvfm $@ $(OUT)$/bin$/manifest.mf -C $(CLASSDIR) $(PACKAGE)$/Factory_Test.class
+
+run_factory_test : $(OUT)$/bin$/factory_test.jar
+    -$(GNUCOPY) $(SOLARBINDIR)$/udkapi.rdb $(OUT)$/bin$/factory_test.rdb
+    -java -classpath $(CPATH) com.sun.star.lib.uno.helper.Factory_Test $(OUT)$/bin$/factory_test.jar $(OUT)$/bin$/factory_test.rdb