You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by cf...@apache.org on 2012/06/08 23:49:21 UTC
svn commit: r1348259 - in /incubator/flex/trunk: LICENSE NOTICE build.xml
modules/thirdparty/batik/build.xml
modules/thirdparty/velocity/build/build.xml
Author: cframpton
Date: Fri Jun 8 21:49:20 2012
New Revision: 1348259
URL: http://svn.apache.org/viewvc?rev=1348259&view=rev
Log:
NOTICE/LICENSE work - pull contents of Batik NOTICE up to top-level and remove Apache projects from LICENSE file since they are covered by the master Apache v2 license.
Modified:
incubator/flex/trunk/LICENSE
incubator/flex/trunk/NOTICE
incubator/flex/trunk/build.xml
incubator/flex/trunk/modules/thirdparty/batik/build.xml
incubator/flex/trunk/modules/thirdparty/velocity/build/build.xml
Modified: incubator/flex/trunk/LICENSE
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/LICENSE?rev=1348259&r1=1348258&r2=1348259&view=diff
==============================================================================
--- incubator/flex/trunk/LICENSE (original)
+++ incubator/flex/trunk/LICENSE Fri Jun 8 21:49:20 2012
@@ -247,56 +247,8 @@ For the asc compiler in modules/asc:
------------------------------------------------------------------------------------------
-For modules/thirdparty/batik:
-
-Sources from batik-src-1.6.zip
-
-Apache Batik SVG Toolkit 1.6, © 2005, Apache Software Foundation
-
- 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.
-
- See the Apache License, Version 2.0 at the top of this file.
-
-------------------------------------------------------------------------------------------
-
-For the modules/thirdparty/velocity:
-
-Sources from velocity-1.4.tar.gz
-
-Apache Velocity 1.4, © 2004, Apache Software Foundation
-
- 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.
-
- See the Apache License, Version 2.0 at the top of this file.
-
-------------------------------------------------------------------------------------------
-
-For the modules/thirdparty/xerces-patch:
-
-Sources from Xerces-J-bin.2.9.1.zip
-
-Apache Xerces Java
-Copyright 1999-2007 The Apache Software Foundation
-
-Apache XML Commons Resolver
-Copyright 2006 The Apache Software Foundation.
-
-Apache Xalan (Xalan serializer)
-Copyright 1999-2006 The Apache Software Foundation
-
- 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.
-
- See the Apache License, Version 2.0 at the top of this file.
-
-------------------------------------------------------------------------------------------
-
-For all other contents not already explicitly called out above:
+For all directories except for the asc compiler in modules/asc, and modules/thirdparty
+directories:
Adobe Flex
Copyright date 2003 - 2012 Adobe Systems Incorporated. All Rights Reserved.
Modified: incubator/flex/trunk/NOTICE
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/NOTICE?rev=1348259&r1=1348258&r2=1348259&view=diff
==============================================================================
--- incubator/flex/trunk/NOTICE (original)
+++ incubator/flex/trunk/NOTICE Fri Jun 8 21:49:20 2012
@@ -15,3 +15,9 @@ The easing equations in the mx tween cla
Copyright 2001 Robert Penner
All rights reserved.
+The Batik SVG toolkit source contains code from the World Wide Web Consortium (W3C) for
+ the Document Object Model API (DOM API) and SVG Document Type Definition (DTD).
+
+The Batik SVG toolkit source contains code from the International Organisation for
+ Standardization for the definition of character entities used in the software's
+ documentation.
Modified: incubator/flex/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/build.xml?rev=1348259&r1=1348258&r2=1348259&view=diff
==============================================================================
--- incubator/flex/trunk/build.xml (original)
+++ incubator/flex/trunk/build.xml Fri Jun 8 21:49:20 2012
@@ -668,9 +668,9 @@
<!-- these files are in addition to the remaining source files -->
<!-- concat the license file with the binary license file for the 3rd party deps -->
- <concat destfile="${basedir}/temp/LICENSE">
+ <!--concat destfile="${basedir}/temp/LICENSE">
<filelist dir="${FLEX_HOME}" files="LICENSE,LICENSE.bin"/>
- </concat>
+ </concat-->
<!-- use this to build frameworks -->
<copy file="${basedir}/frameworks/build_framework.xml"
@@ -778,8 +778,6 @@
<include name="asc.jar"/>
<include name="asdoc.jar"/>
<include name="batik-all-flex.jar"/>
- <include name="batik*-LICENSE*"/>
- <include name="batik*-NOTICE*/**"/>
<include name="compc.jar"/>
<include name="copylocale.jar"/>
<include name="digest.jar"/>
@@ -793,8 +791,6 @@
<include name="swfutils.jar"/>
<include name="fxgutils.jar"/>
<include name="velocity-dep-1.4-flex.jar"/>
- <include name="velocity*-LICENSE*"/>
- <include name="velocity*-NOTICE*/**"/>
</fileset>
</copy>
Modified: incubator/flex/trunk/modules/thirdparty/batik/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/batik/build.xml?rev=1348259&r1=1348258&r2=1348259&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/batik/build.xml (original)
+++ incubator/flex/trunk/modules/thirdparty/batik/build.xml Fri Jun 8 21:49:20 2012
@@ -504,16 +504,12 @@ To display the available targets type:
<attribute name="Class-Path" value="batik_de.jar batik_fr.jar batik_ja.jar batik_ko.jar batik_ru.jar batik_zh_CN.jar"/>
</manifest>
</jar>
- <copy file="NOTICE" toFile="${FLEX_LIB}/batik-all-flex-NOTICE" verbose="true"/>
- <copy file="LICENSE" toFile="${FLEX_LIB}/batik-all-flex-LICENSE" verbose="true"/>
<delete dir="${dest}/META-INF"/>
</target>
<target name="batik-all-flex-clean" depends="clean"
description="cleans files generated by batik-all-flex-jar">
<delete file="${FLEX_LIB}/batik-all-flex.jar" failonerror="false"/>
- <delete file="${FLEX_LIB}/batik-all-flex-NOTICE" failonerror="false"/>
- <delete file="${FLEX_LIB}/batik-all-flex-LICENSE" failonerror="false"/>
</target>
<!--====== END additions for Apache Flex =========-->
Modified: incubator/flex/trunk/modules/thirdparty/velocity/build/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/thirdparty/velocity/build/build.xml?rev=1348259&r1=1348258&r2=1348259&view=diff
==============================================================================
--- incubator/flex/trunk/modules/thirdparty/velocity/build/build.xml (original)
+++ incubator/flex/trunk/modules/thirdparty/velocity/build/build.xml Fri Jun 8 21:49:20 2012
@@ -340,17 +340,12 @@
<attribute name="Implementation-Vendor-Id" value="${manifest.Implementation-Vendor-Id}"/>
</manifest>
</jar>
-
- <copy file="../NOTICE" toFile="${FLEX_LIB}/velocity-dep-1.4-flex-NOTICE" verbose="true"/>
- <copy file="../LICENSE" toFile="${FLEX_LIB}/velocity-dep-1.4-flex-LICENSE" verbose="true"/>
<delete dir="${build.dest}/META-INF"/>
</target>
<target name="jar-dep-flex-clean" depends="clean"
description="cleans files generated by jar-dep-flex">
<delete file="${FLEX_LIB}/velocity-dep-1.4-flex.jar" failonerror="false"/>
- <delete file="${FLEX_LIB}/velocity-dep-1.4-flex-NOTICE" failonerror="false"/>
- <delete file="${FLEX_LIB}/velocity-dep-1.4-flex-LICENSE" failonerror="false"/>
</target>
<!--====== END additions for Apache Flex =========-->