CWS-TOOLING: integrate CWS rptfix04

2009-02-23 01:59:54 +0100 rene  r268341 : #i10000# fix system-jfreereport build
2009-02-13 10:17:16 +0100 oj  r267696 : #i98549# integrate zip form pentaho package
2009-02-03 14:48:34 +0100 oj  r267330 : set formula locale to doc locale
2009-02-03 14:45:54 +0100 oj  r267329 : set formula locale to doc locale
2009-02-03 11:50:03 +0100 oj  r267311 : set formula locale to doc locale
2009-02-03 08:55:02 +0100 oj  r267297 : unix line ends
2009-01-28 11:21:24 +0100 rene  r267043 : #i98549# s/DESIGN/BUILDER/ also for Sun
2009-01-27 17:17:50 +0100 rene  r267012 : merge builfix from trunk
2009-01-27 14:16:30 +0100 rene  r266991 : #i10000# fix rebase which left out the whole changes in former config_office; sync variable names (s/LIB_//) and some other things
2009-01-27 10:01:09 +0100 oj  r266959 : CWS-TOOLING: rebase CWS rptfix04 to trunk@266944 (milestone: DEV300:m40)
2009-01-27 08:00:16 +0100 oj  r266951 : conflict in mergeinfo
2009-01-26 12:23:03 +0100 oj  r266914 : #i98383# fix grouping
2009-01-23 22:03:03 +0100 rene  r266852 : fix --enable-report-builder description
2009-01-23 10:37:27 +0100 oj  r266778 : set escape processing when set at query
2009-01-23 09:17:16 +0100 fs  r266770 : add CWS name to version
2009-01-21 13:57:35 +0100 oj  r266669 : merge for build bots
2009-01-20 09:07:24 +0100 oj  r266552 : CWS-TOOLING: rebase CWS rptfix04 to trunk@266428 (milestone: DEV300:m39)
2009-01-20 08:34:16 +0100 oj  r266551 : rebase
2009-01-20 08:33:59 +0100 oj  r266550 : rebase
2009-01-20 08:32:50 +0100 oj  r266549 : rebase
2009-01-20 08:30:13 +0100 oj  r266548 : rebase
2009-01-20 08:29:30 +0100 oj  r266547 : rebase
2009-01-20 08:22:33 +0100 oj  r266546 : merge short cuts from dba31g
2009-01-19 21:04:08 +0100 rene  r266525 : #i10000# we need officecfg for component-update.dtd
2009-01-19 21:01:26 +0100 rene  r266524 : #i10000# fix import
2009-01-19 20:26:20 +0100 rene  r266523 : #i10000# remove svn conflicts markers; fix build
2009-01-19 14:23:56 +0100 rene  r266496 : libbase depends on apache-commons..
2009-01-19 14:00:42 +0100 oj  r266495 : merge from m39
2009-01-19 12:39:00 +0100 oj  r266489 : CWS-TOOLING: rebase CWS rptfix04 to trunk@266428 (milestone: DEV300:m39)
2009-01-16 11:47:04 +0100 oj  r266410 : #i97560# add , between expressions
2009-01-09 17:11:38 +0100 rene  r266103 : don't show "checking which Apache commons-* libs to use" when we neither build the wiki editor nor  the SRB
2009-01-09 16:48:02 +0100 rene  r266099 : #i10000# reportbuilder needs apache-commons
2009-01-09 15:43:35 +0100 oj  r266093 : use of new nspaces
2009-01-09 15:41:34 +0100 oj  r266092 : use of new nspaces
2009-01-09 14:44:15 +0100 rene  r266088 : fix typo/description
2009-01-09 12:48:51 +0100 rene  r266074 : #i10000# fix install
2009-01-09 11:52:53 +0100 rene  r266070 : #i10000# more build fixes
2009-01-09 10:53:13 +0100 rene  r266062 : #i10000# ENABLE_REPORTBUILDER also in set_soenv.in, fix typo
2009-01-09 10:40:24 +0100 rene  r266060 : #i10000# configure fix for new reportbuilder module, typo fix at libfonts
2009-01-09 10:01:52 +0100 rene  r266055 : #i10000# adapt to current configure.in
2009-01-09 09:59:32 +0100 oj  r266054 : add new pentaho jars
2009-01-09 09:47:54 +0100 oj  r266049 : merge changes from DEV300_m39
2009-01-09 09:14:08 +0100 oj  r266048 : merge from DEV300_m39
2009-01-09 08:28:43 +0100 oj  r266045 : merge changes from dba31g
2009-01-09 07:58:10 +0100 oj  r266044 : replace JCOMMON with LIB
2009-01-08 13:42:24 +0100 oj  r266005 : move ext to reportbuilder
2009-01-08 13:41:38 +0100 oj  r266004 : add dep for license
2009-01-08 13:27:56 +0100 oj  r266001 : new module for Sun report Builder extension
2009-01-07 12:58:13 +0100 oj  r265960 : CWS-TOOLING: rebase CWS rptfix04 to trunk@265758 (milestone: DEV300:m38)
2008-12-15 13:47:18 +0100 oj  r265481 : new pentaho resources
2008-12-15 10:04:01 +0100 oj  r265462 : integrate new pentaho sources
2008-12-15 10:02:54 +0100 oj  r265461 : #i96888# fix date time function
2008-12-12 09:23:29 +0100 oj  r265389 : #97174# check of res < 0 removed
2008-12-12 09:15:54 +0100 oj  r265388 : #i9716# fix for DayFunction
2008-12-11 12:24:24 +0100 oj  r265281 : integrate new pentaho sources
2008-12-11 11:49:16 +0100 oj  r265273 : integrate new pentaho sources
2008-12-11 09:34:07 +0100 oj  r265248 : integrate new pentaho sources
2008-12-10 18:58:06 +0100 oj  r265227 : introduce new pentaho sources
2008-12-10 18:56:43 +0100 oj  r265226 : introduce new pentaho sources
2008-12-10 18:54:26 +0100 oj  r265225 : introduce new pentaho sources
2008-12-10 18:42:59 +0100 oj  r265221 : introduce new pentaho sources
2008-12-10 17:24:23 +0100 oj  r265212 : introduce new pentaho sources
2008-12-10 17:24:07 +0100 oj  r265211 : new pentaho sources
2008-12-10 17:23:00 +0100 oj  r265210 : introduce new pentaho sources

36 files changed, 242 insertions, 1091 deletions

diff --git a/jfreereport/download/core.zip b/jfreereport/download/core.zip
index 2b307e32bf6b..813d87d49573 100644
--- a/jfreereport/download/core.zip
+++ b/jfreereport/download/core.zip
diff --git a/jfreereport/download/flute.zip b/jfreereport/download/flute.zip
index c80046d37b5b..ff1ade906ad4 100644
--- a/jfreereport/download/flute.zip
+++ b/jfreereport/download/flute.zip
diff --git a/jfreereport/download/jcommon-1.0.10.zip b/jfreereport/download/jcommon-1.0.10.zip
deleted file mode 100644
index 169cf809ed24..000000000000
--- a/jfreereport/download/jcommon-1.0.10.zip
+++ /dev/null
diff --git a/jfreereport/download/jcommon-serializer.zip b/jfreereport/download/jcommon-serializer.zip
deleted file mode 100644
index f348c6aa87dc..000000000000
--- a/jfreereport/download/jcommon-serializer.zip
+++ /dev/null
diff --git a/jfreereport/download/libbase.zip b/jfreereport/download/libbase.zip
new file mode 100644
index 000000000000..88f555d9ef7c
--- /dev/null
+++ b/jfreereport/download/libbase.zip
diff --git a/jfreereport/download/libfonts.zip b/jfreereport/download/libfonts.zip
index 27d8ceeab23a..91fbac87b3a6 100644
--- a/jfreereport/download/libfonts.zip
+++ b/jfreereport/download/libfonts.zip
diff --git a/jfreereport/download/libformula.zip b/jfreereport/download/libformula.zip
index 5307e59ead08..c819c963767e 100644
--- a/jfreereport/download/libformula.zip
+++ b/jfreereport/download/libformula.zip
diff --git a/jfreereport/download/liblayout.zip b/jfreereport/download/liblayout.zip
index b1ba3e9e3ee6..1311fae496f5 100644
--- a/jfreereport/download/liblayout.zip
+++ b/jfreereport/download/liblayout.zip
diff --git a/jfreereport/download/libloader.zip b/jfreereport/download/libloader.zip
index 71592c483613..505329e0b6ea 100644
--- a/jfreereport/download/libloader.zip
+++ b/jfreereport/download/libloader.zip
diff --git a/jfreereport/download/librepository.zip b/jfreereport/download/librepository.zip
index 5fe4fa836b46..9541579941cf 100644
--- a/jfreereport/download/librepository.zip
+++ b/jfreereport/download/librepository.zip
diff --git a/jfreereport/download/libserializer.zip b/jfreereport/download/libserializer.zip
new file mode 100644
index 000000000000..94823b28e614
--- /dev/null
+++ b/jfreereport/download/libserializer.zip
diff --git a/jfreereport/download/libxml.zip b/jfreereport/download/libxml.zip
index 88e928f31be0..be5cecb2490e 100644
--- a/jfreereport/download/libxml.zip
+++ b/jfreereport/download/libxml.zip
diff --git a/jfreereport/java/flute/makefile.mk b/jfreereport/java/flute/makefile.mk
index 347d142daabe..afedcd5edbcc 100644
--- a/jfreereport/java/flute/makefile.mk
+++ b/jfreereport/java/flute/makefile.mk
@@ -33,37 +33,28 @@ PRJ=..$/..
 
 PRJNAME=jfreereport
 TARGET=flute
-VERSION=-1.3-jfree-20061107
+VERSION=-1.3.0
 
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :	settings.mk
-
-# override buildfile
-ANT_BUILDFILE=ant$/build.xml
-
 .INCLUDE : antsettings.mk
 
 .IF "$(SOLAR_JAVA)" != ""
 # --- Files --------------------------------------------------------
 
 TARFILE_NAME=$(TARGET)
-
 TARFILE_ROOTDIR=$(TARGET)
