summaryrefslogtreecommitdiffstats
path: root/reportbuilder
diff options
context:
space:
mode:
authorOcke Janssen [oj] <Ocke.Janssen@sun.com>2009-12-10 08:13:01 +0100
committerOcke Janssen [oj] <Ocke.Janssen@sun.com>2009-12-10 08:13:01 +0100
commit675a3bc1926458f205e8d33b8d44487547cc2597 (patch)
treeffa3a0a7c98bd53df328f5cbbc46b5876e1df5d5 /reportbuilder
parentmasterfix: #i10000# help of presenter added for missing platforms (diff)
parentsrb1: #i99049# use version include (diff)
downloadcore-675a3bc1926458f205e8d33b8d44487547cc2597.tar.gz
core-675a3bc1926458f205e8d33b8d44487547cc2597.zip
Automated merge with file:///net/so-cwsserv01/export/cws/hg_clean/ooo/DEV300
Diffstat (limited to 'reportbuilder')
-rw-r--r--reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk5
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/Manifest.mf8
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryLoader.java16
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/makefile.mk14
-rw-r--r--reportbuilder/java/com/sun/star/report/util/makefile.mk6
-rw-r--r--reportbuilder/util/makefile.mk24
6 files changed, 55 insertions, 18 deletions
diff --git a/reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk b/reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk
index 1025bcea7cb7..90060e44db32 100644
--- a/reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk
+++ b/reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk
@@ -36,12 +36,15 @@ PACKAGE = com$/sun$/star$/report$/function$/metadata
# --- Settings -----------------------------------------------------
.INCLUDE: settings.mk
+.INCLUDE : $(SOLARBINDIR)/jfreereport_version.mk
#----- compile .java files -----------------------------------------
.IF "$(SYSTEM_JFREEREPORT)" == "YES"
CLASSPATH!:==$(CLASSPATH)$(PATH_SEPERATOR)$(LIBBASE_JAR)$(PATH_SEPERATOR)$(LIBFORMULA_JAR)
.ELSE
-JARFILES += libbase-1.0.0.jar libformula-0.2.0.jar
+JARFILES += \
+ libbase-$(LIBBASE_VERSION).jar \
+ libformula-$(LIBFORMULA_VERSION).jar
.ENDIF
JAVAFILES := AuthorFunction.java \
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/Manifest.mf b/reportbuilder/java/com/sun/star/report/pentaho/Manifest.mf
index 70f3ff695cbb..ac543733876b 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/Manifest.mf
+++ b/reportbuilder/java/com/sun/star/report/pentaho/Manifest.mf
@@ -1,7 +1,7 @@
RegistrationClassName: com.sun.star.report.pentaho.SOReportJobFactory
Class-Path: reportbuilderwizard.jar
- flute-1.3.0.jar libserializer-1.0.0.jar libbase-1.0.0.jar
- libfonts-1.0.0.jar libformula-0.2.0.jar liblayout-0.2.9.jar
- libloader-1.0.0.jar librepository-1.0.0.jar libxml-1.0.0.jar
- flow-engine-0.9.2.jar sac.jar commons-logging-1.1.1.jar
+ flute-1.1.2.jar libserializer-1.1.3.jar libbase-1.1.3.jar
+ libfonts-1.1.3.jar libformula-1.1.3.jar liblayout-0.2.10.jar
+ libloader-1.1.3.jar librepository-1.1.3.jar libxml-1.1.3.jar
+ flow-engine-0.9.4.jar sac.jar commons-logging-1.1.1.jar
UNO-Type-Path:
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryLoader.java b/reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryLoader.java
index fc6021202e68..c093e5b9d8ef 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryLoader.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryLoader.java
@@ -35,6 +35,7 @@ import java.util.HashMap;
import com.sun.star.report.InputRepository;
import org.pentaho.reporting.libraries.resourceloader.ResourceData;
+import org.pentaho.reporting.libraries.resourceloader.ResourceException;
import org.pentaho.reporting.libraries.resourceloader.ResourceKey;
import org.pentaho.reporting.libraries.resourceloader.ResourceKeyCreationException;
import org.pentaho.reporting.libraries.resourceloader.ResourceLoader;
@@ -169,4 +170,19 @@ public class InputRepositoryLoader implements ResourceLoader
{
return resourceManager;
}
+
+ public boolean isSupportedDeserializer(String string)
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ public String serialize(ResourceKey rk, ResourceKey rk1) throws ResourceException
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ public ResourceKey deserialize(ResourceKey rk, String string) throws ResourceKeyCreationException
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
}
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/makefile.mk b/reportbuilder/java/com/sun/star/report/pentaho/makefile.mk
index 36e83afac2d0..a26c4fde3ad8 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/makefile.mk
+++ b/reportbuilder/java/com/sun/star/report/pentaho/makefile.mk
@@ -37,13 +37,25 @@ PACKAGE = com$/sun$/star$/report$/pentaho
nodep=true
# --- Settings -----------------------------------------------------
.INCLUDE: settings.mk
+.INCLUDE : $(SOLARBINDIR)/jfreereport_version.mk
#----- compile .java files -----------------------------------------
JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar
.IF "$(SYSTEM_JFREEREPORT)" == "YES"
XCLASSPATH!:=$(XCLASSPATH)$(FLUTE_JAR)$(PATH_SEPERATOR)$(LIBBASE_JAR)$(PATH_SEPERATOR)$(LIBXML_JAR)$(PATH_SEPERATOR)$(JFREEREPORT_JAR)$(PATH_SEPERATOR)$(LIBLOADER_JAR)$(PATH_SEPERATOR)$(SAC_JAR)$(PATH_SEPERATOR)$(LIBLAYOUT_JAR)$(PATH_SEPERATOR)$(LIBSERIALIZER_JAR)$(PATH_SEPERATOR)$(LIBFONTS_JAR)$(PATH_SEPERATOR)$(LIBFORMULA_JAR)$(PATH_SEPERATOR)$(LIBREPOSITORY_JAR)
.ELSE
-JARFILES += flute-1.3.0.jar libbase-1.0.0.jar libfonts-1.0.0.jar libformula-0.2.0.jar liblayout-0.2.9.jar libloader-1.0.0.jar librepository-1.0.0.jar libxml-1.0.0.jar flow-engine-0.9.2.jar sac.jar
+JARFILES += \
+ flute-$(FLUTE_VERSION).jar \
+ libserializer-$(LIBSERIALIZER_VERSION).jar \
+ libbase-$(LIBBASE_VERSION).jar \
+ libfonts-$(LIBFONTS_VERSION).jar \
+ libformula-$(LIBFORMULA_VERSION).jar \
+ liblayout-$(LIBLAYOUT_VERSION).jar \
+ libloader-$(LIBLOADER_VERSION).jar \
+ librepository-$(LIBREPOSITORY_VERSION).jar \
+ libxml-$(LIBXML_VERSION).jar \
+ flow-engine-$(FLOW_ENGINE_VERSION).jar \
+ sac.jar
.ENDIF
.IF "$(SYSTEM_APACHE_COMMONS)" == "YES"
diff --git a/reportbuilder/java/com/sun/star/report/util/makefile.mk b/reportbuilder/java/com/sun/star/report/util/makefile.mk
index 5ef3f02b0a1f..8962f3f69e12 100644
--- a/reportbuilder/java/com/sun/star/report/util/makefile.mk
+++ b/reportbuilder/java/com/sun/star/report/util/makefile.mk
@@ -36,12 +36,16 @@ PACKAGE = com$/sun$/star$/report$/util
# --- Settings -----------------------------------------------------
.INCLUDE: settings.mk
+.INCLUDE : $(SOLARBINDIR)/jfreereport_version.mk
#----- compile .java files -----------------------------------------
.IF "$(SYSTEM_JFREEREPORT)" == "YES"
CLASSPATH!:=$(CLASSPATH)$(PATH_SEPERATOR)$(LIBBASE_JAR)$(PATH_SEPERATOR)$(LIBXML_JAR)$(PATH_SEPERATOR)$(JFREEREPORT_JAR)
.ELSE
-JARFILES = libbase-1.0.0.jar libxml-1.0.0.jar flow-engine-0.9.2.jar
+JARFILES += \
+ libbase-$(LIBBASE_VERSION).jar \
+ libxml-$(LIBXML_VERSION).jar \
+ flow-engine-$(FLOW_ENGINE_VERSION).jar
.ENDIF
JAVAFILES = DefaultJobProperties.java DefaultParameterMap.java DefaultReportJobDefinition.java ManifestWriter.java
diff --git a/reportbuilder/util/makefile.mk b/reportbuilder/util/makefile.mk
index cd65b814abf9..78d6b6993ffb 100644
--- a/reportbuilder/util/makefile.mk
+++ b/reportbuilder/util/makefile.mk
@@ -32,7 +32,7 @@
PRJ=..
PRJNAME=reportbuilder
TARGET=rpt
-EXTENSION_VERSION_BASE=1.2.0
+EXTENSION_VERSION_BASE=1.2.1
.IF "$(CWS_WORK_STAMP)" == ""
EXTENSION_VERSION=$(EXTENSION_VERSION_BASE)
@@ -42,6 +42,8 @@ EXTENSION_VERSION_BASE=1.2.0
# --- Settings ----------------------------------
.INCLUDE : makefile.pmk
+.INCLUDE : $(SOLARBINDIR)/jfreereport_version.mk
+
.IF "$(L10N_framework)"==""
# ------------------------------------------------------------------
# calready set in util$/makefile.pmk
@@ -100,16 +102,16 @@ COMPONENT_EXTJARFILES = \
.IF "$(SYSTEM_JFREEREPORT)" != "YES"
COMPONENT_EXTJARFILES += \
- $(EXTENSIONDIR)$/flute-1.3.0.jar \
- $(EXTENSIONDIR)$/libserializer-1.0.0.jar \
- $(EXTENSIONDIR)$/libbase-1.0.0.jar \
- $(EXTENSIONDIR)$/libfonts-1.0.0.jar \
- $(EXTENSIONDIR)$/libformula-0.2.0.jar \
- $(EXTENSIONDIR)$/liblayout-0.2.9.jar \
- $(EXTENSIONDIR)$/libloader-1.0.0.jar \
- $(EXTENSIONDIR)$/librepository-1.0.0.jar \
- $(EXTENSIONDIR)$/libxml-1.0.0.jar \
- $(EXTENSIONDIR)$/flow-engine-0.9.2.jar \
+ $(EXTENSIONDIR)$/flute-$(FLUTE_VERSION).jar \
+ $(EXTENSIONDIR)$/libserializer-$(LIBSERIALIZER_VERSION).jar \
+ $(EXTENSIONDIR)$/libbase-$(LIBBASE_VERSION).jar \
+ $(EXTENSIONDIR)$/libfonts-$(LIBFONTS_VERSION).jar \
+ $(EXTENSIONDIR)$/libformula-$(LIBFORMULA_VERSION).jar \
+ $(EXTENSIONDIR)$/liblayout-$(LIBLAYOUT_VERSION).jar \
+ $(EXTENSIONDIR)$/libloader-$(LIBLOADER_VERSION).jar \
+ $(EXTENSIONDIR)$/librepository-$(LIBREPOSITORY_VERSION).jar \
+ $(EXTENSIONDIR)$/libxml-$(LIBXML_VERSION).jar \
+ $(EXTENSIONDIR)$/flow-engine-$(FLOW_ENGINE_VERSION).jar \
$(EXTENSIONDIR)$/sac.jar
.ENDIF
.IF "$(SYSTEM_APACHE_COMMONS)" != "YES"
generated by cgit (git 2.34.1) at 2024-06-29 13:33:17 +0000