You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by ke...@apache.org on 2012/07/17 21:19:23 UTC
svn commit: r1362615 - in /incubator/sis/branches/0.2-incubating:
LICENSE.txt NOTICE.txt sis-webapp/src/main/appended-resources/
sis-webapp/src/main/appended-resources/META-INF/
sis-webapp/src/main/appended-resources/META-INF/LICENSE.vm
Author: kevan
Date: Tue Jul 17 19:19:23 2012
New Revision: 1362615
URL: http://svn.apache.org/viewvc?rev=1362615&view=rev
Log:
SIS-35 Fix up LICENSE and NOTICE file. Use appended-resources to add appropriate license to sis-webapp war
Added:
incubator/sis/branches/0.2-incubating/sis-webapp/src/main/appended-resources/
incubator/sis/branches/0.2-incubating/sis-webapp/src/main/appended-resources/META-INF/
incubator/sis/branches/0.2-incubating/sis-webapp/src/main/appended-resources/META-INF/LICENSE.vm
Modified:
incubator/sis/branches/0.2-incubating/LICENSE.txt
incubator/sis/branches/0.2-incubating/NOTICE.txt
Modified: incubator/sis/branches/0.2-incubating/LICENSE.txt
URL: http://svn.apache.org/viewvc/incubator/sis/branches/0.2-incubating/LICENSE.txt?rev=1362615&r1=1362614&r2=1362615&view=diff
==============================================================================
--- incubator/sis/branches/0.2-incubating/LICENSE.txt (original)
+++ incubator/sis/branches/0.2-incubating/LICENSE.txt Tue Jul 17 19:19:23 2012
@@ -200,3 +200,64 @@
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 SIS SUBCOMPONENTS:
+
+Apache SIS includes dependent packages with separate copyright notices
+and license terms. Your use of these subcomponents is subject to the terms
+and conditions of the following licenses:
+
+The georss-rome-0.9.8.jsr and rom-0.9.jar components are licensed under
+the Apache License Version 2.0.
+
+For jdom-1.0.jar:
+
+Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin.
+ 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. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions, and the disclaimer that follows
+ these conditions in the documentation and/or other materials
+ provided with the distribution.
+
+ 3. The name "JDOM" must not be used to endorse or promote products
+ derived from this software without prior written permission. For
+ written permission, please contact <request_AT_jdom_DOT_org>.
+
+ 4. Products derived from this software may not be called "JDOM", nor
+ may "JDOM" appear in their name, without prior written permission
+ from the JDOM Project Management <request_AT_jdom_DOT_org>.
+
+ In addition, we request (but do not require) that you include in the
+ end-user documentation provided with the redistribution and/or in the
+ software itself an acknowledgement equivalent to the following:
+ "This product includes software developed by the
+ JDOM Project (http://www.jdom.org/)."
+ Alternatively, the acknowledgment may be graphical using the logos
+ available at http://www.jdom.org/images/logos.
+
+ 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 JDOM AUTHORS OR THE PROJECT
+ 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.
+
+ This software consists of voluntary contributions made by many
+ individuals on behalf of the JDOM Project and was originally
+ created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
+ Brett McLaughlin <brett_AT_jdom_DOT_org>. For more information
+ on the JDOM Project, please see <http://www.jdom.org/>.
Modified: incubator/sis/branches/0.2-incubating/NOTICE.txt
URL: http://svn.apache.org/viewvc/incubator/sis/branches/0.2-incubating/NOTICE.txt?rev=1362615&r1=1362614&r2=1362615&view=diff
==============================================================================
--- incubator/sis/branches/0.2-incubating/NOTICE.txt (original)
+++ incubator/sis/branches/0.2-incubating/NOTICE.txt Tue Jul 17 19:19:23 2012
@@ -4,6 +4,3 @@ Copyright 2010-2012 The Apache Software
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-This product includes software developed by the
-JDOM Project (http://www.jdom.org/).
-
Added: incubator/sis/branches/0.2-incubating/sis-webapp/src/main/appended-resources/META-INF/LICENSE.vm
URL: http://svn.apache.org/viewvc/incubator/sis/branches/0.2-incubating/sis-webapp/src/main/appended-resources/META-INF/LICENSE.vm?rev=1362615&view=auto
==============================================================================
--- incubator/sis/branches/0.2-incubating/sis-webapp/src/main/appended-resources/META-INF/LICENSE.vm (added)
+++ incubator/sis/branches/0.2-incubating/sis-webapp/src/main/appended-resources/META-INF/LICENSE.vm Tue Jul 17 19:19:23 2012
@@ -0,0 +1,79 @@
+##
+## 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.
+##
+
+APACHE SIS SUBCOMPONENTS:
+
+Apache SIS includes dependent packages with separate copyright notices
+and license terms. Your use of these subcomponents is subject to the terms
+and conditions of the following licenses:
+
+The georss-rome-0.9.8.jsr and rom-0.9.jar components are licensed under
+the Apache License Version 2.0.
+
+For jdom-1.0.jar:
+
+Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin.
+ 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. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions, and the disclaimer that follows
+ these conditions in the documentation and/or other materials
+ provided with the distribution.
+
+ 3. The name "JDOM" must not be used to endorse or promote products
+ derived from this software without prior written permission. For
+ written permission, please contact <request_AT_jdom_DOT_org>.
+
+ 4. Products derived from this software may not be called "JDOM", nor
+ may "JDOM" appear in their name, without prior written permission
+ from the JDOM Project Management <request_AT_jdom_DOT_org>.
+
+ In addition, we request (but do not require) that you include in the
+ end-user documentation provided with the redistribution and/or in the
+ software itself an acknowledgement equivalent to the following:
+ "This product includes software developed by the
+ JDOM Project (http://www.jdom.org/)."
+ Alternatively, the acknowledgment may be graphical using the logos
+ available at http://www.jdom.org/images/logos.
+
+ 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 JDOM AUTHORS OR THE PROJECT
+ 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.
+
+ This software consists of voluntary contributions made by many
+ individuals on behalf of the JDOM Project and was originally
+ created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
+ Brett McLaughlin <brett_AT_jdom_DOT_org>. For more information
+ on the JDOM Project, please see <http://www.jdom.org/>.