+# PATCH_FILE_NAME=$(PRJ)$/patches$/$(TARGET).patch
+# CONVERTFILES=build.xml		 
 
-PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
-
-CONVERTFILES=ant$/build.xml\
-             ant$/build.properties
-             
-OUT2CLASS=$(TARGET)$(VERSION).jar
 
 .IF "$(JAVACISGCJ)"=="yes"
 JAVA_HOME=
 .EXPORT : JAVA_HOME
-BUILD_ACTION=$(ANT) -Dlibdir="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) compile
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
 .ELSE
-BUILD_ACTION=$(ANT) -Dlibdir="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) compile
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
 .ENDIF
 
 .ENDIF # $(SOLAR_JAVA)!= ""
@@ -75,5 +66,10 @@ BUILD_ACTION=$(ANT) -Dlibdir="../../../class" -Dbuild.label="build-$(RSCREVISION
 
 .IF "$(SOLAR_JAVA)" != ""
 .INCLUDE : tg_ext.mk
+
+ALLTAR : $(CLASSDIR)$/$(TARGET)$(VERSION).jar 
+$(CLASSDIR)$/$(TARGET)$(VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
+    $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/build$/lib$/$(TARGET).jar $(CLASSDIR)$/$(TARGET)$(VERSION).jar
+    
 .ENDIF
 
diff --git a/jfreereport/java/jfreereport/makefile.mk b/jfreereport/java/jfreereport/makefile.mk
index 0b12ddb1897d..939964906eea 100644
--- a/jfreereport/java/jfreereport/makefile.mk
+++ b/jfreereport/java/jfreereport/makefile.mk
@@ -32,39 +32,29 @@
 PRJ=..$/..
 
 PRJNAME=jfreereport
-TARGET=pentaho-reporting-flow-engine
+TARGET=flow-engine
 VERSION=-0.9.2
 
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :	settings.mk
-
-# override buildfile
-ANT_BUILDFILE=build.xml
-
 .INCLUDE : antsettings.mk
 
 .IF "$(SOLAR_JAVA)" != ""
 # --- Files --------------------------------------------------------
 
 TARFILE_NAME=core
-
 TARFILE_ROOTDIR=core
-
 PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
-
-CONVERTFILES=build.xml\
-             build.properties \
-             source/org/jfree/report/expressions/ReportFormulaContext.java
-
-OUT2CLASS=$(TARGET)$(VERSION).jar
+# ADDITIONAL_FILES=MANIFEST.MF
+CONVERTFILES=build.xml
 
 .IF "$(JAVACISGCJ)"=="yes"
 JAVA_HOME=
 .EXPORT : JAVA_HOME
-BUILD_ACTION=$(ANT) -Dlibdir="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) compile
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
 .ELSE
-BUILD_ACTION=$(ANT) -Dlibdir="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) compile
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
 .ENDIF
 
 .ENDIF # $(SOLAR_JAVA)!= ""
@@ -76,4 +66,9 @@ BUILD_ACTION=$(ANT) -Dlibdir="../../../class" -Dbuild.label="build-$(RSCREVISION
 
 .IF "$(SOLAR_JAVA)" != ""
 .INCLUDE : tg_ext.mk
+
+ALLTAR : $(CLASSDIR)$/$(TARGET)$(VERSION).jar 
+$(CLASSDIR)$/$(TARGET)$(VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
+    $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/build$/lib$/$(TARGET).jar $(CLASSDIR)$/$(TARGET)$(VERSION).jar
+    
 .ENDIF
diff --git a/jfreereport/java/jcommon/makefile.mk b/jfreereport/java/libbase/makefile.mk
index c5185084c488..36e4c2b06f49 100644
--- a/jfreereport/java/jcommon/makefile.mk
+++ b/jfreereport/java/libbase/makefile.mk
@@ -32,37 +32,28 @@
 PRJ=..$/..
 
 PRJNAME=jfreereport
-TARGET=jcommon-1.0.10
-
+TARGET=libbase
+VERSION=-1.0.0
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :	settings.mk
-
-# override buildfile
-ANT_BUILDFILE=ant$/build.xml
-
 .INCLUDE : antsettings.mk
 
 .IF "$(SOLAR_JAVA)" != ""
 # --- Files --------------------------------------------------------
 
 TARFILE_NAME=$(TARGET)
-
 TARFILE_ROOTDIR=$(TARGET)
 
-PATCH_FILES=$(PRJ)$/patches$/jcommon.patch
-
-CONVERTFILES=ant$/build.xml\
-                ant$/build.properties
-                
-OUT2CLASS=$(TARGET).jar
+# PATCH_FILE_NAME=$(PRJ)$/patches$/libbase.patch
+# CONVERTFILES=build.xml
 
 .IF "$(JAVACISGCJ)"=="yes"
 JAVA_HOME=
 .EXPORT : JAVA_HOME
-BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) compile
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
 .ELSE
-BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) compile
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
 .ENDIF
 
 .ENDIF # $(SOLAR_JAVA)!= ""
@@ -74,5 +65,14 @@ BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) com
 
 .IF "$(SOLAR_JAVA)" != ""
 .INCLUDE : tg_ext.mk
+
+$(PACKAGE_DIR)$/$(CONFIGURE_FLAG_FILE) : $(CLASSDIR)$/commons-logging-1.1.1.jar
+ALLTAR : $(CLASSDIR)$/$(TARGET)$(VERSION).jar 
+
+$(CLASSDIR)$/commons-logging-1.1.1.jar : 
+    $(COPY) $(SOLARBINDIR)$/commons-logging-1.1.1.jar $(CLASSDIR)$/commons-logging-1.1.1.jar
+    
+$(CLASSDIR)$/$(TARGET)$(VERSION).jar : $(CLASSDIR)$/commons-logging-1.1.1.jar $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
+    $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/build$/lib$/$(TARGET).jar $(CLASSDIR)$/$(TARGET)$(VERSION).jar
 .ENDIF
 
diff --git a/jfreereport/java/libfonts/makefile.mk b/jfreereport/java/libfonts/makefile.mk
index 8f62cd44756f..e8e289337f5b 100644
--- a/jfreereport/java/libfonts/makefile.mk
+++ b/jfreereport/java/libfonts/makefile.mk
@@ -33,37 +33,27 @@ PRJ=..$/..
 
 PRJNAME=jfreereport
 TARGET=libfonts
-VERSION=-0.3.3
+VERSION=-1.0.0
 
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :	settings.mk
-
-# override buildfile
-ANT_BUILDFILE=build.xml
-
 .INCLUDE : antsettings.mk
 
 .IF "$(SOLAR_JAVA)" != ""
 # --- Files --------------------------------------------------------
 
 TARFILE_NAME=$(TARGET)
-
 TARFILE_ROOTDIR=$(TARGET)
-
 PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
-
-CONVERTFILES=build.xml\
-            build.properties
-
-OUT2CLASS=$(TARGET)$(VERSION).jar
+CONVERTFILES=build.xml
 
 .IF "$(JAVACISGCJ)"=="yes"
 JAVA_HOME=
 .EXPORT : JAVA_HOME
-BUILD_ACTION=$(ANT) -Dlibdir="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) compile
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
 .ELSE
-BUILD_ACTION=$(ANT) -Dlibdir="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) compile
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
 .ENDIF
 
 .ENDIF # $(SOLAR_JAVA)!= ""
@@ -75,5 +65,10 @@ BUILD_ACTION=$(ANT) -Dlibdir="../../../class" -Dbuild.label="build-$(RSCREVISION
 
 .IF "$(SOLAR_JAVA)" != ""
 .INCLUDE : tg_ext.mk
