From e4f4e925ffd20cc381d248da82702ea9f1747287 Mon Sep 17 00:00:00 2001
From: tspc <devnull@localhost>
Date: Mon, 14 Jun 2010 08:53:32 +0000
Subject: [PATCH] Merge Revisions 12556 from /release to /trunk

Revision: 12556
Upgrade to JCommon 1.0.16
Upgrade to JFreeChart 1.0.13
Upgrade to jasperreports-3.7.3.jar

Regards,
Tony
---
 .classpath                    | 6 +++---
 JasperReports/build.xml       | 6 +++---
 JasperReportsTools/.classpath | 4 ++--
 base/.classpath               | 4 ++--
 client/.classpath             | 4 ++--
 client/build.xml              | 4 ++--
 posterita/.classpath          | 4 ++--
 tools/.classpath              | 4 ++--
 tools/build.xml               | 8 ++++----
 zkwebui/.classpath            | 4 ++--
 10 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/.classpath b/.classpath
index a31ccc95c7..14867d544b 100644
--- a/.classpath
+++ b/.classpath
@@ -58,8 +58,8 @@
 	<classpathentry exported="true" kind="lib" path="tools/lib/barbecue-1.5-beta1.jar"/>
 	<classpathentry exported="true" kind="lib" path="tools/lib/poi-3.0.1-FINAL-20070705.jar"/>
 	<classpathentry exported="true" kind="lib" path="tools/lib/javaee.jar"/>
-	<classpathentry exported="true" kind="lib" path="tools/lib/jcommon-1.0.14.jar"/>
-	<classpathentry exported="true" kind="lib" path="tools/lib/jfreechart-1.0.11.jar"/>
+	<classpathentry exported="true" kind="lib" path="tools/lib/jcommon-1.0.16.jar"/>
+	<classpathentry exported="true" kind="lib" path="tools/lib/jfreechart-1.0.13.jar"/>
 	<classpathentry exported="true" kind="lib" path="serverApps/src/web/WEB-INF/lib/commons-beanutils.jar"/>
 	<classpathentry exported="true" kind="lib" path="serverApps/src/web/WEB-INF/lib/commons-beanutils-bean-collections.jar"/>
 	<classpathentry exported="true" kind="lib" path="serverApps/src/web/WEB-INF/lib/commons-beanutils-core.jar"/>
@@ -136,6 +136,6 @@
 	<classpathentry exported="true" kind="lib" path="tools/lib/miglayout-3.7.1-swing.jar"/>
 	<classpathentry exported="true" kind="lib" path="tools/lib/payflow.jar"/>
 	<classpathentry exported="true" kind="lib" path="tools/lib/cron4j-2.2.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="JasperReportsTools/lib/jasperreports-3.7.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="JasperReportsTools/lib/jasperreports-3.7.3.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/JasperReports/build.xml b/JasperReports/build.xml
index 2563c99095..952a9d0d48 100644
--- a/JasperReports/build.xml
+++ b/JasperReports/build.xml
@@ -63,7 +63,7 @@
 	      <pathelement path="../extend/Extend.jar"/>
 	      <pathelement path="../lib/CSTools.jar"/>
 	      <pathelement path="../lib/oracle.jar"/>
-		  <pathelement path="../JasperReportsTools/lib/jasperreports-3.7.1.jar"/>
+		  <pathelement path="../JasperReportsTools/lib/jasperreports-3.7.3.jar"/>
 	      <pathelement path="../JasperReportsTools/lib/commons-digester-1.7.jar"/>
 	      <pathelement path="../tools/lib/commons-logging.jar"/>
 	      <pathelement path="../JasperReportsTools/lib/commons-beanutils-1.7.jar"/>      	
@@ -122,14 +122,14 @@
   	    </patternset>
 	</unjar>
   	<!-- futur dev jfree chart but it needs scriptlets
