incubator-flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cframp...@apache.org
Subject svn commit: r1405005 - in /incubator/flex/utilities/trunk/installer: LICENSE build.xml src/com/adobe/crypto/MD5Stream.as src/com/adobe/utils/IntUtil.as
Date Fri, 02 Nov 2012 15:23:34 GMT
Author: cframpton
Date: Fri Nov  2 15:23:33 2012
New Revision: 1405005

URL: http://svn.apache.org/viewvc?rev=1405005&view=rev
Log:
License fixes.  
1. Restored original Adobe copyright which allows redistribution and modification to MD5Stream
and IntUtil as long as copyright notice left in place.  
2. Fixed the path to the above files in the LICENSE file.  Prepended installer/ to their paths.
3. Add exclusions for the above files to the rat report task.  Also added exclusions for .png,
.ico and .ttf asset files.
4. Removed call out for Open Sans fonts in the LICENSE file since they are under the Apache
2 license. [http://www.google.com/webfonts/attribution]

Modified:
    incubator/flex/utilities/trunk/installer/LICENSE
    incubator/flex/utilities/trunk/installer/build.xml
    incubator/flex/utilities/trunk/installer/src/com/adobe/crypto/MD5Stream.as
    incubator/flex/utilities/trunk/installer/src/com/adobe/utils/IntUtil.as

Modified: incubator/flex/utilities/trunk/installer/LICENSE
URL: http://svn.apache.org/viewvc/incubator/flex/utilities/trunk/installer/LICENSE?rev=1405005&r1=1405004&r2=1405005&view=diff
==============================================================================
--- incubator/flex/utilities/trunk/installer/LICENSE (original)
+++ incubator/flex/utilities/trunk/installer/LICENSE Fri Nov  2 15:23:33 2012
@@ -203,14 +203,8 @@
 
 ------------------------------------------------------------------------------------------
 
-For the fonts in src/assets/fonts/open-sans:
-
-Apache License, Version 2.0, January 2004 (above and on http://www.apache.org/licenses/)
-
-------------------------------------------------------------------------------------------
-
-src/com/adobe/crypto/MD5Stream.as
-src/com/adobe/utils/IntUtil.as
+installer/src/com/adobe/crypto/MD5Stream.as
+installer/src/com/adobe/utils/IntUtil.as
 
 /*
   Copyright (c) 2008, Adobe Systems Incorporated

Modified: incubator/flex/utilities/trunk/installer/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/utilities/trunk/installer/build.xml?rev=1405005&r1=1405004&r2=1405005&view=diff
==============================================================================
--- incubator/flex/utilities/trunk/installer/build.xml (original)
+++ incubator/flex/utilities/trunk/installer/build.xml Fri Nov  2 15:23:33 2012
@@ -429,6 +429,10 @@
             reportFile="${basedir}/rat.report">
             <fileset dir="${rat.dir}">
                 <exclude name="**/Apache License Version 2.txt"/>
+                <!--          Start of source files           -->
+                <!-- source files with Adobe license which permits use/modification if
copyright left in place -->
+                <exclude name="${INSTALLER_PROJECT_NAME}/src/com/adobe/crypto/MD5Stream.as"/>
+                <exclude name="${INSTALLER_PROJECT_NAME}/src/com/adobe/utils/IntUtil.as"/>
                 <!-- generated source files that don't have Apache v2 license header -->
                 <exclude name="**/build.number"/>
                 <exclude name="**/.actionScriptProperties"/>
@@ -437,6 +441,14 @@
                 <exclude name="**/.project"/>
                 <exclude name="**/.fxpProperties"/>
                 <exclude name="**/.settings/**"/>
+                <!--          End of source files           -->
+                <!--          Start of binary files           -->
+                <!-- exclude media (png, ico) -->
+                <exclude name="**/*.ico"/>
+                <exclude name="**/*.png"/>
+                <!-- exclude fonts -->
+                <exclude name="**/*.ttf"/>
+                <!--          End of binary files           -->
             </fileset>
         </rat:report>
         

Modified: incubator/flex/utilities/trunk/installer/src/com/adobe/crypto/MD5Stream.as
URL: http://svn.apache.org/viewvc/incubator/flex/utilities/trunk/installer/src/com/adobe/crypto/MD5Stream.as?rev=1405005&r1=1405004&r2=1405005&view=diff
==============================================================================
--- incubator/flex/utilities/trunk/installer/src/com/adobe/crypto/MD5Stream.as (original)
+++ incubator/flex/utilities/trunk/installer/src/com/adobe/crypto/MD5Stream.as Fri Nov  2
15:23:33 2012
@@ -1,21 +1,34 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.
-//
-////////////////////////////////////////////////////////////////////////////////
+/*
+  Copyright (c) 2008, Adobe Systems Incorporated
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without 
+  modification, are permitted provided that the following conditions are
+  met:
+
+  * Redistributions of source code must retain the above copyright notice, 
+    this list of conditions and the following disclaimer.
+  
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the 
+    documentation and/or other materials provided with the distribution.
+  
+  * Neither the name of Adobe Systems Incorporated nor the names of its 
+    contributors may be used to endorse or promote products derived from 
+    this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
+  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
 
 package com.adobe.crypto
 {

Modified: incubator/flex/utilities/trunk/installer/src/com/adobe/utils/IntUtil.as
URL: http://svn.apache.org/viewvc/incubator/flex/utilities/trunk/installer/src/com/adobe/utils/IntUtil.as?rev=1405005&r1=1405004&r2=1405005&view=diff
==============================================================================
--- incubator/flex/utilities/trunk/installer/src/com/adobe/utils/IntUtil.as (original)
+++ incubator/flex/utilities/trunk/installer/src/com/adobe/utils/IntUtil.as Fri Nov  2 15:23:33
2012
@@ -1,21 +1,34 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  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.
-//
-////////////////////////////////////////////////////////////////////////////////
+/*
+  Copyright (c) 2008, Adobe Systems Incorporated
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without 
+  modification, are permitted provided that the following conditions are
+  met:
+
+  * Redistributions of source code must retain the above copyright notice, 
+    this list of conditions and the following disclaimer.
+  
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the 
+    documentation and/or other materials provided with the distribution.
+  
+  * Neither the name of Adobe Systems Incorporated nor the names of its 
+    contributors may be used to endorse or promote products derived from 
+    this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
+  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
 package com.adobe.utils {
 	
 	import flash.utils.Endian;



Mime
View raw message