You are viewing a plain text version of this content. The canonical link for it is here.
Posted to xap-commits@incubator.apache.org by mt...@apache.org on 2007/01/30 00:10:22 UTC

svn commit: r501244 - /incubator/xap/trunk/buildsystem/buildscripts/xaplicense.txt

Author: mturyn
Date: Mon Jan 29 16:10:22 2007
New Revision: 501244

URL: http://svn.apache.org/viewvc?view=rev&rev=501244
Log:
Added licensing notifications for dojo and google portions of the code.

Modified:
    incubator/xap/trunk/buildsystem/buildscripts/xaplicense.txt

Modified: incubator/xap/trunk/buildsystem/buildscripts/xaplicense.txt
URL: http://svn.apache.org/viewvc/incubator/xap/trunk/buildsystem/buildscripts/xaplicense.txt?view=diff&rev=501244&r1=501243&r2=501244
==============================================================================
--- incubator/xap/trunk/buildsystem/buildscripts/xaplicense.txt (original)
+++ incubator/xap/trunk/buildsystem/buildscripts/xaplicense.txt Mon Jan 29 16:10:22 2007
@@ -5,13 +5,36 @@
 	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
+		http://www.apache.org/licenses/LICENSE-2.0
  
-	Unless readAndOuputFile by applicable law or agreed to in writing, software
+	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.
+	
+	Portions copyright (c) 2004-2007, The Dojo Foundation
+	All Rights Reserved.
+
+	Dojo portions are licensed under the Academic Free License version 
+	2.1 or above OR the modified BSD license. For more information on 
+	Dojo licensing, see:
+
+		http://dojotoolkit.org/community/licensing.shtml
+
+	These portions constitute a compiled version of Dojo, built for deploy- 
+	ment and not for development. To get an editable version, please visit:
+
+		http://dojotoolkit.org
+
+	for documentation and information on getting the source.	
+	
+ 	Portions copyright 2005 Google Inc.
+ 	All Rights Reserved
+
+ 	Google portions are licensed under the BSD license, for
+ 	which see:
+		http://www.opensource.org/licenses/bsd-license.php 		
  
  */