Author: scottbw
Date: Fri Aug 27 10:49:46 2010
New Revision: 990093
URL: http://svn.apache.org/viewvc?rev=990093&view=rev
Log:
fixed license header
Modified:
incubator/wookie/trunk/widgets/wookiewiki/config.xml
Modified: incubator/wookie/trunk/widgets/wookiewiki/config.xml
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/widgets/wookiewiki/config.xml?rev=990093&r1=990092&r2=990093&view=diff
==============================================================================
--- incubator/wookie/trunk/widgets/wookiewiki/config.xml (original)
+++ incubator/wookie/trunk/widgets/wookiewiki/config.xml Fri Aug 27 10:49:46
2010
@@ -1,43 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
-<widget xmlns="http://www.w3.org/ns/widgets";
- id="http://www.getwookie.org/widgets/wiki";
- version="1.0" height="520" width="320">
- <name>WookieWiki</name>
- <description>A Wiki In A Widget</description>
- <icon src="icon.png"/>
- <content src="index.html"/>
- <author>Scott Wilson</author>
- <feature name="http://wave.google.com"; required="true"/>
- <license>
-WookieWiki created by Scott Wilson
+<?xml version="1.0" encoding="UTF-8"?>
-Note this widget makes heavy use of Creole, (c) 2009 by Ivan Fomichev (see
license in creole.js)
-
-Copyright (c) University of Bolton, 2009
-
-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 the UnaMesa Association 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.
-</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.
+-->
+<widget xmlns="http://www.w3.org/ns/widgets";
id="http://www.getwookie.org/widgets/wiki"; version="1.0" height="520"
width="320">
+ <name>WookieWiki</name>
+ <description>A Wiki In A Widget</description>
+ <icon src="icon.png"/>
+ <content src="index.html"/>
+ <author>Apache Wookie (Incubating) Team</author>
+ <feature name="http://wave.google.com"; required="true"/>
+ <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. Note this widget makes
heavy use of Creole, (c) 2009 by Ivan Fomichev (see license in
creole.js)</license>
</widget>
