You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by tv...@apache.org on 2009/04/16 23:33:29 UTC
svn commit: r765770 - in /incubator/pivot/trunk: build.xml
charts/lib/jcommon-1.0.12.jar charts/lib/jfreechart-1.0.9.jar
charts/src/META-INF/ charts/src/pivot/charts/skin/
Author: tvolkert
Date: Thu Apr 16 21:33:28 2009
New Revision: 765770
URL: http://svn.apache.org/viewvc?rev=765770&view=rev
Log:
Removed JFreeChart provider and associated files - it's been moved to Google Code to free us from any licensing issues
Removed:
incubator/pivot/trunk/charts/lib/jcommon-1.0.12.jar
incubator/pivot/trunk/charts/lib/jfreechart-1.0.9.jar
incubator/pivot/trunk/charts/src/META-INF/
incubator/pivot/trunk/charts/src/pivot/charts/skin/
Modified:
incubator/pivot/trunk/build.xml
Modified: incubator/pivot/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/build.xml?rev=765770&r1=765769&r2=765770&view=diff
==============================================================================
--- incubator/pivot/trunk/build.xml (original)
+++ incubator/pivot/trunk/build.xml Thu Apr 16 21:33:28 2009
@@ -68,8 +68,7 @@
<fileset dir="wtk/lib" includes="**/*.jar"/>
<fileset dir="web/lib" includes="**/*.jar"/>
</classpath>
- <packageset dir="charts/src" includes="**/*"
- excludes="pivot/charts/skin/**"/>
+ <packageset dir="charts/src" includes="**/*"/>
<packageset dir="core/src" includes="**/*"/>
<packageset dir="web/src" includes="**/*"/>
<packageset dir="wtk/src" includes="**/*"/>
@@ -105,7 +104,7 @@
<classpath>
<pathelement location="core/${folder.bin}"/>
<pathelement location="wtk/${folder.bin}"/>
- <fileset dir="charts/lib" includes="**.*.jar"/>
+ <fileset dir="charts/lib" includes="**/*.jar"/>
</classpath>
</javac>
</target>
@@ -121,30 +120,8 @@
<attribute name="Implementation-Title" value="Apache Pivot Charts"/>
<attribute name="Implementation-Version" value="${version}"/>
</manifest>
- <fileset dir="charts/${folder.bin}">
- <exclude name="pivot/charts/skin/**"/>
- </fileset>
+ <fileset dir="charts/${folder.bin}"/>
<fileset dir="charts/src">
- <exclude name="pivot/charts/skin/**"/>
- <exclude name="META-INF/**"/>
- <exclude name="**/*.java"/>
- <exclude name="**/package.html"/>
- </fileset>
- </jar>
-
- <jar jarfile="${folder.lib}/${ant.project.name}-charts.jfree.jar">
- <manifest>
- <attribute name="Sealed" value="true"/>
- <attribute name="Built-On" value="${DSTAMP}-${TSTAMP}"/>
- <attribute name="Implementation-Title" value="Apache Pivot JFree Chart Provider"/>
- <attribute name="Implementation-Version" value="1.0"/>
- </manifest>
- <fileset dir="charts/${folder.bin}">
- <include name="pivot/charts/skin/**"/>
- </fileset>
- <fileset dir="charts/src">
- <include name="pivot/charts/skin/**"/>
- <include name="META-INF/**"/>
<exclude name="**/*.java"/>
<exclude name="**/package.html"/>
</fileset>
@@ -608,12 +585,6 @@
<exclude name="${folder.doc}/**"/>
<exclude name="${folder.install}/**"/>
<exclude name="${folder.lib}/**"/>
-
- <!-- Exclude JFree dependencies -->
- <exclude name="charts/src/pivot/charts/skin/**"/>
- <exclude name="charts/src/META-INF/**"/>
- <exclude name="charts/lib/jcommon*.jar"/>
- <exclude name="charts/lib/jfreechart*.jar"/>
</fileset>
</copy>