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
This commit is contained in:
parent
0b0ba98a98
commit
e4f4e925ff
|
@ -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/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/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/javaee.jar"/>
|
||||||
<classpathentry exported="true" kind="lib" path="tools/lib/jcommon-1.0.14.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.11.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.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-bean-collections.jar"/>
|
||||||
<classpathentry exported="true" kind="lib" path="serverApps/src/web/WEB-INF/lib/commons-beanutils-core.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/miglayout-3.7.1-swing.jar"/>
|
||||||
<classpathentry exported="true" kind="lib" path="tools/lib/payflow.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="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"/>
|
<classpathentry kind="output" path="bin"/>
|
||||||
</classpath>
|
</classpath>
|
||||||
|
|
|
@ -63,7 +63,7 @@
|
||||||
<pathelement path="../extend/Extend.jar"/>
|
<pathelement path="../extend/Extend.jar"/>
|
||||||
<pathelement path="../lib/CSTools.jar"/>
|
<pathelement path="../lib/CSTools.jar"/>
|
||||||
<pathelement path="../lib/oracle.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="../JasperReportsTools/lib/commons-digester-1.7.jar"/>
|
||||||
<pathelement path="../tools/lib/commons-logging.jar"/>
|
<pathelement path="../tools/lib/commons-logging.jar"/>
|
||||||
<pathelement path="../JasperReportsTools/lib/commons-beanutils-1.7.jar"/>
|
<pathelement path="../JasperReportsTools/lib/commons-beanutils-1.7.jar"/>
|
||||||
|
@ -122,14 +122,14 @@
|
||||||
</patternset>
|
</patternset>
|
||||||
</unjar>
|
</unjar>
|
||||||
<!-- futur dev jfree chart but it needs scriptlets
|
<!-- 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"
|
<jar jarfile="${dist.dir}/${needed.jar.name}.jar"
|
||||||
excludes="**/*.jbx"
|
excludes="**/*.jbx"
|
||||||
index="yes"
|
index="yes"
|
||||||
duplicate="preserve">
|
duplicate="preserve">
|
||||||
<fileset dir="${needed.dir}"/>
|
<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"/>
|
<patternset refid="manifest.exclude"/>
|
||||||
</zipfileset>
|
</zipfileset>
|
||||||
<zipfileset src="../JasperReportsTools/lib/commons-digester-1.7.jar" >
|
<zipfileset src="../JasperReportsTools/lib/commons-digester-1.7.jar" >
|
||||||
|
|
|
@ -16,12 +16,12 @@
|
||||||
<attribute name="org.eclipse.jst.component.dependency" value="../"/>
|
<attribute name="org.eclipse.jst.component.dependency" value="../"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
</classpathentry>
|
</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>
|
<attributes>
|
||||||
<attribute name="org.eclipse.jst.component.dependency" value="../"/>
|
<attribute name="org.eclipse.jst.component.dependency" value="../"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
</classpathentry>
|
</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>
|
<attributes>
|
||||||
<attribute name="org.eclipse.jst.component.dependency" value="../"/>
|
<attribute name="org.eclipse.jst.component.dependency" value="../"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
|
|
|
@ -64,12 +64,12 @@
|
||||||
<attribute name="org.eclipse.jst.component.dependency" value="../"/>
|
<attribute name="org.eclipse.jst.component.dependency" value="../"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
</classpathentry>
|
</classpathentry>
|
||||||
<classpathentry kind="lib" path="/tools/lib/jcommon-1.0.14.jar">
|
<classpathentry kind="lib" path="/tools/lib/jcommon-1.0.16.jar">
|
||||||
<attributes>
|
<attributes>
|
||||||
<attribute name="org.eclipse.jst.component.dependency" value="../"/>
|
<attribute name="org.eclipse.jst.component.dependency" value="../"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
</classpathentry>
|
</classpathentry>
|
||||||
<classpathentry kind="lib" path="/tools/lib/jfreechart-1.0.11.jar">
|
<classpathentry kind="lib" path="/tools/lib/jfreechart-1.0.13.jar">
|
||||||
<attributes>
|
<attributes>
|
||||||
<attribute name="org.eclipse.jst.component.dependency" value="../"/>
|
<attribute name="org.eclipse.jst.component.dependency" value="../"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
|
|
|
@ -6,8 +6,8 @@
|
||||||
<classpathentry kind="src" path="/tools"/>
|
<classpathentry kind="src" path="/tools"/>
|
||||||
<classpathentry kind="lib" path="/tools/lib/swingx-1.6.jar"/>
|
<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/groovy-all-1.5.1.jar"/>
|
||||||
<classpathentry kind="lib" path="/tools/lib/jcommon-1.0.14.jar"/>
|
<classpathentry kind="lib" path="/tools/lib/jcommon-1.0.16.jar"/>
|
||||||
<classpathentry kind="lib" path="/tools/lib/jfreechart-1.0.11.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="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
|
||||||
<classpathentry kind="output" path="build"/>
|
<classpathentry kind="output" path="build"/>
|
||||||
</classpath>
|
</classpath>
|
||||||
|
|
|
@ -27,8 +27,8 @@
|
||||||
<pathelement path="../base/Base.jar"/>
|
<pathelement path="../base/Base.jar"/>
|
||||||
<pathelement path="../lib/customization.jar"/>
|
<pathelement path="../lib/customization.jar"/>
|
||||||
<pathelement path="../lib/patches.jar"/>
|
<pathelement path="../lib/patches.jar"/>
|
||||||
<pathelement path="../lib/jcommon-1.0.14.jar"/>
|
<pathelement path="../lib/jcommon-1.0.16.jar"/>
|
||||||
<pathelement path="../lib/jfreechart-1.0.11.jar"/>
|
<pathelement path="../lib/jfreechart-1.0.13.jar"/>
|
||||||
<pathelement path="../extend/Extend.jar"/>
|
<pathelement path="../extend/Extend.jar"/>
|
||||||
<pathelement path="../tools/lib/j2ee.jar"/>
|
<pathelement path="../tools/lib/j2ee.jar"/>
|
||||||
<pathelement path="../tools/lib/swinglabs-0.8.0.jar"/>
|
<pathelement path="../tools/lib/swinglabs-0.8.0.jar"/>
|
||||||
|
|
|
@ -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-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/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/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/jcommon-1.0.16.jar"/>
|
||||||
<classpathentry kind="lib" path="posterita/web/WEB-INF/lib/jfreechart-1.0.2.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/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/servlet.jar"/>
|
||||||
<classpathentry kind="lib" path="posterita/web/WEB-INF/lib/struts.jar"/>
|
<classpathentry kind="lib" path="posterita/web/WEB-INF/lib/struts.jar"/>
|
||||||
|
|
|
@ -107,12 +107,12 @@
|
||||||
<attribute name="org.eclipse.jst.component.dependency" value="../"/>
|
<attribute name="org.eclipse.jst.component.dependency" value="../"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
</classpathentry>
|
</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>
|
<attributes>
|
||||||
<attribute name="org.eclipse.jst.component.dependency" value="../"/>
|
<attribute name="org.eclipse.jst.component.dependency" value="../"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
</classpathentry>
|
</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>
|
<attributes>
|
||||||
<attribute name="org.eclipse.jst.component.dependency" value="../"/>
|
<attribute name="org.eclipse.jst.component.dependency" value="../"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
|
|
|
@ -264,10 +264,10 @@
|
||||||
<patternset refid="manifest.exclude" />
|
<patternset refid="manifest.exclude" />
|
||||||
</zipfileset>
|
</zipfileset>
|
||||||
<!-- JFreeChart -->
|
<!-- JFreeChart -->
|
||||||
<zipfileset src="lib/jfreechart-1.0.11.jar">
|
<zipfileset src="lib/jfreechart-1.0.13.jar">
|
||||||
<patternset refid="manifest.exclude" />
|
<patternset refid="manifest.exclude" />
|
||||||
</zipfileset>
|
</zipfileset>
|
||||||
<zipfileset src="lib/jcommon-1.0.14.jar">
|
<zipfileset src="lib/jcommon-1.0.16.jar">
|
||||||
<patternset refid="manifest.exclude" />
|
<patternset refid="manifest.exclude" />
|
||||||
</zipfileset>
|
</zipfileset>
|
||||||
<!-- JMS -->
|
<!-- JMS -->
|
||||||
|
@ -402,10 +402,10 @@
|
||||||
<patternset refid="manifest.exclude" />
|
<patternset refid="manifest.exclude" />
|
||||||
</zipfileset>
|
</zipfileset>
|
||||||
<!-- JFreeChart -->
|
<!-- JFreeChart -->
|
||||||
<zipfileset src="lib/jfreechart-1.0.11.jar">
|
<zipfileset src="lib/jfreechart-1.0.13.jar">
|
||||||
<patternset refid="manifest.exclude" />
|
<patternset refid="manifest.exclude" />
|
||||||
</zipfileset>
|
</zipfileset>
|
||||||
<zipfileset src="lib/jcommon-1.0.14.jar">
|
<zipfileset src="lib/jcommon-1.0.16.jar">
|
||||||
<patternset refid="manifest.exclude" />
|
<patternset refid="manifest.exclude" />
|
||||||
</zipfileset>
|
</zipfileset>
|
||||||
<!-- Graph -->
|
<!-- Graph -->
|
||||||
|
|
|
@ -25,8 +25,8 @@
|
||||||
<classpathentry kind="lib" path="/tools/lib/javaee.jar"/>
|
<classpathentry kind="lib" path="/tools/lib/javaee.jar"/>
|
||||||
<classpathentry kind="lib" path="WEB-INF/lib/cglib.jar"/>
|
<classpathentry kind="lib" path="WEB-INF/lib/cglib.jar"/>
|
||||||
<classpathentry kind="lib" path="WEB-INF/lib/fckez.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/jcommon-1.0.16.jar"/>
|
||||||
<classpathentry kind="lib" path="/tools/lib/jfreechart-1.0.11.jar"/>
|
<classpathentry kind="lib" path="/tools/lib/jfreechart-1.0.13.jar"/>
|
||||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
|
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
|
||||||
<classpathentry kind="output" path="WEB-INF/classes"/>
|
<classpathentry kind="output" path="WEB-INF/classes"/>
|
||||||
</classpath>
|
</classpath>
|
||||||
|
|
Loading…
Reference in New Issue