sb129: #i113189# change UNO components to use passive registration

3 files changed, 44 insertions, 18 deletions

diff --git a/wizards/com/sun/star/wizards/letter/CallWizard.java b/wizards/com/sun/star/wizards/letter/CallWizard.java
index f3508512807d..ff993c61e506 100644
--- a/wizards/com/sun/star/wizards/letter/CallWizard.java
+++ b/wizards/com/sun/star/wizards/letter/CallWizard.java
@@ -41,8 +41,7 @@ import com.sun.star.uno.Type;
 
 /**
  * This class capsulates the class, that implements the minimal component, a factory for
- * creating the service (<CODE>__getServiceFactory</CODE>) and a method, that writes the
- * information into the given registry key (<CODE>__writeRegistryServiceInfo</CODE>).
+ * creating the service (<CODE>__getServiceFactory</CODE>).
  *
  * @author $author$
  * @version $Revision: 1.3.192.1 $
@@ -78,22 +77,6 @@ public class CallWizard
     }
 
     /**
-     * Writes the service information into the given registry key. This method is called
-     * by the <code>JavaLoader</code>.
-     *
-     * @param xregistrykey Makes structural information (except regarding tree
-     *        structures) of a single registry key accessible.
-     *
-     * @return returns true if the operation succeeded
-     *
-     * @see com.sun.star.comp.loader.JavaLoader#
-     */
-    public static boolean __writeRegistryServiceInfo(XRegistryKey xregistrykey)
-    {
-        return FactoryHelper.writeRegistryServiceInfo(WizardImplementation.class.getName(), WizardImplementation.__serviceName, xregistrykey);
-    }
-
-    /**
      * This class implements the component. At least the interfaces XServiceInfo,
      * XTypeProvider, and XInitialization should be provided by the service.
      */
diff --git a/wizards/com/sun/star/wizards/letter/letter.component b/wizards/com/sun/star/wizards/letter/letter.component
new file mode 100644
index 000000000000..277aae81e90a
--- /dev/null
+++ b/wizards/com/sun/star/wizards/letter/letter.component
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.Java2"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation
+      name="com.sun.star.wizards.letter.CallWizard$WizardImplementation">
+    <service name="com.sun.star.wizards.letter.CallWizard"/>
+  </implementation>
+</component>
diff --git a/wizards/com/sun/star/wizards/letter/makefile.mk b/wizards/com/sun/star/wizards/letter/makefile.mk
index 700d0b72dfb7..ca6c750bac81 100644
--- a/wizards/com/sun/star/wizards/letter/makefile.mk
+++ b/wizards/com/sun/star/wizards/letter/makefile.mk
@@ -63,3 +63,11 @@ JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
+
+ALLTAR : $(MISC)/letter.component
+
+$(MISC)/letter.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        letter.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_JAVA)$(JARTARGET)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt letter.component