Author: jukka
Date: Mon Jun 16 08:43:44 2008
New Revision: 668203
URL: http://svn.apache.org/viewvc?rev=668203&view=rev
Log:
SLING-539: Merge LICENSE.* information to LICENSE files
- FreeMarker license
Removed:
incubator/sling/trunk/scripting/freemarker/src/main/resources/META-INF/LICENSE.freemarker
Modified:
incubator/sling/trunk/scripting/freemarker/src/main/resources/META-INF/LICENSE
incubator/sling/trunk/scripting/freemarker/src/main/resources/META-INF/NOTICE
Modified:
incubator/sling/trunk/scripting/freemarker/src/main/resources/META-INF/LICENSE
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/freemarker/src/main/resources/META-INF/LICENSE?rev=668203&r1=668202&r2=668203&view=diff
==============================================================================
---
incubator/sling/trunk/scripting/freemarker/src/main/resources/META-INF/LICENSE
(original)
+++
incubator/sling/trunk/scripting/freemarker/src/main/resources/META-INF/LICENSE
Mon Jun 16 08:43:44 2008
@@ -200,3 +200,51 @@
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.
+
+
+APACHE SLING SUBCOMPONENTS:
+
+Apache Sling includes subcomponents with separate copyright notices and
+license terms. Your use of these subcomponents is subject to the terms
+and conditions of the following licenses.
+
+FreeMarker
+
+ Copyright (c) 2003 The Visigoth Software Society.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ 2. The end-user documentation included with the redistribution,
+ if any, must include the following acknowledgement: "This
+ product includes software developed by the Visigoth Software
+ Society (http://www.visigoths.org/)." Alternately, this
+ acknowledgement may appear in the software itself, if and
+ wherever such third-party acknowledgements normally appear.
+
+ 3. Neither the name "FreeMarker", "Visigoth", nor any of the names
+ of the project contributors may be used to endorse or promote
+ products derived from this software without prior written
+ permission. For written permission, please contact
+ [EMAIL PROTECTED]
+
+ 4. Products derived from this software may not be called "FreeMarker"
+ or "Visigoth" nor may "FreeMarker" or "Visigoth" appear in their
+ names without prior written permission of the Visigoth Software
+ Society.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 VISIGOTH SOFTWARE SOCIETY OR ITS 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.
Modified:
incubator/sling/trunk/scripting/freemarker/src/main/resources/META-INF/NOTICE
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/freemarker/src/main/resources/META-INF/NOTICE?rev=668203&r1=668202&r2=668203&view=diff
==============================================================================
---
incubator/sling/trunk/scripting/freemarker/src/main/resources/META-INF/NOTICE
(original)
+++
incubator/sling/trunk/scripting/freemarker/src/main/resources/META-INF/NOTICE
Mon Jun 16 08:43:44 2008
@@ -9,4 +9,4 @@
This product includes FreeMarker software developed by the
Visigoth Software Society (http://www.visigoths.org/).
-
+Copyright (c) 2003 The Visigoth Software Society.