-  	<unjar src="../tools/lib/jfreechart-0.9.21.jar" dest="${needed.dir}" />
+  	<unjar src="../tools/lib/jfreechart-1.0.13.jar" dest="${needed.dir}" />
   	-->
   	<jar jarfile="${dist.dir}/${needed.jar.name}.jar"
 	  excludes="**/*.jbx"
 	  index="yes"
   	  duplicate="preserve">
       <fileset dir="${needed.dir}"/>
-  	  <zipfileset src="../JasperReportsTools/lib/jasperreports-3.7.1.jar" >
+  	  <zipfileset src="../JasperReportsTools/lib/jasperreports-3.7.3.jar" >
 		<patternset refid="manifest.exclude"/>
 	  </zipfileset>
   	  <zipfileset src="../JasperReportsTools/lib/commons-digester-1.7.jar" >
diff --git a/JasperReportsTools/.classpath b/JasperReportsTools/.classpath
index 2b41cf4885..90846ffdcf 100644
--- a/JasperReportsTools/.classpath
+++ b/JasperReportsTools/.classpath
@@ -16,12 +16,12 @@
 			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="lib/jasperreports-3.7.1.jar">
+	<classpathentry exported="true" kind="lib" path="lib/jasperreports-3.7.3.jar">
 		<attributes>
 			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="lib/jfreechart-1.0.3.jar">
+	<classpathentry exported="true" kind="lib" path="lib/jfreechart-1.0.13.jar">
 		<attributes>
 			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
 		</attributes>
diff --git a/base/.classpath b/base/.classpath
index 48bc6d47f0..b858a55c28 100644
--- a/base/.classpath
+++ b/base/.classpath
@@ -64,12 +64,12 @@
 			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="lib" path="/tools/lib/jcommon-1.0.14.jar">
+	<classpathentry kind="lib" path="/tools/lib/jcommon-1.0.16.jar">
 		<attributes>
 			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="lib" path="/tools/lib/jfreechart-1.0.11.jar">
+	<classpathentry kind="lib" path="/tools/lib/jfreechart-1.0.13.jar">
 		<attributes>
 			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
 		</attributes>
diff --git a/client/.classpath b/client/.classpath
index 4d8d097427..1d00251176 100644
--- a/client/.classpath
+++ b/client/.classpath
@@ -6,8 +6,8 @@
 	<classpathentry kind="src" path="/tools"/>
 	<classpathentry kind="lib" path="/tools/lib/swingx-1.6.jar"/>
 	<classpathentry kind="lib" path="/tools/lib/groovy-all-1.5.1.jar"/>
-	<classpathentry kind="lib" path="/tools/lib/jcommon-1.0.14.jar"/>
-	<classpathentry kind="lib" path="/tools/lib/jfreechart-1.0.11.jar"/>
+	<classpathentry kind="lib" path="/tools/lib/jcommon-1.0.16.jar"/>
+	<classpathentry kind="lib" path="/tools/lib/jfreechart-1.0.13.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
 	<classpathentry kind="output" path="build"/>
 </classpath>
diff --git a/client/build.xml b/client/build.xml
index 49eaad85c4..1f6304344a 100644
--- a/client/build.xml
+++ b/client/build.xml
@@ -27,8 +27,8 @@
     <pathelement path="../base/Base.jar"/>
     <pathelement path="../lib/customization.jar"/>
     <pathelement path="../lib/patches.jar"/>
-    <pathelement path="../lib/jcommon-1.0.14.jar"/>
-    <pathelement path="../lib/jfreechart-1.0.11.jar"/>
+    <pathelement path="../lib/jcommon-1.0.16.jar"/>
+    <pathelement path="../lib/jfreechart-1.0.13.jar"/>
     <pathelement path="../extend/Extend.jar"/>
     <pathelement path="../tools/lib/j2ee.jar"/>
   	<pathelement path="../tools/lib/swinglabs-0.8.0.jar"/>  	
diff --git a/posterita/.classpath b/posterita/.classpath
index 0d05af4807..b8bfb8eeed 100644
--- a/posterita/.classpath
+++ b/posterita/.classpath
@@ -8,8 +8,8 @@
 	<classpathentry kind="lib" path="posterita/web/WEB-INF/lib/displaytag-1.1.1.jar"/>
 	<classpathentry kind="lib" path="posterita/web/WEB-INF/lib/displaytag-export-poi-1.1.1.jar"/>
 	<classpathentry kind="lib" path="posterita/web/WEB-INF/lib/iText-2.1.7.jar"/>
