INTEGRATION: CWS pentaho1 (1.2.6); FILE MERGED

2007/10/22 11:50:22 oj 1.2.6.1: #i80723# #i81510# switch to new branch from pentaho

8 files changed, 174 insertions, 50 deletions

diff --git a/jfreereport/patches/flute.patch b/jfreereport/patches/flute.patch
index 9599e9175da4..f06f2a630a63 100644
--- a/jfreereport/patches/flute.patch
+++ b/jfreereport/patches/flute.patch
@@ -1,5 +1,5 @@
-*** misc/flute/ant/build.properties	Sun Dec  3 18:56:06 2006
---- misc/build/flute/ant/build.properties	Fri Jul 27 09:07:03 2007
+*** 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 ****
   
@@ -19,3 +19,68 @@
   
   #
   # 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>
+  
+  
diff --git a/jfreereport/patches/jcommon-serializer.patch b/jfreereport/patches/jcommon-serializer.patch
index 6a451af2ee8b..c717ef4e0fa6 100644
--- a/jfreereport/patches/jcommon-serializer.patch
+++ b/jfreereport/patches/jcommon-serializer.patch
@@ -1,5 +1,5 @@
-*** misc/jcommon-serializer/ant/build.properties	Mon Dec 11 13:40:27 2006
---- misc/build/jcommon-serializer/ant/build.properties	Fri Jul 27 09:04:38 2007
+*** 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 ****
   
diff --git a/jfreereport/patches/libfonts.patch b/jfreereport/patches/libfonts.patch
index a1fe7994ab31..0a088773db3a 100644
--- a/jfreereport/patches/libfonts.patch
+++ b/jfreereport/patches/libfonts.patch
@@ -1,21 +1,21 @@
-*** misc/libfonts/ant/build.properties	Sun May 27 19:19:06 2007
---- misc/build/libfonts/ant/build.properties	Fri Jul 27 09:05:17 2007
+*** 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.2
+  build.target=1.4
 ! build.source=1.2
+  build.retro.target=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.3
+  build.target=1.4
 ! build.source=1.3
+  build.retro.target=1.2
+  build.retro.jdk=/opt/jdk1.2.2  
   
-  #
-  # All path settings are relative to the project root directory
diff --git a/jfreereport/patches/libformula.patch b/jfreereport/patches/libformula.patch
index 4ed09016cc8c..159dbd89b246 100644
--- a/jfreereport/patches/libformula.patch
+++ b/jfreereport/patches/libformula.patch
@@ -1,21 +1,21 @@
-*** misc/libformula/ant/build.properties	Mon May 21 19:44:21 2007
---- misc/build/libformula/ant/build.properties	Fri Jul 27 09:05:29 2007
+*** 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.2
+  build.target=1.4
 ! build.source=1.2
+  build.retro.target=1.2
+  build.retro.jdk=/opt/jdk1.2.2
   
-  #
-  # All path settings are relative to the project root directory
 --- 18,25 ----
   
   #
   # 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
+  build.target=1.4
+! build.source=1.2
+  build.retro.target=1.2
+  build.retro.jdk=/opt/jdk1.2.2
+  
\ No newline at end of file
diff --git a/jfreereport/patches/liblayout.patch b/jfreereport/patches/liblayout.patch
index d3ffc7ba8f90..a304ccf59c25 100644
--- a/jfreereport/patches/liblayout.patch
+++ b/jfreereport/patches/liblayout.patch
@@ -1,5 +1,5 @@
-*** misc/liblayout/ant/build.properties	Wed May 30 19:06:41 2007
---- misc/build/liblayout/ant/build.properties	Fri Jul 27 09:05:42 2007
+*** 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 ****
   
@@ -7,15 +7,73 @@
   # 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
   
   #
-  # 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
+  build.retro.jdk=/opt/jdk1.2.2
   
   #
-  # All path settings are relative to the project root directory
+***************
+*** 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 ----
diff --git a/jfreereport/patches/libloader.patch b/jfreereport/patches/libloader.patch
index 155c0c732549..75f1b190c31b 100644
--- a/jfreereport/patches/libloader.patch
+++ b/jfreereport/patches/libloader.patch
@@ -1,21 +1,21 @@
-*** misc/libloader/ant/build.properties	Mon May 21 19:29:36 2007
---- misc/build/libloader/ant/build.properties	Fri Jul 27 09:05:56 2007
+*** 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.2
+! 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.3
+! 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
diff --git a/jfreereport/patches/librepository.patch b/jfreereport/patches/librepository.patch
index 6a4f7bf8bcc2..dd86f848f87b 100644
--- a/jfreereport/patches/librepository.patch
+++ b/jfreereport/patches/librepository.patch
@@ -1,21 +1,22 @@
-*** misc/librepository/ant/build.properties	Sun May 27 19:23:24 2007
---- misc/build/librepository/ant/build.properties	Fri Jul 27 09:06:11 2007
+*** 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.2
+  build.target=1.4
 ! build.source=1.2
+  build.retro.target=1.2
+  build.retro.jdk=/opt/jdk1.2.2
   
-  #
-  # All path settings are relative to the project root directory
 --- 18,25 ----
   
   #
   # Make sure that JDK 1.2 compatible class files are generated
-! build.target=1.3
+  build.target=1.4
 ! build.source=1.3
+  build.retro.target=1.2
+  build.retro.jdk=/opt/jdk1.2.2
+  
   
-  #
-  # All path settings are relative to the project root directory
diff --git a/jfreereport/patches/libxml.patch b/jfreereport/patches/libxml.patch
index 2e8dec0f1a31..1193da101b04 100644
--- a/jfreereport/patches/libxml.patch
+++ b/jfreereport/patches/libxml.patch
@@ -1,21 +1,21 @@
-*** misc/libxml/ant/build.properties	Sun May 27 20:44:28 2007
---- misc/build/libxml/ant/build.properties	Fri Jul 27 09:06:22 2007
+*** misc/libxml/build.properties	Sun May 27 20:44:28 2007
+--- misc/build/libxml/build.properties	Fri Jul 27 09:06:22 2007
 ***************
-*** 14,21 ****
+*** 18,25 ****
   
   #
   # Make sure that JDK 1.2 compatible class files are generated
-! build.target=1.2
+  build.target=1.4
 ! build.source=1.2
   
-  #
-  # All path settings are relative to the project root directory
---- 14,21 ----
+  # 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.3
+  build.target=1.4
 ! build.source=1.3
   
-  #
-  # All path settings are relative to the project root directory
+  # You probably want to override this in your local build setup file
+  build.retro.target=1.2