geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickmcgu...@apache.org
Subject svn commit: r1050412 - in /geronimo/bundles/trunk/json: NOTICE src/ src/main/ src/main/appended-resources/ src/main/appended-resources/META-INF/ src/main/appended-resources/META-INF/LICENSE.vm
Date Fri, 17 Dec 2010 15:08:35 GMT
Author: rickmcguire
Date: Fri Dec 17 15:08:35 2010
New Revision: 1050412

URL: http://svn.apache.org/viewvc?rev=1050412&view=rev
Log:
fix license/notice files

Added:
    geronimo/bundles/trunk/json/src/
    geronimo/bundles/trunk/json/src/main/
    geronimo/bundles/trunk/json/src/main/appended-resources/
    geronimo/bundles/trunk/json/src/main/appended-resources/META-INF/
    geronimo/bundles/trunk/json/src/main/appended-resources/META-INF/LICENSE.vm   (with props)
Modified:
    geronimo/bundles/trunk/json/NOTICE

Modified: geronimo/bundles/trunk/json/NOTICE
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/json/NOTICE?rev=1050412&r1=1050411&r2=1050412&view=diff
==============================================================================
--- geronimo/bundles/trunk/json/NOTICE (original)
+++ geronimo/bundles/trunk/json/NOTICE Fri Dec 17 15:08:35 2010
@@ -4,17 +4,3 @@ Copyright 2003-2010 The Apache Software 
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 
-########################################################
-The json bundle contains the software developed in json.org which released under the following
license.
-
-http://www.json.org/license.html
-
-Copyright (c) 2002 JSON.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software
and associated documentation files (the "Software"), to deal in the Software without restriction,
including without limitation the rights to use, copy, modify, merge, publish, distribute,
sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or
substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
\ No newline at end of file

Added: geronimo/bundles/trunk/json/src/main/appended-resources/META-INF/LICENSE.vm
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/json/src/main/appended-resources/META-INF/LICENSE.vm?rev=1050412&view=auto
==============================================================================
--- geronimo/bundles/trunk/json/src/main/appended-resources/META-INF/LICENSE.vm (added)
+++ geronimo/bundles/trunk/json/src/main/appended-resources/META-INF/LICENSE.vm Fri Dec 17
15:08:35 2010
@@ -0,0 +1,47 @@
+##
+## 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.
+##
+## $Rev$ $Date$
+##
+
+=========================================================================
+==  JSON License                                                       ==
+=========================================================================
+
+http://www.json.org/license.html
+
+Copyright (c) 2002 JSON.org
+
+Permission is hereby granted, free of charge, to any person obtaining a copy 
+of this software and associated documentation files (the "Software"), to deal 
+in the Software without restriction, including without limitation the rights 
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 
+copies of the Software, and to permit persons to whom the Software is furnished 
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all 
+copies or substantial portions of the Software.
+
+The Software shall be used for Good, not Evil.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A 
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION 
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 

Propchange: geronimo/bundles/trunk/json/src/main/appended-resources/META-INF/LICENSE.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/bundles/trunk/json/src/main/appended-resources/META-INF/LICENSE.vm
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/bundles/trunk/json/src/main/appended-resources/META-INF/LICENSE.vm
------------------------------------------------------------------------------
    svn:mime-type = text/plain



Mime
View raw message