-	<classpathentry kind="lib" path="posterita/web/WEB-INF/lib/jcommon-1.0.10.jar"/>
-	<classpathentry kind="lib" path="posterita/web/WEB-INF/lib/jfreechart-1.0.2.jar"/>
+	<classpathentry kind="lib" path="posterita/web/WEB-INF/lib/jcommon-1.0.16.jar"/>
+	<classpathentry kind="lib" path="posterita/web/WEB-INF/lib/jfreechart-1.0.13.jar"/>
 	<classpathentry kind="lib" path="posterita/web/WEB-INF/lib/poi-3.0-FINAL.jar"/>
 	<classpathentry kind="lib" path="posterita/web/WEB-INF/lib/servlet.jar"/>
 	<classpathentry kind="lib" path="posterita/web/WEB-INF/lib/struts.jar"/>
diff --git a/tools/.classpath b/tools/.classpath
index df5b456887..842f13e589 100644
--- a/tools/.classpath
+++ b/tools/.classpath
@@ -107,12 +107,12 @@
 			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="lib/jcommon-1.0.14.jar">
+	<classpathentry exported="true" kind="lib" path="lib/jcommon-1.0.16.jar">
 		<attributes>
 			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="lib/jfreechart-1.0.11.jar">
+	<classpathentry exported="true" kind="lib" path="lib/jfreechart-1.0.13.jar">
 		<attributes>
 			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
 		</attributes>
diff --git a/tools/build.xml b/tools/build.xml
index cd8515a1af..dd1bd0ef85 100644
--- a/tools/build.xml
+++ b/tools/build.xml
@@ -264,10 +264,10 @@
 				<patternset refid="manifest.exclude" />
 			</zipfileset>
 			<!-- JFreeChart			-->
-			<zipfileset src="lib/jfreechart-1.0.11.jar">
+			<zipfileset src="lib/jfreechart-1.0.13.jar">
 				<patternset refid="manifest.exclude" />
 			</zipfileset>
-			<zipfileset src="lib/jcommon-1.0.14.jar">
+			<zipfileset src="lib/jcommon-1.0.16.jar">
 				<patternset refid="manifest.exclude" />
 			</zipfileset>
 			<!-- JMS -->
@@ -402,10 +402,10 @@
 				<patternset refid="manifest.exclude" />
 			</zipfileset>
 			<!-- JFreeChart			-->
-			<zipfileset src="lib/jfreechart-1.0.11.jar">
+			<zipfileset src="lib/jfreechart-1.0.13.jar">
 				<patternset refid="manifest.exclude" />
 			</zipfileset>
-			<zipfileset src="lib/jcommon-1.0.14.jar">
+			<zipfileset src="lib/jcommon-1.0.16.jar">
 				<patternset refid="manifest.exclude" />
 			</zipfileset>
 			<!-- Graph				-->
diff --git a/zkwebui/.classpath b/zkwebui/.classpath
index 097483680f..c96756cd0f 100644
--- a/zkwebui/.classpath
+++ b/zkwebui/.classpath
@@ -25,8 +25,8 @@
 	<classpathentry kind="lib" path="/tools/lib/javaee.jar"/>
 	<classpathentry kind="lib" path="WEB-INF/lib/cglib.jar"/>
 	<classpathentry kind="lib" path="WEB-INF/lib/fckez.jar"/>
-	<classpathentry kind="lib" path="/tools/lib/jcommon-1.0.14.jar"/>
-	<classpathentry kind="lib" path="/tools/lib/jfreechart-1.0.11.jar"/>
+	<classpathentry kind="lib" path="/tools/lib/jcommon-1.0.16.jar"/>
+	<classpathentry kind="lib" path="/tools/lib/jfreechart-1.0.13.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="WEB-INF/classes"/>
 </classpath>