+
+ALLTAR : $(CLASSDIR)$/$(TARGET)$(VERSION).jar 
+$(CLASSDIR)$/$(TARGET)$(VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
+    $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/build$/lib$/$(TARGET).jar $(CLASSDIR)$/$(TARGET)$(VERSION).jar
+    
 .ENDIF
 
diff --git a/jfreereport/java/libformula/makefile.mk b/jfreereport/java/libformula/makefile.mk
index 3319d2c87549..1e4a3093f4bb 100644
--- a/jfreereport/java/libformula/makefile.mk
+++ b/jfreereport/java/libformula/makefile.mk
@@ -33,58 +33,29 @@ PRJ=..$/..
 
 PRJNAME=jfreereport
 TARGET=libformula
-VERSION=-0.1.14
+VERSION=-0.2.0
 
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :	settings.mk
-
-# override buildfile
-ANT_BUILDFILE=build.xml
-
 .INCLUDE : antsettings.mk
 
 .IF "$(SOLAR_JAVA)" != ""
 # --- Files --------------------------------------------------------
 
 TARFILE_NAME=$(TARGET)
-
 TARFILE_ROOTDIR=$(TARGET)
-
 PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
-
-CONVERTFILES=build.xml\
-                build.properties \
-                source/org/jfree/formula/function/text/MidFunctionDescription.java \
-                source/org/jfree/formula/function/AbstractFunctionDescription.java \
-                source/org/jfree/formula/function/datetime/Hour-Function.properties \
-                source/org/jfree/formula/function/information/IsBlank-Function.properties \
-                source/org/jfree/formula/function/information/IsErr-Function.properties \
-                source/org/jfree/formula/function/information/IsError-Function.properties \
-                source/org/jfree/formula/function/information/IsEven-Function.properties \
-                source/org/jfree/formula/function/information/IsLogical-Function.properties \
-                source/org/jfree/formula/function/information/IsNa-Function.properties \
-                source/org/jfree/formula/function/information/IsNonText-Function.properties \
-                source/org/jfree/formula/function/information/IsNumber-Function.properties \
-                source/org/jfree/formula/function/information/IsOdd-Function.properties \
-                source/org/jfree/formula/function/information/IsText-Function.properties \
-                source/org/jfree/formula/function/logical/If-Function.properties \
-                source/org/jfree/formula/function/logical/Not-Function.properties \
-                source/org/jfree/formula/function/logical/Or-Function.properties \
-                source/org/jfree/formula/function/math/Even-Function.properties \
-                source/org/jfree/formula/function/math/ModFunctionDescription.java \
-                source/org/jfree/formula/function/text/Trim-Function.properties \
-                source/org/jfree/formula/parser/FormulaParser.java
-
-ADDITIONAL_FILES=source/org/jfree/formula/function/information/IsRef-Function.properties
-OUT2CLASS=$(TARGET)$(VERSION).jar
+CONVERTFILES=build.xml \
+            source$/org$/pentaho$/reporting$/libraries$/formula$/function$/datetime$/DateDifFunction.java \
+            source$/org$/pentaho$/reporting$/libraries$/formula$/lvalues$/FormulaFunction.java
 
 .IF "$(JAVACISGCJ)"=="yes"
 JAVA_HOME=
 .EXPORT : JAVA_HOME
-BUILD_ACTION=$(ANT) -Dlibdir="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) compile
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
 .ELSE
-BUILD_ACTION=$(ANT) -Dlibdir="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) compile
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
 .ENDIF
 
 
@@ -97,6 +68,11 @@ BUILD_ACTION=$(ANT) -Dlibdir="../../../class" -Dbuild.label="build-$(RSCREVISION
 
 .IF "$(SOLAR_JAVA)" != ""
 .INCLUDE : tg_ext.mk
+
+ALLTAR : $(CLASSDIR)$/$(TARGET)$(VERSION).jar 
+$(CLASSDIR)$/$(TARGET)$(VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
+    $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/build$/lib$/$(TARGET).jar $(CLASSDIR)$/$(TARGET)$(VERSION).jar
+    
 .ENDIF
 # $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/source$/org$/jfree$/formula$/function$/information$/IsRef-Function.properties : 
 #	@@-$(MKDIRHIER) $(@:d)
diff --git a/jfreereport/java/liblayout/makefile.mk b/jfreereport/java/liblayout/makefile.mk
index 21e607ab777d..409b9715fe13 100644
--- a/jfreereport/java/liblayout/makefile.mk
+++ b/jfreereport/java/liblayout/makefile.mk
@@ -33,37 +33,27 @@ PRJ=..$/..
 
 PRJNAME=jfreereport
 TARGET=liblayout
-VERSION=-0.2.8
+VERSION=-0.2.9
 
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :	settings.mk
-
-# override buildfile
-ANT_BUILDFILE=build.xml
-
 .INCLUDE : antsettings.mk
 
 .IF "$(SOLAR_JAVA)" != ""
 # --- Files --------------------------------------------------------
 
 TARFILE_NAME=$(TARGET)
-
 TARFILE_ROOTDIR=$(TARGET)
-
 PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
-
-CONVERTFILES=build.xml\
-             build.properties
-
-OUT2CLASS=$(TARGET)$(VERSION).jar
+CONVERTFILES=build.xml
 
 .IF "$(JAVACISGCJ)"=="yes"
 JAVA_HOME=
 .EXPORT : JAVA_HOME
-BUILD_ACTION=$(ANT) -Dlibdir="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) compile
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
 .ELSE
-BUILD_ACTION=$(ANT) -Dlibdir="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) compile
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
 .ENDIF
 
 .ENDIF # $(SOLAR_JAVA)!= ""
@@ -75,5 +65,10 @@ BUILD_ACTION=$(ANT) -Dlibdir="../../../class" -Dbuild.label="build-$(RSCREVISION
 
 .IF "$(SOLAR_JAVA)" != ""
 .INCLUDE : tg_ext.mk
+
+ALLTAR : $(CLASSDIR)$/$(TARGET)$(VERSION).jar 
+$(CLASSDIR)$/$(TARGET)$(VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
+    $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/build$/lib$/$(TARGET).jar $(CLASSDIR)$/$(TARGET)$(VERSION).jar
+    
 .ENDIF
 
diff --git a/jfreereport/java/libloader/makefile.mk b/jfreereport/java/libloader/makefile.mk
index c1e1cb8cf8a6..9cb1e93066a8 100644
--- a/jfreereport/java/libloader/makefile.mk
+++ b/jfreereport/java/libloader/makefile.mk
@@ -33,37 +33,27 @@ PRJ=..$/..
 
 PRJNAME=jfreereport
 TARGET=libloader
-VERSION=-0.3.6
+VERSION=-1.0.0
 
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :	settings.mk
-
-# override buildfile
-ANT_BUILDFILE=build.xml
-
 .INCLUDE : antsettings.mk
 
 .IF "$(SOLAR_JAVA)" != ""
 # --- Files --------------------------------------------------------
 
 TARFILE_NAME=$(TARGET)
-
 TARFILE_ROOTDIR=$(TARGET)
-
 PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
-
-CONVERTFILES=build.xml\
-                build.properties
-
-OUT2CLASS=$(TARGET)$(VERSION).jar
+CONVERTFILES=build.xml
 
 .IF "$(JAVACISGCJ)"=="yes"
 JAVA_HOME=
 .EXPORT : JAVA_HOME
-BUILD_ACTION=$(ANT) -Dlibdir="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) compile
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
 .ELSE
-BUILD_ACTION=$(ANT) -Dlibdir="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) compile
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
 .ENDIF
 
 .ENDIF # $(SOLAR_JAVA)!= ""
@@ -75,5 +65,10 @@ BUILD_ACTION=$(ANT) -Dlibdir="../../../class" -Dbuild.label="build-$(RSCREVISION
 
 .IF "$(SOLAR_JAVA)" != ""
 .INCLUDE : tg_ext.mk
+
+ALLTAR : $(CLASSDIR)$/$(TARGET)$(VERSION).jar 
+$(CLASSDIR)$/$(TARGET)$(VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
+    $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/build$/lib$/$(TARGET).jar $(CLASSDIR)$/$(TARGET)$(VERSION).jar
+    
 .ENDIF
 
diff --git a/jfreereport/java/librepository/makefile.mk b/jfreereport/java/librepository/makefile.mk
index 7dad4ed185b7..d6bdab754f88 100644
--- a/jfreereport/java/librepository/makefile.mk
+++ b/jfreereport/java/librepository/makefile.mk
@@ -33,37 +33,27 @@ PRJ=..$/..
 
 PRJNAME=jfreereport
 TARGET=librepository
-VERSION=-0.1.4
+VERSION=-1.0.0
 
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :	settings.mk
-
-# override buildfile
-ANT_BUILDFILE=build.xml
-
 .INCLUDE : antsettings.mk
 
 .IF "$(SOLAR_JAVA)" != ""
 # --- Files --------------------------------------------------------
 
 TARFILE_NAME=$(TARGET)
-
 TARFILE_ROOTDIR=$(TARGET)
-
 PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
-
-CONVERTFILES=build.xml\
-                build.properties
-
-OUT2CLASS=$(TARGET)$(VERSION).jar
+CONVERTFILES=build.xml
 
 .IF "$(JAVACISGCJ)"=="yes"
 JAVA_HOME=
 .EXPORT : JAVA_HOME
-BUILD_ACTION=$(ANT) -Dlibdir="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) compile
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
 .ELSE
-BUILD_ACTION=$(ANT) -Dlibdir="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) compile
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
 .ENDIF
 
 .ENDIF # $(SOLAR_JAVA)!= ""
@@ -75,5 +65,10 @@ BUILD_ACTION=$(ANT) -Dlibdir="../../../class" -Dbuild.label="build-$(RSCREVISION
 
 .IF "$(SOLAR_JAVA)" != ""
 .INCLUDE : tg_ext.mk
+
+ALLTAR : $(CLASSDIR)$/$(TARGET)$(VERSION).jar 
+$(CLASSDIR)$/$(TARGET)$(VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
+    $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/build$/lib$/$(TARGET).jar $(CLASSDIR)$/$(TARGET)$(VERSION).jar
+    
 .ENDIF
 
diff --git a/jfreereport/java/jcommon-serializer/makefile.mk b/jfreereport/java/libserializer/makefile.mk
index 40147b066c11..e85eeb9ac1e5 100644
--- a/jfreereport/java/jcommon-serializer/makefile.mk
+++ b/jfreereport/java/libserializer/makefile.mk
@@ -32,38 +32,28 @@
 PRJ=..$/..
 
 PRJNAME=jfreereport
-TARGET=jcommon-serializer
-VERSION=-0.2.0
+TARGET=libserializer
+VERSION=-1.0.0
 
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :	settings.mk
-
-# override buildfile
-ANT_BUILDFILE=build.xml
-
 .INCLUDE : antsettings.mk
 
 .IF "$(SOLAR_JAVA)" != ""
 # --- Files --------------------------------------------------------
 
 TARFILE_NAME=$(TARGET)
-
 TARFILE_ROOTDIR=$(TARGET)
-
-PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
-
-CONVERTFILES=build.xml\
-             build.properties
+PATCH_FILE_NAME=$(PRJ)$/patches$/$(TARGET).patch
+CONVERTFILES=build.xml
                 
-OUT2CLASS=$(TARGET)$(VERSION).jar
-
 .IF "$(JAVACISGCJ)"=="yes"
 JAVA_HOME=
 .EXPORT : JAVA_HOME
-BUILD_ACTION=$(ANT) -Dlibdir="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) compile
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
 .ELSE
-BUILD_ACTION=$(ANT) -Dlibdir="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) compile
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
 .ENDIF
 
 .ENDIF # $(SOLAR_JAVA)!= ""
@@ -75,5 +65,10 @@ BUILD_ACTION=$(ANT) -Dlibdir="../../../class" -Dbuild.label="build-$(RSCREVISION
 
 .IF "$(SOLAR_JAVA)" != ""
 .INCLUDE : tg_ext.mk
+
+ALLTAR : $(CLASSDIR)$/$(TARGET)$(VERSION).jar 
+$(CLASSDIR)$/$(TARGET)$(VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
+    $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/build$/lib$/$(TARGET).jar $(CLASSDIR)$/$(TARGET)$(VERSION).jar
+    
 .ENDIF
 
diff --git a/jfreereport/java/libxml/makefile.mk b/jfreereport/java/libxml/makefile.mk
index c1dde8f3913a..fafb16753eb3 100644
--- a/jfreereport/java/libxml/makefile.mk
+++ b/jfreereport/java/libxml/makefile.mk
@@ -33,37 +33,27 @@ PRJ=..$/..
 
 PRJNAME=jfreereport
 TARGET=libxml
-VERSION=-0.9.9
+VERSION=-1.0.0
 
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :	settings.mk
-
-# override buildfile
-ANT_BUILDFILE=build.xml
-
 .INCLUDE : antsettings.mk
 
 .IF "$(SOLAR_JAVA)" != ""
 # --- Files --------------------------------------------------------
 
 TARFILE_NAME=$(TARGET)
-
 TARFILE_ROOTDIR=$(TARGET)
-
 PATCH_FILES=$(PRJ)$/patches$/$(TARGET).patch
-
-CONVERTFILES=build.xml\
-                build.properties
-
-OUT2CLASS=$(TARGET)$(VERSION).jar
+CONVERTFILES=build.xml
 
 .IF "$(JAVACISGCJ)"=="yes"
 JAVA_HOME=
 .EXPORT : JAVA_HOME
-BUILD_ACTION=$(ANT) -Dlibdir="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) compile
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
 .ELSE
-BUILD_ACTION=$(ANT) -Dlibdir="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) compile
+BUILD_ACTION=$(ANT) -Dlib="../../../class" -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
 .ENDIF
 
 .ENDIF # $(SOLAR_JAVA)!= ""
@@ -75,5 +65,10 @@ BUILD_ACTION=$(ANT) -Dlibdir="../../../class" -Dbuild.label="build-$(RSCREVISION
 
 .IF "$(SOLAR_JAVA)" != ""
 .INCLUDE : tg_ext.mk
+
+ALLTAR : $(CLASSDIR)$/$(TARGET)$(VERSION).jar 
+$(CLASSDIR)$/$(TARGET)$(VERSION).jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
+    $(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/build$/lib$/$(TARGET).jar $(CLASSDIR)$/$(TARGET)$(VERSION).jar
+    
 .ENDIF
 
diff --git a/jfreereport/patches/flow-engine.patch b/jfreereport/patches/flow-engine.patch
new file mode 100644
index 000000000000..ca3c84e53627
--- /dev/null
+++ b/jfreereport/patches/flow-engine.patch
@@ -0,0 +1,10 @@
+--- misc/core/build.xml	(Revision 6728)

++++ misc/build/core/build.xml	(Arbeitskopie)

+@@ -24,6 +24,6 @@

+   <!-- Setup the compile classpath -->

+   <path id="classpath">

+-    <fileset dir="lib">

++    <fileset dir="${lib}">

+       <include name="*.jar" />

+     </fileset>

+   </path>

diff --git a/jfreereport/patches/flute.patch b/jfreereport/patches/flute.patch
index f06f2a630a63..27cca426319d 100644
--- a/jfreereport/patches/flute.patch
+++ b/jfreereport/patches/flute.patch
@@ -1,86 +1,19 @@
-*** misc/flute/ant/build.properties	Thu Oct 18 08:20:03 2007
---- misc/build/flute/ant/build.properties	Thu Oct 18 14:07:28 2007
-***************
-*** 14,21 ****
-  
-  #
-  # Make sure that JDK 1.2 compatible class files are generated
-! build.target=1.2
-! build.source=1.2
-  
-  #
-  # All path settings are relative to the project root directory
---- 14,21 ----
-  
-  #
-  # Make sure that JDK 1.2 compatible class files are generated
-! build.target=1.3
-! build.source=1.3
-  
-  #
-  # All path settings are relative to the project root directory
-*** misc/flute/ant/build.xml	Thu Oct 18 08:20:03 2007
---- misc/build/flute/ant/build.xml	Mon Oct 22 09:13:22 2007
-***************
-*** 19,26 ****
-      </path>
-      <isClassAndFileAvailable class-name="org.w3c.css.sac.Parser"
-                               property-name="core.Enabled"
-!                              file-name="${libdir}/${sac-jar-file}"
-!                              classpath-id="core.Classpath"/>
-      <fail unless="core.Enabled"/>
-  
-    </target>
---- 19,25 ----
-      </path>
-      <isClassAndFileAvailable class-name="org.w3c.css.sac.Parser"
-                               property-name="core.Enabled"
-!                              file-name="${libdir}/${sac-jar-file}"/>
-      <fail unless="core.Enabled"/>
-  
-    </target>
-***************
-*** 38,59 ****
-  
-    <target name="compile" depends="initialise">
-  
-!     <fileset dir="source/" id="core.SourceFiles">
-!       <exclude name="**/junit/**"/>
-!       <include name="**/*.java"/>
-!     </fileset>
-! 
-!     <fileset dir="source/" id="core.ResourceFiles">
-!       <exclude name="**/junit/**"/>
-!       <include name="**/*.properties"/>
-!       <include name="**/*.jj"/>
-!     </fileset>
-! 
-!     <build-core target-jar="${flute-jar-file}"
-!                 source-files-id="core.SourceFiles"
-!                 resource-files-id="core.ResourceFiles"
-!                 classpath-id="core.Classpath">
-!     </build-core>
-    </target>
-  
-  
---- 37,56 ----
-  
-    <target name="compile" depends="initialise">
-  
-!     <build-all target-jar="${flute-jar-file}" source-dir="source">
-!       <all-classpath>
-!         <pathelement location="${libdir}/${sac-jar-file}"/>
-!       </all-classpath>
-!       <all-sources>
-!        <exclude name="**/junit/**"/>
-!        <include name="**/*.java"/>
-!       </all-sources>
-!       <all-resources>
-!         <exclude name="**/junit/**"/>
-! 		<include name="**/*.properties"/>
-! 		<include name="**/*.jj"/>
-!       </all-resources>
-!     </build-all>
-    </target>
-  
-  
+--- misc/flute/build.xml	(Revision 6820)

++++ misc/build/flute/build.xml	(Arbeitskopie)

+@@ -9,6 +9,7 @@

+    <property name="build.doc" value="${build}/api"/>

+    <property name="build.lib" value="${build}/lib"/>

+    <property name="packagenames" value="org.w3c.flute.*"/>

++   <property name="lib" value="lib"/>

+ 

+    <!-- Targets -->

+    <!-- Prepare build directories -->

+@@ -21,7 +22,7 @@

+ 

+   <!-- Setup the compile classpath -->

+   <path id="classpath">

+-    <fileset dir="lib">

++    <fileset dir="${lib}">

+       <include name="*.jar" />

+     </fileset>

+   </path>

diff --git a/jfreereport/patches/jcommon-serializer.patch b/jfreereport/patches/jcommon-serializer.patch
deleted file mode 100644
index c717ef4e0fa6..000000000000
--- a/jfreereport/patches/jcommon-serializer.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-*** misc/jcommon-serializer/build.properties	Mon Dec 11 13:40:27 2006
---- misc/build/jcommon-serializer/build.properties	Fri Jul 27 09:04:38 2007
-***************
-*** 13,20 ****
-  
-  ##
-  # Make sure that JDK 1.2 compatible class files are generated
-! build.target=1.2
-! build.source=1.2
-  
-  #
-  # All path settings are relative to the project root directory
---- 13,20 ----
-  
-  ##
-  # Make sure that JDK 1.2 compatible class files are generated
-! build.target=1.3
-! build.source=1.3
-  
-  #
-  # All path settings are relative to the project root directory
diff --git a/jfreereport/patches/jcommon.patch b/jfreereport/patches/jcommon.patch
deleted file mode 100644
index 1deea7683a64..000000000000
--- a/jfreereport/patches/jcommon.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-*** misc/jcommon-1.0.10/ant/build.properties	Mon Dec 11 13:40:27 2006
---- misc/build/jcommon-1.0.10/ant/build.properties	Fri Jul 27 09:04:38 2007
-***************
-*** 14,21 ****
-  
-  ##
-  # Make sure that JDK 1.2 compatible class files are generated
-! build.target=1.2
-! build.source=1.2
-  
-  #
-  # All path settings are relative to the project root directory
---- 14,21 ----
-  
-  ##
-  # Make sure that JDK 1.2 compatible class files are generated
-! build.target=1.3
-! build.source=1.3
-  
-  #
-  # All path settings are relative to the project root directory
-*** misc/jcommon-1.0.10/ant/build.xml	Mon May 21 19:25:06 2007
---- misc/build/jcommon-1.0.10/ant/build.xml	Thu Oct 18 11:58:48 2007
-***************
-*** 329,338 ****
-      <delete dir="distribution"/>
-    </target>
-  
-  
-    <!-- ALL -->
-    <target name="all"
-!     depends="compile,compile-xml,compile-junit-tests,javadoc,zip,targz,maven-bundle"
-      description="Compiles JCommon, builds the jar files, generates the Javadoc HTML pages and creates distribution files (.zip and .tar.gz).">
-    </target>
-  
---- 329,342 ----
-      <delete dir="distribution"/>
-    </target>
-  
-+   <!-- Copy jar file into environment -->
-+   <target name="copyjar" depends="compile">
-+     <copy file="${jcommon-jar-file}" tofile="../../../class/${jcommon-jar-file}"/>
-+   </target>
-  
-    <!-- ALL -->
-    <target name="all"
-!     depends="compile,compile-xml,compile-junit-tests,javadoc,zip,targz,maven-bundle,copyjar"
-      description="Compiles JCommon, builds the jar files, generates the Javadoc HTML pages and creates distribution files (.zip and .tar.gz).">
-    </target>
-  
diff --git a/jfreereport/patches/libbase.patch b/jfreereport/patches/libbase.patch
new file mode 100644
index 000000000000..87f79aad156b
--- /dev/null
+++ b/jfreereport/patches/libbase.patch
@@ -0,0 +1,19 @@
+--- misc/libbase/build.xml	(Revision 6728)

++++ misc/build/libbase/build.xml	(Arbeitskopie)

+@@ -6,6 +6,7 @@

+    <property name="build.classes" value="${build}/classes"/>

+    <property name="build.doc" value="${build}/api"/>

+    <property name="build.lib" value="${build}/lib"/>

++   <property name="lib" value="lib"/>

+ 

+    <!-- Targets -->

+    <!-- Prepare build directories -->

+@@ -18,7 +19,7 @@

+ 

+   <!-- Setup the compile classpath -->

+   <path id="classpath">

+-    <fileset dir="lib">

++    <fileset dir="${lib}">

+       <include name="*.jar" />

+     </fileset>

+   </path>

diff --git a/jfreereport/patches/libfonts.patch b/jfreereport/patches/libfonts.patch
index 0a088773db3a..de09e87b32d6 100644
--- a/jfreereport/patches/libfonts.patch
+++ b/jfreereport/patches/libfonts.patch
@@ -1,21 +1,10 @@
-*** misc/libfonts/build.properties	Sun May 27 19:19:06 2007
---- misc/build/libfonts/build.properties	Fri Jul 27 09:05:17 2007
-***************
-*** 14,21 ****
-  
-  #
-  # Make sure that JDK 1.2 compatible class files are generated
-  build.target=1.4
-! build.source=1.2
-  build.retro.target=1.2
-  build.retro.jdk=/opt/jdk1.2.2
-  
---- 14,21 ----
-  
-  #
-  # Make sure that JDK 1.2 compatible class files are generated
-  build.target=1.4
-! build.source=1.3
-  build.retro.target=1.2
-  build.retro.jdk=/opt/jdk1.2.2  
-  
+--- misc/libfonts/build.xml	(Revision 6728)

++++ misc/build/libfonts/build.xml	(Arbeitskopie)

+@@ -23,6 +23,6 @@

+   <!-- Setup the compile classpath -->

+   <path id="classpath">

+-    <fileset dir="lib">

++    <fileset dir="${lib}">

+       <include name="*.jar" />

+     </fileset>

+   </path>

diff --git a/jfreereport/patches/libformula.patch b/jfreereport/patches/libformula.patch
index af163d8380bc..07968b448675 100644
--- a/jfreereport/patches/libformula.patch
+++ b/jfreereport/patches/libformula.patch
@@ -1,289 +1,27 @@
-*** misc/libformula/build.properties	Mon May 21 19:44:21 2007
---- misc/build/libformula/build.properties	Fri Jul 27 09:05:29 2007
-***************
-*** 18,25 ****
-  
-  #
-  # Make sure that JDK 1.2 compatible class files are generated
-  build.target=1.4
-! build.source=1.2
-  build.retro.target=1.2
-  build.retro.jdk=/opt/jdk1.2.2
-  
---- 18,25 ----
-  
-  #
-  # Make sure that JDK 1.2 compatible class files are generated
-  build.target=1.4
-! build.source=1.3
-  build.retro.target=1.2
-  build.retro.jdk=/opt/jdk1.2.2
-  
---- misc/libformula/source/org/jfree/formula/function/text/MidFunctionDescription.java	2007-10-18 08:21:30.000000000 +0200
-+++ misc/build/libformula/source/org/jfree/formula/function/text/MidFunctionDescription.java	2008-07-07 14:44:01.790739928 +0200
-@@ -62,7 +62,7 @@
- 
-   public Type getParameterType(final int position)
-   {
--    if(position == 1)
-+    if(position == 0)
-     {
-       return TextType.TYPE;
+--- misc/libformula/source/org/pentaho/reporting/libraries/formula/function/datetime/DateDifFunction.java	2008-12-12 13:04:46.000000000 +0100
++++ misc/build/libformula/source/org/pentaho/reporting/libraries/formula/function/datetime/DateDifFunction.java	2008-12-15 08:15:18.293125000 +0100
+@@ -198,12 +198,6 @@
+           LibFormulaErrorValue.ERROR_INVALID_ARGUMENT_VALUE);
      }
  
---- misc/libformula/source/org/jfree/formula/function/AbstractFunctionDescription.java	2007-10-18 08:21:39.000000000 +0200
-+++ misc/build/libformula/source/org/jfree/formula/function/AbstractFunctionDescription.java	2008-09-04 08:17:14.114375000 +0200
-@@ -31,6 +31,7 @@
- package org.jfree.formula.function;
- 
- import java.util.Locale;
-+import java.util.MissingResourceException;
- import java.util.ResourceBundle;
- 
- /**
-@@ -72,7 +73,15 @@
- 
-   protected ResourceBundle getBundle(final Locale locale)
-   {
--    return ResourceBundle.getBundle(bundleName, locale);
-+      try
-+      {
-+        return ResourceBundle.getBundle(bundleName, locale);
-+      }
-+      catch(MissingResourceException ex)
-+      {
-+        return ResourceBundle.getBundle(bundleName, Locale.ENGLISH);
-+      }
-+    // return ResourceBundle.getBundle(bundleName, locale);
-   }
- 
-   public String getDisplayName(final Locale locale)
---- misc/libformula/source/org/jfree/formula/function/datetime/Hour-Function.properties	2007-10-18 08:21:38.000000000 +0200
-+++ misc/build/libformula/source/org/jfree/formula/function/datetime/Hour-Function.properties	2008-09-04 13:57:59.458125000 +0200
-@@ -5,4 +5,4 @@
- display-name=HOUR
- description=Returns the hour (0 through 23) from a time.
- parameter.0.display-name=Time
--parameter.0.description=The time
-+parameter.0.description=The time.
---- misc/libformula/source/org/jfree/formula/function/information/IsBlank-Function.properties	2007-10-18 08:21:36.000000000 +0200
-+++ misc/build/libformula/source/org/jfree/formula/function/information/IsBlank-Function.properties	2008-09-08 14:25:30.271875000 +0200
-@@ -4,6 +4,6 @@
- 
- display-name=ISBLANK
- description=Checks, whether the value is undefined (null).
--parameter.0.description=A value.
-+parameter.0.description=The value to be tested.
- parameter.0.display-name=Value
- 
---- misc/libformula/source/org/jfree/formula/function/information/IsErr-Function.properties	2007-10-18 08:21:36.000000000 +0200
-+++ misc/build/libformula/source/org/jfree/formula/function/information/IsErr-Function.properties	2008-09-08 14:25:30.303125000 +0200
-@@ -4,5 +4,5 @@
- 
- display-name=ISERR
- description=Tells if the parameter is of error type but returns false if the error is of type NA.
--parameter.0.description=A value.
-+parameter.0.description=The value to be tested.
- parameter.0.display-name=Value
---- misc/libformula/source/org/jfree/formula/function/information/IsError-Function.properties	2007-10-18 08:21:36.000000000 +0200
-+++ misc/build/libformula/source/org/jfree/formula/function/information/IsError-Function.properties	2008-09-08 14:27:09.865625000 +0200
-@@ -3,6 +3,6 @@
- #
- 
- display-name=ISERROR
--description=Tells if the parameter is of error type but returns false.
--parameter.0.description=A value.
-+description=Returns TRUE if the value is an error value.
-+parameter.0.description=The value to be tested.
- parameter.0.display-name=Value
---- misc/libformula/source/org/jfree/formula/function/information/IsEven-Function.properties	2007-10-18 08:21:36.000000000 +0200
-+++ misc/build/libformula/source/org/jfree/formula/function/information/IsEven-Function.properties	2008-09-08 14:25:30.350000000 +0200
-@@ -4,6 +4,6 @@
- 
- display-name=ISEVEN
- description=Checks whatever the value is an even number.
--parameter.0.description=A value.
-+parameter.0.description=The value to be tested.
- parameter.0.display-name=Value
- 
---- misc/libformula/source/org/jfree/formula/function/information/IsLogical-Function.properties	2007-10-18 08:21:36.000000000 +0200
-+++ misc/build/libformula/source/org/jfree/formula/function/information/IsLogical-Function.properties	2008-09-08 14:27:49.021875000 +0200
-@@ -3,7 +3,7 @@
- #
- 
- display-name=ISLOGICAL
--description=Checks whatever the value is of type Logical.
--parameter.0.description=A value.
-+description=Returns TRUE if the value carries a logical number format.
-+parameter.0.description=The value to be tested.
- parameter.0.display-name=Value
- 
---- misc/libformula/source/org/jfree/formula/function/information/IsNa-Function.properties	2007-10-18 08:21:36.000000000 +0200
-+++ misc/build/libformula/source/org/jfree/formula/function/information/IsNa-Function.properties	2008-09-08 14:25:30.412500000 +0200
-@@ -4,5 +4,5 @@
- 
- display-name=ISNA
- description=Tells if the parameter is of error type NA.
--parameter.0.description=A value.
-+parameter.0.description=The value to be tested.
- parameter.0.display-name=Value
---- misc/libformula/source/org/jfree/formula/function/information/IsNonText-Function.properties	2007-10-18 08:21:36.000000000 +0200
-+++ misc/build/libformula/source/org/jfree/formula/function/information/IsNonText-Function.properties	2008-09-08 14:29:02.709375000 +0200
-@@ -3,7 +3,7 @@
- #
- 
- display-name=ISNONTEXT
--description=Checks whatever the value is not of type Text.
--parameter.0.description=A value.
-+description=Returns TRUE if the value is not text.
-+parameter.0.description=The value to be tested.
- parameter.0.display-name=Value
- 
---- misc/libformula/source/org/jfree/formula/function/information/IsNumber-Function.properties	2007-10-18 08:21:36.000000000 +0200
-+++ misc/build/libformula/source/org/jfree/formula/function/information/IsNumber-Function.properties	2008-09-08 14:25:30.475000000 +0200
-@@ -4,6 +4,6 @@
- 
- display-name=ISNUMBER
- description=Checks whatever the value is of type Number.
--parameter.0.description=A value.
-+parameter.0.description=The value to be tested.
- parameter.0.display-name=Value
- 
---- misc/libformula/source/org/jfree/formula/function/information/IsOdd-Function.properties	2007-10-18 08:21:36.000000000 +0200
-+++ misc/build/libformula/source/org/jfree/formula/function/information/IsOdd-Function.properties	2008-09-08 14:25:30.506250000 +0200
-@@ -4,6 +4,6 @@
- 
- display-name=ISODD
- description=Checks whatever the value is an odd number.
--parameter.0.description=A value.
-+parameter.0.description=The value to be tested.
- parameter.0.display-name=Value
- 
---- misc/libformula/source/org/jfree/formula/function/information/IsRef-Function.properties	2008-12-02 08:28:02.985345116 +0100
-+++ misc/build/libformula/source/org/jfree/formula/function/information/IsRef-Function.properties	2008-11-18 12:04:59.132277875 +0100
-@@ -1 +1,9 @@
--dummy
-+#
-+# Copyright (c) 2007, Pentaho Corporation. All Rights Reserved.
-+#
-+
-+display-name=ISREF
-+description=Checks whatever the value is a reference.
-+parameter.0.description=A value.
-+parameter.0.display-name=Value
-+
---- misc/libformula/source/org/jfree/formula/function/information/IsText-Function.properties	2007-10-18 08:21:36.000000000 +0200
-+++ misc/build/libformula/source/org/jfree/formula/function/information/IsText-Function.properties	2008-09-08 14:28:53.631250000 +0200
-@@ -3,7 +3,7 @@
- #
- 
- display-name=ISTEXT
--description=Checks whatever the value is of type Text.
--parameter.0.description=A value.
-+description=Returns TRUE if value is text.
-+parameter.0.description=The value to be tested.
- parameter.0.display-name=Value
- 
---- misc/libformula/source/org/jfree/formula/function/logical/If-Function.properties	2007-10-18 08:21:39.000000000 +0200
-+++ misc/build/libformula/source/org/jfree/formula/function/logical/If-Function.properties	2008-12-02 08:27:33.611012901 +0100
-@@ -3,11 +3,11 @@
- #
- 
- display-name=IF
--description=Conditional execution
--parameter.0.description=Condition
--parameter.0.display-name=A Condition
--parameter.1.description=True-Term
--parameter.1.display-name=A term that is evaluated if the condition evaluates to true.
--parameter.2.description=False-Term
--parameter.2.display-name=A term that is evaluated if the condition evaluates to false.
-+description=Specifies a logical test to be performed.
-+parameter.0.display-name=Test
-+parameter.0.description=Any value or expression which can be either TRUE or FALSE.
-+parameter.1.display-name=Then_value
-+parameter.1.description=The result of the function if the logical test returns a TRUE.
-+parameter.2.display-name=Otherwise_value
-+parameter.2.description=The result of the function if the logical test returns FALSE.
- 
---- misc/libformula/source/org/jfree/formula/function/logical/Not-Function.properties	2007-10-18 08:21:39.000000000 +0200
-+++ misc/build/libformula/source/org/jfree/formula/function/logical/Not-Function.properties	2008-09-05 09:14:37.771875000 +0200
-@@ -2,8 +2,8 @@
- # Copyright (c) 2007, Pentaho Corporation. All Rights Reserved.
- #
- 
--display-name=AND
--description=Logical AND
--parameter.0.description=Condition
--parameter.0.display-name=A Condition
-+display-name=NOT
-+description=Compute logical NOT of the parameter.
-+parameter.0.description=A logical parameter.
-+parameter.0.display-name=Value
- 
---- misc/libformula/source/org/jfree/formula/function/logical/Or-Function.properties	2007-10-18 08:21:39.000000000 +0200
-+++ misc/build/libformula/source/org/jfree/formula/function/logical/Or-Function.properties	2008-09-05 09:15:17.990625000 +0200
-@@ -3,7 +3,6 @@
- #
- 
- display-name=OR
--description=Logical OR
--parameter.0.description=Condition
--parameter.0.display-name=A Condition
+-    if (res < 0)
+-    {
+-      throw new EvaluationException(
+-          LibFormulaErrorValue.ERROR_INVALID_ARGUMENT_VALUE);
+-    }
 -
-+description=Compute logical OR of all parameters.
-+parameter.0.description=A logical parameter.
-+parameter.0.display-name=Value
---- misc/libformula/source/org/jfree/formula/function/math/Even-Function.properties	2007-10-18 08:21:37.000000000 +0200
-+++ misc/build/libformula/source/org/jfree/formula/function/math/Even-Function.properties	2008-09-18 08:20:28.037500000 +0200
-@@ -2,7 +2,7 @@
- # Copyright (c) 2007, Pentaho Corporation. All Rights Reserved.
- #
- 
--display-name=Even
-+display-name=EVEN
- description=Returns the rounding a number up to the nearest even integer.
- parameter.0.description=A value.
- parameter.0.display-name=Value
---- misc/libformula/source/org/jfree/formula/function/math/ModFunctionDescription.java	2007-10-18 08:21:37.000000000 +0200
-+++ misc/build/libformula/source/org/jfree/formula/function/math/ModFunctionDescription.java	2008-11-18 12:04:59.248540478 +0100
-@@ -56,7 +56,7 @@
- 
-   public int getParameterCount()
-   {
--    return 12;
-+    return 2;
+     //noinspection UnpredictableBigDecimalConstructorCall
+     return new TypeValuePair(NumberType.GENERIC_NUMBER, new BigDecimal((double) res));
    }
+--- misc/libformula/source/org/pentaho/reporting/libraries/formula/lvalues/FormulaFunction.java	2008-12-12 13:04:46.000000000 +0100
++++ misc/build/libformula/source/org/pentaho/reporting/libraries/formula/lvalues/FormulaFunction.java	2008-12-15 08:13:14.308750000 +0100
+@@ -161,7 +161,8 @@
  
-   public Type getParameterType(final int position)
---- misc/libformula/source/org/jfree/formula/function/text/Trim-Function.properties	2007-10-18 08:21:29.000000000 +0200
-+++ misc/build/libformula/source/org/jfree/formula/function/text/Trim-Function.properties	2008-09-18 08:19:05.146875000 +0200
-@@ -2,7 +2,7 @@
- # Copyright (c) 2007, Pentaho Corporation. All Rights Reserved.
- #
- 
--display-name=LOWER
-+display-name=TRIM
- description=Returns the given text free of leading and trailing spaces. Internal multiple spaces are replaced by one.
- parameter.0.description=A value.
- parameter.0.display-name=Value
---- misc/libformula/source/org/jfree/formula/parser/FormulaParser.java	2007-10-18 08:21:39.000000000 +0200
-+++ misc/build/libformula/source/org/jfree/formula/parser/FormulaParser.java	2008-09-10 13:22:53.306875000 +0200
-@@ -87,8 +87,15 @@
- //    x.initialize(new DefaultFormulaContext());
- //    System.out.println(x);
- 
--    final LValue x = parser.parse("(1)()");
--    x.initialize(new DefaultFormulaContext());
--    System.out.println(x);
-+    final GeneratedFormulaParserTokenManager tokenParser = new GeneratedFormulaParserTokenManager(new JavaCharStream(new StringReader("DATEDIFF"),1,1));
-+    Token token = tokenParser.getNextToken();
-+    StringBuffer a = new StringBuffer();
-+    while( token.kind != GeneratedFormulaParserConstants.EOF )
-+    {
-+        a.append(token.image);
-+        token = tokenParser.getNextToken();
-+    }
-+
-+    System.out.println(a.toString());
+     for (int i = 0; i < parameters.length; i++)
+     {
+-      parameters[i].initialize(context);
++        if ( parameters[i] != null )
++            parameters[i].initialize(context);
+     }
    }
- }
+ 
diff --git a/jfreereport/patches/liblayout.patch b/jfreereport/patches/liblayout.patch
index a304ccf59c25..a30fdd82a9f6 100644
--- a/jfreereport/patches/liblayout.patch
+++ b/jfreereport/patches/liblayout.patch
@@ -1,79 +1,10 @@
-*** misc/liblayout/build.properties	Wed May 30 19:06:41 2007
---- misc/build/liblayout/build.properties	Fri Jul 27 09:05:42 2007
-***************
-*** 14,21 ****
-  
-  #
-  # Make sure that JDK 1.2 compatible class files are generated
-! build.target=1.2
-! build.source=1.2
-  build.retro.jdk=/opt/jdk1.2.2
-  
-  #
---- 14,21 ----
-  
-  #
-  # Make sure that JDK 1.2 compatible class files are generated
-! build.target=1.3
-! build.source=1.3
-  build.retro.jdk=/opt/jdk1.2.2
-  
-  #
-***************
-*** 39,51 ****
-  # JFree.org/JFreeReport libraries
-  jcommon-jar-file=jcommon-1.0.10.jar
-  flute-jar-file=flute-1.3-jfree-20061107.jar
-! libloader-jar-file=libloader-0.3.5.jar
-! librepository-jar-file=librepository-0.1.3.jar
-  #
-  # One of these is required.
-  libfonts-core-jar-file=libfonts-core-0.3.3.jar
-! libfonts-jar-file=libfonts-0.3.2.jar
-! libxml-jar-file=libxml-0.9.8.jar
-
-  # 3rd party libraries ..
-
---- 39,51 ----
-  # JFree.org/JFreeReport libraries
-  jcommon-jar-file=jcommon-1.0.10.jar
-  flute-jar-file=flute-1.3-jfree-20061107.jar
-! libloader-jar-file=libloader-0.3.6.jar
-! librepository-jar-file=librepository-0.1.4.jar
-  #
-  # One of these is required.
-  libfonts-core-jar-file=libfonts-core-0.3.3.jar
-! libfonts-jar-file=libfonts-0.3.3.jar
-! libxml-jar-file=libxml-0.9.9.jar
-
-  # 3rd party libraries ..
-
-***************
-*** 66,69 ****
-  liblayout-bundle-file=${liblayout.name}-${liblayout.version}-bundle.jar
-  liblayout-jar-file=${liblayout.name}-${liblayout.version}.jar
-  liblayout-core-jar-file=${liblayout.name}-core-${liblayout.version}.jar
-! module-output-pdf-jar-file=${liblayout.name}-module-output-pdf-${liblayout.version}.jar
---- 66,69 ----
-  liblayout-bundle-file=${liblayout.name}-${liblayout.version}-bundle.jar
-  liblayout-jar-file=${liblayout.name}-${liblayout.version}.jar
-  liblayout-core-jar-file=${liblayout.name}-core-${liblayout.version}.jar
-! module-output-pdf-jar-file=${liblayout.name}-module-output-pdf-${liblayout.version}.jar
-*** misc/liblayout/build.xml    Thu Oct 18 08:21:18 2007
---- misc/build/liblayout/build.xml      Mon Oct 22 12:42:45 2007
-***************
-*** 55,67 ****
-      <isClassAvailableEx class-name="org.jfree.xmlns.LibXmlInfo"
-                        property-name="lib.xmlns.present">
-        <test-classpath>
--         <pathelement location="${libdir}/${jaxp-jar-file}"/>
-          <pathelement location="${libdir}/${libxml-jar-file}"/>
-          <pathelement location="${libdir}/${jcommon-jar-file}"/>
-          <pathelement location="${libdir}/${libloader-jar-file}"/>
-        </test-classpath>
-        <additional-tests>
--         <available file="${libdir}/${jaxp-jar-file}"/>
-          <available file="${libdir}/${libxml-jar-file}"/>
-          <available file="${libdir}/${jcommon-jar-file}"/>
-        </additional-tests>
---- 55,65 ----
+--- misc/liblayout/build.xml	(Revision 6728)

++++ misc/build/liblayout/build.xml	(Arbeitskopie)

+@@ -24,6 +24,6 @@

+   <!-- Setup the compile classpath -->

+   <path id="classpath">

+-    <fileset dir="lib">

++    <fileset dir="${lib}">

+       <include name="*.jar" />

+     </fileset>

+   </path>

diff --git a/jfreereport/patches/libloader.patch b/jfreereport/patches/libloader.patch
index 75f1b190c31b..67b538f35f48 100644
--- a/jfreereport/patches/libloader.patch
+++ b/jfreereport/patches/libloader.patch
@@ -1,21 +1,11 @@
-*** misc/libloader/build.properties	Mon May 21 19:29:36 2007
---- misc/build/libloader/build.properties	Fri Jul 27 09:05:56 2007
-***************
-*** 14,21 ****
-  
-  #
-  # Make sure that JDK 1.2 compatible class files are generated
-! build.target=1.4
-! build.source=1.2
-  build.retro.jdk=/opt/jdk1.2.2
-  #
-  # All path settings are relative to the project root directory
---- 14,21 ----
-  
-  #
-  # Make sure that JDK 1.2 compatible class files are generated
-! build.target=1.4
-! build.source=1.3
-  build.retro.jdk=/opt/jdk1.2.2
-  #
-  # All path settings are relative to the project root directory
+--- misc/libloader/build.xml	2009-02-12 18:01:56.000000000 +0100

++++ misc/build/libloader/build.xml	2009-02-13 09:57:21.856601684 +0100

+@@ -23,7 +23,7 @@

+ 

+   <!-- Setup the compile classpath -->

+   <path id="classpath">

+-    <fileset dir="lib">

++    <fileset dir="${lib}">

+       <include name="*.jar" />

+     </fileset>

+   </path>

diff --git a/jfreereport/patches/librepository.patch b/jfreereport/patches/librepository.patch
index dd86f848f87b..9fe1e48ccdc6 100644
--- a/jfreereport/patches/librepository.patch
+++ b/jfreereport/patches/librepository.patch
@@ -1,22 +1,10 @@
-*** misc/librepository/build.properties	Sun May 27 19:23:24 2007
---- misc/build/librepository/build.properties	Fri Jul 27 09:06:11 2007
-***************
-*** 18,25 ****
-  
-  #
-  # Make sure that JDK 1.2 compatible class files are generated
-  build.target=1.4
-! build.source=1.2
-  build.retro.target=1.2
-  build.retro.jdk=/opt/jdk1.2.2
-  
---- 18,25 ----
-  
-  #
-  # Make sure that JDK 1.2 compatible class files are generated
-  build.target=1.4
-! build.source=1.3
-  build.retro.target=1.2
-  build.retro.jdk=/opt/jdk1.2.2
-  
-  
+--- misc/librepository/build.xml	(Revision 6728)

++++ misc/build/librepository/build.xml	(Arbeitskopie)

+@@ -24,6 +24,6 @@

+   <!-- Setup the compile classpath -->

+   <path id="classpath">

+-    <fileset dir="lib">

++    <fileset dir="${lib}">

+       <include name="*.jar" />

+     </fileset>

+   </path>

diff --git a/jfreereport/patches/libserializer.patch b/jfreereport/patches/libserializer.patch
new file mode 100644
index 000000000000..b2a610a6478f
--- /dev/null
+++ b/jfreereport/patches/libserializer.patch
@@ -0,0 +1,10 @@
+--- misc/libserializer/build.xml	(Revision 6728)

++++ misc/build/libserializer/build.xml	(Arbeitskopie)

+@@ -24,6 +24,6 @@

+   <!-- Setup the compile classpath -->

+   <path id="classpath">

+-    <fileset dir="lib">

++    <fileset dir="${lib}">

+       <include name="*.jar" />

+     </fileset>

+   </path>

diff --git a/jfreereport/patches/libxml.patch b/jfreereport/patches/libxml.patch
index 1193da101b04..70c2aecc2444 100644
--- a/jfreereport/patches/libxml.patch
+++ b/jfreereport/patches/libxml.patch
@@ -1,21 +1,10 @@
-*** misc/libxml/build.properties	Sun May 27 20:44:28 2007
---- misc/build/libxml/build.properties	Fri Jul 27 09:06:22 2007
-***************
-*** 18,25 ****
-  
-  #
-  # Make sure that JDK 1.2 compatible class files are generated
-  build.target=1.4
-! build.source=1.2
-  
-  # You probably want to override this in your local build setup file
-  build.retro.target=1.2
---- 18,25 ----
-  
-  #
-  # Make sure that JDK 1.2 compatible class files are generated
-  build.target=1.4
-! build.source=1.3
-  
-  # You probably want to override this in your local build setup file
-  build.retro.target=1.2
+--- misc/libxml/build.xml	(Revision 6728)

++++ misc/build/libxml/build.xml	(Arbeitskopie)

+@@ -24,6 +24,6 @@

+   <!-- Setup the compile classpath -->

+   <path id="classpath">

+-    <fileset dir="lib">

++    <fileset dir="${lib}">

+       <include name="*.jar" />

+     </fileset>

+   </path>

diff --git a/jfreereport/patches/pentaho-reporting-flow-engine.patch b/jfreereport/patches/pentaho-reporting-flow-engine.patch
deleted file mode 100644
index 8030461d7777..000000000000
--- a/jfreereport/patches/pentaho-reporting-flow-engine.patch
+++ /dev/null
@@ -1,312 +0,0 @@
---- misc/core/build.properties	2007-10-18 08:20:01.000000000 +0200
-+++ misc/build/core/build.properties	2008-09-08 11:51:22.178125000 +0200
-@@ -17,8 +17,8 @@
- 
- #
- # Make sure that JDK 1.2 compatible class files are generated
--build.target=1.2
--build.source=1.2
-+build.target=1.3
-+build.source=1.3
- build.retro.jdk=/opt/jdk1.2.2
- 
- #
-@@ -40,15 +40,15 @@
- 
- # Used by: core libraries
- jcommon-jar-file=jcommon-1.0.10.jar
--jcommon-serializer-jar-file=jcommon-serializer-0.1.0.jar
--libfonts-jar-file=libfonts-0.3.2.jar
-+jcommon-serializer-jar-file=jcommon-serializer-0.2.0.jar
-+libfonts-jar-file=libfonts-0.3.3.jar
- libfonts-core-jar-file=libfonts-0.3.2.jar
- libfonts-itext-jar-file=libfonts-0.3.2.jar
- liblayout-jar-file=liblayout-0.2.8.jar
--libloader-jar-file=libloader-0.3.5.jar
--libxml-jar-file=libxml-0.9.8.jar
--libformula-jar-file=libformula-0.1.13.jar
--librepository-jar-file=librepository-0.1.3.jar
-+libloader-jar-file=libloader-0.3.6.jar
-+libxml-jar-file=libxml-0.9.9.jar
-+libformula-jar-file=libformula-0.1.14.jar
-+librepository-jar-file=librepository-0.1.4.jar
- flute-jar-file=flute-1.3-jfree-20061107.jar
- 
- #
---- misc/core/build.xml	2007-10-18 08:20:01.000000000 +0200
-+++ misc/build/core/build.xml	2008-09-08 11:51:22.162500000 +0200
-@@ -54,13 +54,11 @@
-     <isClassAvailableEx class-name="org.jfree.xmlns.LibXmlInfo"
-                       property-name="lib.xmlns.present">
-       <test-classpath>
--        <pathelement location="${libdir}/${jaxp-jar-file}"/>
-         <pathelement location="${libdir}/${libxml-jar-file}"/>
-         <pathelement location="${libdir}/${jcommon-jar-file}"/>
-         <pathelement location="${libdir}/${libloader-jar-file}"/>
-       </test-classpath>
-       <additional-tests>
--        <available file="${libdir}/${jaxp-jar-file}"/>
-         <available file="${libdir}/${libxml-jar-file}"/>
-         <available file="${libdir}/${jcommon-jar-file}"/>
-       </additional-tests>
-@@ -136,6 +134,7 @@
-                source-dir="source">
-       <all-sources>
-         <exclude name="org/jfree/report/modules/gui/pdf/**" unless="lib.itext.present"/>
-+              <exclude name="org/jfree/report/modules/gui/swing/pdf/**" unless="lib.itext.present"/>
-       </all-sources>
-       <all-classpath>
-         <pathelement location="${libdir}/${jcommon-jar-file}"/>
-@@ -168,6 +167,7 @@
-         <include name="*.jpg"/>
-         <include name="**/*.jpg"/>
-         <exclude name="org/jfree/report/modules/gui/pdf/**" unless="lib.itext.present"/>
-+              <exclude name="org/jfree/report/modules/gui/swing/pdf/**" unless="lib.itext.present"/>
-       </all-resources>
-     </build-all>
-   </target>
-@@ -179,6 +179,7 @@
-                  jdk-dir="${build.retro.jdk}">
-       <all-sources>
-         <exclude name="org/jfree/report/modules/gui/pdf/**" unless="lib.itext.present"/>
-+              <exclude name="org/jfree/report/modules/gui/swing/pdf/**" unless="lib.itext.present"/>
-       </all-sources>
-       <all-classpath>
-         <pathelement location="${libdir}/${jcommon-jar-file}"/>
-@@ -211,6 +212,7 @@
-         <include name="*.jpg"/>
-         <include name="**/*.jpg"/>
-         <exclude name="org/jfree/report/modules/gui/pdf/**" unless="lib.itext.present"/>
-+              <exclude name="org/jfree/report/modules/gui/swing/pdf/**" unless="lib.itext.present"/>
-       </all-resources>
-     </build-retro>
-   </target>
---- misc/core/source/org/jfree/report/expressions/ReportFormulaContext.java	2007-10-18 08:19:32.000000000 +0200
-+++ misc/build/core/source/org/jfree/report/expressions/ReportFormulaContext.java	2008-10-01 09:38:50.951250000 +0200
-@@ -28,7 +28,6 @@
-  * (C) Copyright 2000-2005, by Object Refinery Limited.
-  * (C) Copyright 2005-2007, by Pentaho Corporation.
-  */
--
- package org.jfree.report.expressions;
- 
- import org.jfree.formula.ContextEvaluationException;
-@@ -40,6 +39,9 @@
- import org.jfree.formula.typing.Type;
- import org.jfree.formula.typing.TypeRegistry;
- import org.jfree.formula.typing.coretypes.AnyType;
-+import org.jfree.formula.typing.coretypes.DateTimeType;
-+import org.jfree.formula.typing.coretypes.NumberType;
-+import org.jfree.formula.typing.coretypes.TextType;
- import org.jfree.report.DataFlags;
- import org.jfree.report.DataRow;
- import org.jfree.report.DataSourceException;
-@@ -53,101 +55,111 @@
-  */
- public class ReportFormulaContext implements FormulaContext
- {
--  private FormulaContext backend;
--  private DataRow dataRow;
--  private Object declaringElement;
--
--  public ReportFormulaContext(final FormulaContext backend,
--                              final DataRow dataRow)
--  {
--    this.backend = backend;
--    this.dataRow = dataRow;
--  }
--
--  public LocalizationContext getLocalizationContext()
--  {
--    return backend.getLocalizationContext();
--  }
--
--  public Configuration getConfiguration()
--  {
--    return backend.getConfiguration();
--  }
--
--  public FunctionRegistry getFunctionRegistry()
--  {
--    return backend.getFunctionRegistry();
--  }
--
--  public TypeRegistry getTypeRegistry()
--  {
--    return backend.getTypeRegistry();
--  }
--
--  public OperatorFactory getOperatorFactory()
--  {
--    return backend.getOperatorFactory();
--  }
--
--  public boolean isReferenceDirty(final Object name) throws ContextEvaluationException
--  {
--    try
--    {
--      final DataFlags flags = dataRow.getFlags(String.valueOf(name));
--      if (flags == null)
--      {
--        throw new ContextEvaluationException
--            (new LibFormulaErrorValue(LibFormulaErrorValue.ERROR_REFERENCE_NOT_RESOLVABLE));
--      }
--      return flags.isChanged();
--    }
--    catch(Exception e)
--    {
--      throw new ContextEvaluationException
--          (new LibFormulaErrorValue(LibFormulaErrorValue.ERROR_REFERENCE_NOT_RESOLVABLE));
--    }
--  }
--
--  public Type resolveReferenceType(final Object name)
--  {
--    return AnyType.TYPE;
--  }
--
--  public Object resolveReference(final Object name) throws ContextEvaluationException
--  {
--    if (name == null)
--    {
--      throw new NullPointerException();
--    }
--    try
--    {
--      return dataRow.get(String.valueOf(name));
--    }
--    catch (DataSourceException e)
--    {
--      Log.debug ("Error while resolving formula reference: ", e);
--      throw new ContextEvaluationException(new LibFormulaErrorValue
--          (LibFormulaErrorValue.ERROR_REFERENCE_NOT_RESOLVABLE));
--    }
--  }
--
--  public DataRow getDataRow()
--  {
--    return dataRow;
--  }
--
--  public void setDataRow(final DataRow dataRow)
--  {
--    this.dataRow = dataRow;
--  }
--
--  public Object getDeclaringElement()
--  {
--    return declaringElement;
--  }
--
--  public void setDeclaringElement(final Object declaringElement)
--  {
--    this.declaringElement = declaringElement;
--  }
-+
-+    private FormulaContext backend;
-+    private DataRow dataRow;
-+    private Object declaringElement;
-+
-+    public ReportFormulaContext(final FormulaContext backend,
-+            final DataRow dataRow)
-+    {
-+        this.backend = backend;
-+        this.dataRow = dataRow;
-+    }
-+
-+    public LocalizationContext getLocalizationContext()
-+    {
-+        return backend.getLocalizationContext();
-+    }
-+
-+    public Configuration getConfiguration()
-+    {
-+        return backend.getConfiguration();
-+    }
-+
-+    public FunctionRegistry getFunctionRegistry()
-+    {
-+        return backend.getFunctionRegistry();
-+    }
-+
-+    public TypeRegistry getTypeRegistry()
-+    {
-+        return backend.getTypeRegistry();
-+    }
-+
-+    public OperatorFactory getOperatorFactory()
-+    {
-+        return backend.getOperatorFactory();
-+    }
-+
-+    public boolean isReferenceDirty(final Object name) throws ContextEvaluationException
-+    {
-+        try
-+        {
-+            final DataFlags flags = dataRow.getFlags(String.valueOf(name));
-+            if ( flags == null )
-+            {
-+                throw new ContextEvaluationException(new LibFormulaErrorValue(LibFormulaErrorValue.ERROR_REFERENCE_NOT_RESOLVABLE));
-+            }
-+            return flags.isChanged();
-+        } catch ( Exception e )
-+        {
-+            throw new ContextEvaluationException(new LibFormulaErrorValue(LibFormulaErrorValue.ERROR_REFERENCE_NOT_RESOLVABLE));
-+        }
-+    }
-+
-+    public Type resolveReferenceType(final Object name)
-+    {
-+        try
-+        {
-+            final DataFlags flags = dataRow.getFlags(String.valueOf(name));
-+            if ( flags != null)
-+            {
-+                if ( flags.isDate() )
-+                    return DateTimeType.DATE_TYPE;
-+                if ( flags.isNumeric() )
-+                    return NumberType.GENERIC_NUMBER;
-+                return TextType.TYPE;
-+            }
-+        } catch ( DataSourceException ex )
-+        {
-+        }
-+        return AnyType.TYPE;
-+    }
-+
-+    public Object resolveReference(final Object name) throws ContextEvaluationException
-+    {
-+        if ( name == null )
-+        {
-+            throw new NullPointerException();
-+        }
-+        try
-+        {
-+            return dataRow.get(String.valueOf(name));
-+        } catch ( DataSourceException e )
-+        {
-+            Log.debug("Error while resolving formula reference: ", e);
-+            throw new ContextEvaluationException(new LibFormulaErrorValue(LibFormulaErrorValue.ERROR_REFERENCE_NOT_RESOLVABLE));
-+        }
-+    }
-+
-+    public DataRow getDataRow()
-+    {
-+        return dataRow;
-+    }
-+
-+    public void setDataRow(final DataRow dataRow)
-+    {
-+        this.dataRow = dataRow;
-+    }
-+
-+    public Object getDeclaringElement()
-+    {
-+        return declaringElement;
-+    }
-+
-+    public void setDeclaringElement(final Object declaringElement)
-+    {
-+        this.declaringElement = declaringElement;
-+    }
- }
diff --git a/jfreereport/prj/build.lst b/jfreereport/prj/build.lst
index 1300a71bacb7..62cdd738c3b6 100644
--- a/jfreereport/prj/build.lst
+++ b/jfreereport/prj/build.lst
@@ -1,13 +1,13 @@
-jf	jfreereport	:	solenv NULL
+jf	jfreereport	:	solenv APACHE_COMMONS:apache-commons NULL
 jf	jfreereport								usr1	-	all	jf_mkout 							NULL
 jf	jfreereport\java\sac					nmake	-	all	jf_sac								NULL
-jf	jfreereport\java\jcommon				nmake	-	all	jf_jcommon							NULL
+jf	jfreereport\java\libbase				nmake	-	all	jf_libbase							NULL
 jf	jfreereport\java\flute					nmake	-	all	jf_flute jf_sac						NULL
-jf	jfreereport\java\libxml					nmake	-	all	jf_libxml jf_jcommon jf_libloader	NULL
-jf	jfreereport\java\libloader				nmake	-	all	jf_libloader jf_jcommon				NULL
-jf	jfreereport\java\libfonts				nmake	-	all	jf_libfonts	jf_jcommon jf_libloader NULL
-jf	jfreereport\java\libformula				nmake	-	all	jf_libformula jf_jcommon 			NULL
-jf	jfreereport\java\librepository			nmake	-	all	jf_librepository jf_jcommon			NULL
-jf	jfreereport\java\jcommon-serializer		nmake	-	all	jf_jcommon-serializer jf_jcommon	NULL
-jf	jfreereport\java\jfreereport			nmake	-	all	jf_jfreereport jf_liblayout jf_libformula jf_jcommon-serializer		NULL
-jf	jfreereport\java\liblayout				nmake	-	all	jf_liblayout jf_jcommon	jf_flute jf_libfonts jf_libloader jf_librepository jf_libxml jf_sac		NULL
+jf	jfreereport\java\libloader				nmake	-	all	jf_libloader jf_libbase				NULL
+jf	jfreereport\java\libxml					nmake	-	all	jf_libxml jf_libbase jf_libloader	NULL
+jf	jfreereport\java\libformula				nmake	-	all	jf_libformula jf_libbase 			NULL
+jf	jfreereport\java\libfonts				nmake	-	all	jf_libfonts	jf_libbase jf_libloader NULL
+jf	jfreereport\java\librepository			nmake	-	all	jf_librepository jf_libbase			NULL
+jf	jfreereport\java\libserializer          nmake	-	all	jf_libserializer jf_libbase         NULL
+jf	jfreereport\java\jfreereport			nmake	-	all	jf_jfreereport jf_liblayout jf_libformula jf_libserializer		NULL
+jf	jfreereport\java\liblayout				nmake	-	all	jf_liblayout jf_libbase	jf_flute jf_libfonts jf_libloader jf_librepository jf_libxml jf_sac		NULL