You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by jm...@apache.org on 2013/10/08 16:03:52 UTC
[37/62] [abbrv] [partial] Merged Apache Flex 4.9.0 release branch
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/modules/compiler/src/java/flash/css/StyleRule.java
----------------------------------------------------------------------
diff --git a/modules/compiler/src/java/flash/css/StyleRule.java b/modules/compiler/src/java/flash/css/StyleRule.java
index d3510f5..1bd5664 100644
--- a/modules/compiler/src/java/flash/css/StyleRule.java
+++ b/modules/compiler/src/java/flash/css/StyleRule.java
@@ -19,7 +19,7 @@
package flash.css;
-import org.w3c.flex.forks.css.sac.SelectorList;
+import org.w3c.css.sac.SelectorList;
/**
* Represents a CSS style rule.
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/modules/compiler/src/java/flash/svg/SpriteTranscoder.java
----------------------------------------------------------------------
diff --git a/modules/compiler/src/java/flash/svg/SpriteTranscoder.java b/modules/compiler/src/java/flash/svg/SpriteTranscoder.java
index 24bd13d..d48e43f 100644
--- a/modules/compiler/src/java/flash/svg/SpriteTranscoder.java
+++ b/modules/compiler/src/java/flash/svg/SpriteTranscoder.java
@@ -1,22 +1,22 @@
/* this file based on Batik's ImageTranscoder class, which is ... */
/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
*/
package flash.svg;
@@ -44,7 +44,8 @@ import org.apache.flex.forks.batik.gvt.text.Mark;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.DOMImplementation;
-import org.w3c.flex.forks.dom.svg.SVGAElement;
+import org.w3c.dom.svg.SVGAElement;
+import org.w3c.dom.svg.SVGDocument;
import java.awt.Dimension;
import java.awt.Cursor;
@@ -559,6 +560,11 @@ public class SpriteTranscoder extends XMLAbstractTranscoder
scripts.addElement(st.nextToken());
}
}
+
+ public SVGDocument getBrokenLinkDocument(Element e, String url, String message)
+ {
+ return null;
+ }
}
@@ -572,7 +578,7 @@ public class SpriteTranscoder extends XMLAbstractTranscoder
static
{
FEATURES.add(SVGConstants.SVG_ORG_W3C_SVG_FEATURE);
- FEATURES.add(SVGConstants.SVG_ORG_W3C_SVG_LANG_FEATURE);
+ //FEATURES.add(SVGConstants.SVG_ORG_W3C_SVG_LANG_FEATURE);
FEATURES.add(SVGConstants.SVG_ORG_W3C_SVG_STATIC_FEATURE);
}
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/modules/compiler/src/java/flex2/compiler/css/StyleDef.java
----------------------------------------------------------------------
diff --git a/modules/compiler/src/java/flex2/compiler/css/StyleDef.java b/modules/compiler/src/java/flex2/compiler/css/StyleDef.java
index 5fd6717..7b77f46 100644
--- a/modules/compiler/src/java/flex2/compiler/css/StyleDef.java
+++ b/modules/compiler/src/java/flex2/compiler/css/StyleDef.java
@@ -46,7 +46,7 @@ import java.util.Map.Entry;
import macromedia.asc.util.ContextStatics;
-import org.w3c.flex.forks.css.sac.LexicalUnit;
+import org.w3c.css.sac.LexicalUnit;
/**
* A helper class to aggregate style declarations for a particular subject
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/modules/compiler/src/java/flex2/compiler/css/StyleModule.java
----------------------------------------------------------------------
diff --git a/modules/compiler/src/java/flex2/compiler/css/StyleModule.java b/modules/compiler/src/java/flex2/compiler/css/StyleModule.java
index bf7c770..4ae70f4 100644
--- a/modules/compiler/src/java/flex2/compiler/css/StyleModule.java
+++ b/modules/compiler/src/java/flex2/compiler/css/StyleModule.java
@@ -46,15 +46,15 @@ import java.util.Map;
import java.util.Set;
import org.apache.flex.forks.batik.css.parser.AbstractSelector;
-import org.w3c.flex.forks.css.sac.AttributeCondition;
-import org.w3c.flex.forks.css.sac.CombinatorCondition;
-import org.w3c.flex.forks.css.sac.Condition;
-import org.w3c.flex.forks.css.sac.ConditionalSelector;
-import org.w3c.flex.forks.css.sac.DescendantSelector;
-import org.w3c.flex.forks.css.sac.ElementSelector;
-import org.w3c.flex.forks.css.sac.Selector;
-import org.w3c.flex.forks.css.sac.SelectorList;
-import org.w3c.flex.forks.css.sac.SimpleSelector;
+import org.w3c.css.sac.AttributeCondition;
+import org.w3c.css.sac.CombinatorCondition;
+import org.w3c.css.sac.Condition;
+import org.w3c.css.sac.ConditionalSelector;
+import org.w3c.css.sac.DescendantSelector;
+import org.w3c.css.sac.ElementSelector;
+import org.w3c.css.sac.Selector;
+import org.w3c.css.sac.SelectorList;
+import org.w3c.css.sac.SimpleSelector;
import macromedia.asc.util.ContextStatics;
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/modules/downloads.xml
----------------------------------------------------------------------
diff --git a/modules/downloads.xml b/modules/downloads.xml
index 31288cc..e097563 100644
--- a/modules/downloads.xml
+++ b/modules/downloads.xml
@@ -38,7 +38,7 @@
<property name="download.dir" value="${FLEX_HOME}/in"/>
- <property name="batik.zip.dir" value="batik-1.6"/>
+ <property name="batik.zip.dir" value="batik-1.7"/>
<property name="batik.dir" value="thirdparty/batik"/>
<property name="velocity.zip.dir" value="velocity-1.4"/>
<property name="velocity.dir" value="thirdparty/velocity"/>
@@ -105,8 +105,13 @@
</fileset>
</delete>
- <delete dir="${lib.ext.dir}" failonerror="false"/>
- <delete dir="${lib.opt.dir}" failonerror="false"/>
+ <delete includeEmptyDirs="true" failonerror="false">
+ <fileset dir="${lib.ext.dir}">
+ <include name="*/**"/>
+ <!-- don't delete optional dir since this file doesn't populate it -->
+ <exclude name="optional/**"/>
+ </fileset>
+ </delete>
</target>
<!--
@@ -133,8 +138,9 @@
description="Downloads tar/zip, and optionally verifies checksum and copies extracted jar.">
<mkdir dir="${download.dir}"/>
-
- <get src="${srcUrl}/${zipFile}" dest="${download.dir}/${zipFile}"/>
+
+ <available file="${download.dir}/${zipFile}" property="zip.exists"/>
+ <antcall target="get-zip"/>
<condition property="zip.compressed">
<matches string="${zipFile}" pattern="^*.zip$"/>
@@ -143,10 +149,6 @@
<antcall target="untar-file"/>
<antcall target="unzip-file"/>
- <antcall target="check-sum">
- <param name="message" value="Checksum mismatch for ${download.dir}/${zipFile}"/>
- </antcall>
-
<condition property="destination.known">
<and>
<isset property="srcJarPath"/>
@@ -156,6 +158,14 @@
<antcall target="copy-downloaded-jar"/>
</target>
+ <target name="get-zip" unless="zip.exists" description="Get zip and verify checksum.">
+ <get src="${srcUrl}/${zipFile}" dest="${download.dir}/${zipFile}"/>
+
+ <antcall target="check-sum">
+ <param name="message" value="Checksum mismatch for ${download.dir}/${zipFile}"/>
+ </antcall>
+ </target>
+
<!--
Download a jar file and optionally verify the checksum.
If the checksum fails, this script fails.
@@ -195,10 +205,15 @@
</sequential>
</macrodef>
- <target name="check-sum" if="md5"
+ <target name="check-sum" if="md5"
description="Verifies MD5 checksum, and fails if checksum doesn't match">
- <checksum file="${download.dir}/${zipFile}" algorithm="MD5" property="${we.failed}"/>
+ <checksum file="${download.dir}/${zipFile}" algorithm="MD5" property="${md5}" verifyProperty="isMD5ok"/>
+
+ <condition property="we.failed">
+ <isfalse value="${isMD5ok}"/>
+ </condition>
+
<antcall target="fail-with-message">
<param name="message" value="${message}"/>
</antcall>
@@ -218,59 +233,60 @@
batik - SVG toolkit - need the jars for our forked version
-->
- <target name="batik-zip-check" description="Checks if batik expanded zip exists.">
- <condition property="batik.zip.exists">
- <and>
- <available file="${download.dir}/${batik.zip.dir}/lib/js.jar"/>
- <available file="${download.dir}/${batik.zip.dir}/lib/pdf-transcoder.jar"/>
- <available file="${download.dir}/${batik.zip.dir}/lib/xerces_2_5_0.jar"/>
- <available file="${download.dir}/${batik.zip.dir}/lib/xml-apis.jar"/>
- </and>
- </condition>
- </target>
-
<target name="batik-jars-check" description="Checks if batik jars exists.">
- <condition property="batik.jars.exists">
- <and>
- <available file="${basedir}/${batik.dir}/lib/js.jar"/>
- <available file="${basedir}/${batik.dir}/lib/pdf-transcoder.jar"/>
- <available file="${basedir}/${batik.dir}/lib/xerces_2_5_0.jar"/>
- <available file="${basedir}/${batik.dir}/lib/xml-apis.jar"/>
+ <condition property="batik.jars.exists">
+ <and>
+ <!-- this implies the lib dir and its jars also exist -->
+ <available file="${basedir}/${batik.dir}/lib/build" type="dir" />
+ <available file="${lib.ext.dir}/xml-apis-ext.jar"/>
</and>
- </condition>
+ </condition>
</target>
<target name="batik-jars" depends="batik-jars-check" unless="batik.jars.exists"
description="Copies the batik jars to the batik build directory.">
- <antcall target="batik-download-zip"/>
+ <antcall target="download-zip">
+ <param name="srcUrl" value="http://archive.apache.org/dist/xmlgraphics/batik"/>
+ <param name="zipFile" value="batik-src-1.7.zip"/>
+ <param name="md5" value="c117ca2241907f62a2b3031167ebf917"/>
+ </antcall>
+
+ <!--
+ Make sure any left-over batik 1.6 libraries are removed to avoid compile errors.
+ (super-clean/batik-jars-clean would take also take care of this.)
+ -->
+ <delete dir="${basedir}/${batik.dir}/lib/**" failonerror="false"/>
+
<copy todir="${basedir}/${batik.dir}/lib" failonerror="true">
<fileset dir="${download.dir}/${batik.zip.dir}/lib">
<include name="**/**"/>
</fileset>
</copy>
+
+ <!-- Copy the unique runtime jars to the lib directory. -->
+ <!-- Also need xalan, xerces and xml-api jars. -->
+ <copy todir="${lib.ext.dir}" failonerror="true" verbose="true">
+ <fileset dir="${download.dir}/${batik.zip.dir}/lib">
+ <include name="xml-apis-ext.jar"/>
+ <include name="LICENSE.xml-apis-ext*"/>
+ <include name="README.xml-apis-ext*"/>
+ </fileset>
+ </copy>
+
<delete dir="${download.dir}/${batik.zip.dir}"/>
</target>
- <target name="batik-download-zip" depends="batik-zip-check" unless="batik.zip.exists"
- description="Downloads the batik jars.">
-
- <antcall target="download-zip">
- <param name="srcUrl" value="http://archive.apache.org/dist/xmlgraphics/batik"/>
- <param name="zipFile" value="${batik.zip.dir}.zip"/>
- <param name="md5" value="edff288fc64f968ff96ca49763d50f3c"/>
- </antcall>
- </target>
-
<target name="batik-jars-clean">
- <delete includeEmptyDirs="true" failonerror="fasle">
+ <!-- leave the lib directory itself since batik build.xml expects it -->
+ <delete includeEmptyDirs="true" failonerror="false">
<fileset dir="${basedir}/${batik.dir}/lib">
<include name="**/**"/>
</fileset>
</delete>
<delete includeEmptyDirs="true" failonerror="fasle">
<fileset dir="${download.dir}">
- <include name="${batik.zip.dir}*/**"/>
+ <include name="batik*/**"/>
</fileset>
</delete>
</target>
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/modules/fxgutils/src/java/com/adobe/internal/fxg/dom/types/BlendMode.java
----------------------------------------------------------------------
diff --git a/modules/fxgutils/src/java/com/adobe/internal/fxg/dom/types/BlendMode.java b/modules/fxgutils/src/java/com/adobe/internal/fxg/dom/types/BlendMode.java
index 76d1969..5c64a9a 100644
--- a/modules/fxgutils/src/java/com/adobe/internal/fxg/dom/types/BlendMode.java
+++ b/modules/fxgutils/src/java/com/adobe/internal/fxg/dom/types/BlendMode.java
@@ -57,7 +57,7 @@ package com.adobe.internal.fxg.dom.types;
* luminosity
* </pre>
*
- * The following was introduced in FXG 2.0 which acts like blendMode=�layer� except when alpha is 0 or 1, in which case it acts like blendMode=�normal�
+ * The following was introduced in FXG 2.0 which acts like blendMode=îlayerî except when alpha is 0 or 1, in which case it acts like blendMode=înormalî
* <pre>
* auto
* </pre>
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/modules/thirdparty/batik/MAINTAIN
----------------------------------------------------------------------
diff --git a/modules/thirdparty/batik/MAINTAIN b/modules/thirdparty/batik/MAINTAIN
deleted file mode 100644
index 221a400..0000000
--- a/modules/thirdparty/batik/MAINTAIN
+++ /dev/null
@@ -1,182 +0,0 @@
-################################################################################
-##
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements. See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License. You may obtain a copy of the License at
-##
-## http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-##
-################################################################################
-
- Project Maintanance Howto
- -------------------------
-
-This document introduces newcomers to the management and maintenance of
-the Batik project hosted under xml.apache.org (http://xml.apache.org/batik).
-
-Each project is required to use Ant as build tool and to be coherent with the
-rest of the build systems of the other projects, so that nightly builds and
-distribution creation can be done automatically without per-project scripts.
-
-This implies it is *very* important that properties names are not changed
-but kept consistent with the other projects.
-
-Distribution Creation
----------------------
-
-For creating a distribution the following steps must be done:
-
- 1) Modify build.xml with the distribution version. Only modify the version
- for main releases (e.g. version value="1.1") but not for release
- candidates or beta versions where only the revision type and
- number should be updated(e.g. revisionType value="beta" and
- revisionNumber value="3")
-
- 2) Add your public key to the KEYS file in the root directory of
- Batik if it isn't already there. The following link has the
- details on what this means and how to do it.
-
- http://nagoya.apache.org/wiki/apachewiki.cgi?SigningReleases
-
- 3) Update the splash screens:
- build splash
-
- 4) Commit these changes to CVS, in general only the following files
- should be modified:
-
- build.xml
- KEYS
- xdocs/images/splash.png
- xdocs/images/splash.svg
- resources/org/apache/batik/apps/svgbrowser/resources/squiggle.png
-
- 5) tag the release on CVS:
- cvs rtag <tag> <module>
- e.g., cvs rtag batik-1_1rc3 xml-batik.
- Note: sometimes, it is necessary to remove a tag because the
- tests failed and a fix was required. To remove a tag, use
- the rtag command:
- cvs rtag -d <tag> <module>
- e.g., cvs rtag -d batik-1_1rc3 xml-batik
-
- 6) checkout the tagged release to a new directory:
- cvs co -r <tag> xml-batik
- e.g., cvs co -r batik-1_1rc3 xml-batik
-
- 7) run the build script with target "dist-zip"
- build dist-zip
- this will create the binary release zip, the source release zip and the
- javadoc zip.
-
- 8) test the distributions
- build regard
- build regard.manual
- The build results are in xml-batik/test-reports. Check that there
- are no show-stoppers for the release. If there are fixes required,
- you need to remove the tag (as explained in step 2) and then fix
- any problem that requires attention. Then, you need to start at
- step 1) again.
-
- Note that you will need to have a copy of the W3C SVG
- working group test suite in the 'beSuite' directory and
- have that directory under the same root as xml-batik. See
- http://www.w3.org/Graphics/SVG for instructions on how to get
- the SVG test suite.
-
- 9) Update the README file describing the content of the release and
- the modifications which have taken place:
- http://xml.apache.org/batik/dist/README
-
-10) If you are creating a release candidate, rename the distribution files
- to an rc name. For example:
- mv batik-src-1.1.zip batik-src-1.1rc1.zip
-
-11) Sign and create md5 hashes for the releases. The following link
- has full details on how to sign things (if you don't want to know
- anything the last section 'Using GPG' tells you what commands work).
-
- http://nagoya.apache.org/wiki/apachewiki.cgi?SigningReleases
-
- e.g. gpg --detach-sig --armor --output batik-1.5.zip.asc batik-1.5.zip
- md5 batik-1.5.zip > batik-1.5.zip.md5
-
-11) Use 'scp' to copy the distributions (with md5 hashes, and signature
- files), the README, and the KEYS file under
- /www/www.apache.org/dist/xml/batik/
-
- e.g., 'scp batik-1.1rc1.zip* vhardy@xml.apache.org:/www/www.apache.org/dist/xml/batik/'
-
-11) Finish setting up the distribution directory in accordance with:
-
- http://www.apache.org/dev/mirrors.html
- http://cvs.apache.org/~bodewig/mirror.html
-
- This makes sure that the distribution is mirrored nicely around
- the world.
-
- Start by logging into cvs.apache.org (e.g. 'ssh vhardy@cvs.apache.org').
-
- First make sure file permissions are correct. The
- new files should be owned by group 'xml' and be group writable.
- The following commands can do this (don't worry about links):
- chgrp xml batik-1.5.zip
- chmod 664 batik-1.5.zip
-
- If you are making a 'final' release you should delete the existing
- 'current' links and re-point them at the new release (do this
- for every file with a version number in it - including md5, and
- asc files):
- cd /www/www.apache.org/dist/xml/batik
- rm batik-current.zip
- ln -s batik-1.5.zip batik-current.zip
- rm batik-current.zip.md5
- ln -s batik-1.5.zip.md5 batik-current.zip.md5
- rm batik-current.zip.asc
- ln -s batik-1.5.zip.asc batik-current.zip.asc
- <- lots more files ->
-
- Finally remove the old releases (every release is automatically copied
- to 'archives.apache.org/dist/xml/batik' from
- 'www.apache.org/dist/xml/batik' so you can just remove an old
- release from www.apache.org:
- rm batik-1.5b4.zip
-
-10) Wait approximately 24hrs for the files to get to all the mirrors,
- then send an email to the batik-dev and batik-users mailing lists
- announcing the release.
-
-Site Creation
--------------
-
-For creating the web site, the following steps must be done:
-
-[Note: due to JVM font-rendering problems, this is best done on a windows machine]
-
- 1) make sure you checked out the module "xml-site/targets/batik" in
- the same directory as your project module
- 2) run the build script with target "site"
- 3) commit the xml-site/targets/[project] directory
- 4) connect to xml.apache.org with your account
- 5) execute "cd /www/xml.apache.org/[project]"
- 6) execute "cvs update"
- 7) zip the Batik javadoc of the latest stable Batik release
- 8) ftp the Batik javadoc to xml.apache.org/batik
- 9) upzip the Batik java so that the javadoc is available
- at xml.apache.org/batik/javadoc/index.html
-
-[NOTE: you must have commit access on xml-site to be able to do this]
-
-Nightly Builds
---------------
-
-The nightly builds are current performed by a crontab entry in
-Thomas DeWeese's cvs.apache.org account: /home/deweese/bin/nightly.csh
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/modules/thirdparty/batik/NOTICE
----------------------------------------------------------------------
diff --git a/modules/thirdparty/batik/NOTICE b/modules/thirdparty/batik/NOTICE
index 6feaada..662188f 100644
--- a/modules/thirdparty/batik/NOTICE
+++ b/modules/thirdparty/batik/NOTICE
@@ -1,8 +1,18 @@
-This product includes software developed by
+Apache Batik
+Copyright 1999-2007 The Apache Software Foundation
+
+This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
This software contains code from the World Wide Web Consortium (W3C) for the
Document Object Model API (DOM API) and SVG Document Type Definition (DTD).
-This software contains code from the International Organisation for Standardization
-for the definition of character entities used in the software's documentation.
+This software contains code from the International Organisation for
+Standardization for the definition of character entities used in the software's
+documentation.
+
+This product includes images from the Tango Desktop Project
+(http://tango.freedesktop.org/).
+
+This product includes images from the Pasodoble Icon Theme
+(http://www.jesusda.com/projects/pasodoble).
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/modules/thirdparty/batik/README
----------------------------------------------------------------------
diff --git a/modules/thirdparty/batik/README b/modules/thirdparty/batik/README
index 1119a0d..f855cb6 100644
--- a/modules/thirdparty/batik/README
+++ b/modules/thirdparty/batik/README
@@ -37,7 +37,7 @@
------------
The home page for the Apache Batik project can be found in the Apache XML
- Project web site (http://xml.apache.org/batik/). There you also find
+ Project web site (http://xmlgraphics.apache.org/batik/). There you also find
information on how to download the latest release as well as all the other
information you might need regarding this project.
@@ -51,25 +51,27 @@
------------------
By default, Batik includes a scripting engine for ECMAScript. It is possible
- to add support for additional scripting languages (Python and TCL)
+ to add support for additional scripting languages (Python and TCL).
- See : http://xml.apache.org/batik/install.html#optionalComponents for details.
+ See http://xmlgraphics.apache.org/batik/install.html#optionalComponents for
+ details.
Installation Instructions and Documentation
-------------------------------------------
- Read the Install page at http://xml.apache.org/batik for the installation instructions.
+ Read the Install page at http://xmlgraphics.apache.org/batik/install.html
+ for the installation instructions.
Look for the most updated documentation on the Apache Batik web site under
- the Apache XML Project (http://xml.apache.org/batik/).
+ the Apache XML Graphics Project (http://xmlgraphics.apache.org/batik/).
Licensing and legal issues
--------------------------
- For legal and licensing issues, please read the LICENSE file.
+ For legal and licensing issues, please read the LICENSE and NOTICE files.
Thanks for using Apache Batik.
- The Apache XML Project
- http://xml.apache.org/
+ The Apache XML Graphics Project
+ http://xmlgraphics.apache.org/
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/modules/thirdparty/batik/build.bat
----------------------------------------------------------------------
diff --git a/modules/thirdparty/batik/build.bat b/modules/thirdparty/batik/build.bat
deleted file mode 100644
index e46e18e..0000000
--- a/modules/thirdparty/batik/build.bat
+++ /dev/null
@@ -1,53 +0,0 @@
-@echo off
-:: ----------------------------------------------------------------------------
-:: Copyright 2000-2003 The Apache Software Foundation
-::
-:: Licensed under the Apache License, Version 2.0 (the "License");
-:: you may not use this file except in compliance with the License.
-:: You may obtain a copy of the License at
-::
-:: http://www.apache.org/licenses/LICENSE-2.0
-::
-:: Unless required by applicable law or agreed to in writing, software
-:: distributed under the License is distributed on an "AS IS" BASIS,
-:: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-:: See the License for the specific language governing permissions and
-:: limitations under the License.
-::
-:: build.bat - Win32 Build Script for Apache Batik
-::
-:: $Id$
-:: ----------------------------------------------------------------------------
-
-:: ----- Verify and Set Required Environment Variables ------------------------
-
-if not "%JAVA_HOME%" == "" goto gotJavaHome
-echo You must set JAVA_HOME to point at your Java Development Kit installation
-goto cleanup
-:gotJavaHome
-
-if not "%ANT_HOME%" == "" goto gotAntHome
-
-:: ----- Set Up The Runtime Classpath -----------------------------------------
-
-
-set CP=%JAVA_HOME%\lib\tools.jar;lib\build\ant_1_4_1.jar;.\lib\build\crimson-ant.jar;.\lib\build\jaxp.jar
-
-
-:: ----- Execute The Requested Build ------------------------------------------
-
-%JAVA_HOME%\bin\java.exe %ANT_OPTS% -classpath %CP% org.apache.tools.ant.Main -emacs -Dant.home=. %1 -Dargs="%2 %3 %4 %5 %6 %7 %8 %9"
-
-:: ----- Cleanup the environment ----------------------------------------------
-
-goto cleanup
-
-:gotAntHome
-
-call ant -Dargs="%2 %3 %4 %5 %6 %7 %8 %9" %1
-
-goto cleanup
-
-:cleanup
-set CP=
-
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f690ea2f/modules/thirdparty/batik/build.sh
----------------------------------------------------------------------
diff --git a/modules/thirdparty/batik/build.sh b/modules/thirdparty/batik/build.sh
deleted file mode 100644
index 52523c6..0000000
--- a/modules/thirdparty/batik/build.sh
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/sh
-# -----------------------------------------------------------------------------
-# Copyright 2000-2001,2003 The Apache Software Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# build.sh - Unix Build Script for Apache Batik
-#
-# $Id$
-# -----------------------------------------------------------------------------
-
-# ----- Verify and Set Required Environment Variables -------------------------
-
-if [ "$ANT_HOME" = "" ] ; then
- ANT_HOME=.
-fi
-
-if [ "$JAVA_HOME" = "" ] ; then
- echo You must set JAVA_HOME to point at your Java Development Kit installation
- exit 1
-fi
-
-# OS specific support. $var _must_ be set to either true or false.
-cygwin=false;
-case "`uname`" in
- CYGWIN*) cygwin=true ;;
-esac
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched
-if $cygwin ; then
- [ -n "$JAVA_HOME" ] &&
- JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# ----- Set Up The Runtime Classpath ------------------------------------------
-
-CP=$JAVA_HOME/lib/tools.jar:$ANT_HOME/lib/build/ant_1_4_1.jar:./lib/build/crimson-ant.jar:./lib/build/jaxp.jar
-
-if $cygwin; then
- JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
- CP=`cygpath --path --windows "$CP"`
-fi
-
-# ----- Execute The Requested Build -------------------------------------------
-
-TARGET=$1;
-if [ $# != 0 ] ; then
- shift 1
-fi
-
-# $JAVA_HOME/bin/java -version
-
-$JAVA_HOME/bin/java $ANT_OPTS -classpath $CP org.apache.tools.ant.Main -emacs -Dant.home=$ANT_HOME $TARGET -Dargs="$*"