diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-11-22 18:02:48 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2011-11-22 18:20:19 +0000 |
| commit | 8376779842ca51a60c214427513982acb25212ac (patch) | |
| tree | 7958898a53b5ed7267fc71425fedca8e787f15ca /reportbuilder | |
| parent | eb339bf18c1e76b208d3bfb21120717a97e23d45 (diff) | |
Do passive registration of reportbuilder, to avoid java thrash at 1st start
Diffstat (limited to 'reportbuilder')
| -rw-r--r-- | reportbuilder/util/components.rdb | 14 | ||||
| -rw-r--r-- | reportbuilder/util/makefile.mk | 6 | ||||
| -rw-r--r-- | reportbuilder/util/manifest.xml | 4 |
3 files changed, 21 insertions, 3 deletions
diff --git a/reportbuilder/util/components.rdb b/reportbuilder/util/components.rdb new file mode 100644 index 000000000000..f5665bf83803 --- /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 99752c22d9a8..a559957208cb 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 1a5a0f84623b..cf92064bd463 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"/> |