[Libreoffice-commits] .: reportbuilder/util

[Michael Meeks]

 reportbuilder/util/components.rdb |   14 ++++++++++++++
 reportbuilder/util/makefile.mk    |    6 +++++-
 reportbuilder/util/manifest.xml   |    4 ++--
 3 files changed, 21 insertions(+), 3 deletions(-)

New commits:
commit 8376779842ca51a60c214427513982acb25212ac
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Nov 22 18:02:48 2011 +0000

    Do passive registration of reportbuilder, to avoid java thrash at 1st start

diff --git a/reportbuilder/util/components.rdb b/reportbuilder/util/components.rdb
new file mode 100644
index 0000000..f5665bf
--- /dev/null
+++ b/reportbuilder/util/components.rdb
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<components xmlns="http://openoffice.org/2010/uno-components">
+    <component loader="com.sun.star.loader.Java2" uri="./sun-report-builder.jar">
+        <implementation name="com.sun.star.report.pentaho.SOFormulaParser">
+            <service name="com.sun.star.report.meta.FormulaParser"/>
+        </implementation>
+        <implementation name="com.sun.star.report.pentaho.SOFunctionManager">
+            <service name="com.sun.star.report.meta.FunctionManager"/>
+        </implementation>
+        <implementation name="com.sun.star.report.pentaho.SOReportJobFactory$_SOReportJobFactory">
+            <service name="com.sun.star.report.pentaho.SOReportJobFactory"/>
+        </implementation>
+    </component>
+</components>
diff --git a/reportbuilder/util/makefile.mk b/reportbuilder/util/makefile.mk
index 99752c2..a559957 100644
--- a/reportbuilder/util/makefile.mk
+++ b/reportbuilder/util/makefile.mk
@@ -114,7 +114,7 @@ COMPONENT_MANIFEST_GENERIC:=TRUE
 COMPONENT_MANIFEST_SEARCHDIR:=registry
 
 # make sure to add your custom files here
-EXTENSION_PACKDEPS=$(COMPONENT_EXTJARFILES) $(MISC)/$(TARGET).copied $(COMPONENT_HTMLFILES) $(COMPONENT_OTR_FILES) $(COMPONENT_DESCRIPTION) $(COMPONENT_IMAGES)
+EXTENSION_PACKDEPS=$(COMPONENT_EXTJARFILES) $(MISC)/$(TARGET).copied $(COMPONENT_HTMLFILES) $(COMPONENT_OTR_FILES) $(COMPONENT_DESCRIPTION) $(COMPONENT_IMAGES) $(EXTENSIONDIR)/components.rdb
 .ENDIF
 # --- Targets ----------------------------------
 
@@ -126,6 +126,10 @@ $(EXTENSIONDIR)$/%.jar : $(SOLARBINDIR)$/%.jar
     @@-$(MKDIRHIER) $(@:d)
     $(COPY) $< $@
 
+$(EXTENSIONDIR)/components.rdb : components.rdb
+    @@-$(MKDIRHIER) $(@:d)
+    $(COPY) $< $@
+
 $(EXTENSIONDIR)$/readme_en-US.% : $(PRJ)$/license$/readme_en-US.%
     @@-$(MKDIRHIER) $(@:d)
     $(COPY) $< $@
diff --git a/reportbuilder/util/manifest.xml b/reportbuilder/util/manifest.xml
index 1a5a0f8..cf92064 100644
--- a/reportbuilder/util/manifest.xml
+++ b/reportbuilder/util/manifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE manifest:manifest PUBLIC "-//OpenOffice.org//DTD Manifest 1.0//EN" "Manifest.dtd">
 <manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest">
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.uno-component;type=Java"
-                      manifest:full-path="sun-report-builder.jar"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.uno-components"
+                      manifest:full-path="components.rdb"/>