sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r668182 - in /incubator/sling/trunk: jcr/contentloader/src/main/resources/META-INF/ launchpad/app/src/main/resources/META-INF/ launchpad/webapp/src/main/webapp/WEB-INF/
Date Mon, 16 Jun 2008 15:06:25 GMT
Author: jukka
Date: Mon Jun 16 08:06:24 2008
New Revision: 668182

URL: http://svn.apache.org/viewvc?rev=668182&view=rev
Log:
SLING-539: Merge LICENSE.* information to LICENSE files
    - kXML license

Removed:
    incubator/sling/trunk/jcr/contentloader/src/main/resources/META-INF/LICENSE.kxml2
    incubator/sling/trunk/launchpad/app/src/main/resources/META-INF/LICENSE.kxml2
    incubator/sling/trunk/launchpad/webapp/src/main/webapp/WEB-INF/LICENSE.kxml2
Modified:
    incubator/sling/trunk/jcr/contentloader/src/main/resources/META-INF/LICENSE
    incubator/sling/trunk/launchpad/app/src/main/resources/META-INF/LICENSE
    incubator/sling/trunk/launchpad/webapp/src/main/webapp/WEB-INF/LICENSE

Modified: incubator/sling/trunk/jcr/contentloader/src/main/resources/META-INF/LICENSE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/contentloader/src/main/resources/META-INF/LICENSE?rev=668182&r1=668181&r2=668182&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/contentloader/src/main/resources/META-INF/LICENSE (original)
+++ incubator/sling/trunk/jcr/contentloader/src/main/resources/META-INF/LICENSE Mon Jun 16
08:06:24 2008
@@ -200,3 +200,33 @@
    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.
+
+kXML parser
+
+   Copyright (c) 2002,2003, Stefan Haustein, Oberhausen, Rhld., Germany
+
+   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 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. 

Modified: incubator/sling/trunk/launchpad/app/src/main/resources/META-INF/LICENSE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/app/src/main/resources/META-INF/LICENSE?rev=668182&r1=668181&r2=668182&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/app/src/main/resources/META-INF/LICENSE (original)
+++ incubator/sling/trunk/launchpad/app/src/main/resources/META-INF/LICENSE Mon Jun 16 08:06:24
2008
@@ -380,3 +380,26 @@
    through multiple levels of sublicensees, to incorporate, disclose, and use
    without limitation the Feedback for any purpose related to the
    Specification and future versions, implementations, and test suites thereof.
+
+kXML parser
+
+   Copyright (c) 2002,2003, Stefan Haustein, Oberhausen, Rhld., Germany
+
+   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 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. 

Modified: incubator/sling/trunk/launchpad/webapp/src/main/webapp/WEB-INF/LICENSE
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/main/webapp/WEB-INF/LICENSE?rev=668182&r1=668181&r2=668182&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/webapp/src/main/webapp/WEB-INF/LICENSE (original)
+++ incubator/sling/trunk/launchpad/webapp/src/main/webapp/WEB-INF/LICENSE Mon Jun 16 08:06:24
2008
@@ -380,3 +380,26 @@
    through multiple levels of sublicensees, to incorporate, disclose, and use
    without limitation the Feedback for any purpose related to the
    Specification and future versions, implementations, and test suites thereof.
+
+kXML parser
+
+   Copyright (c) 2002,2003, Stefan Haustein, Oberhausen, Rhld., Germany
+
+   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 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. 



Mime
View raw message