Author: hsaputra
Date: Thu Mar 22 17:10:46 2012
New Revision: 1303895
URL: http://svn.apache.org/viewvc?rev=1303895&view=rev
Log:
SHINDIG-1689 | Cleanup NOTICE and LICENSE files | Patch from Ate Douma
Added:
shindig/trunk/extras/src/main/appended-resources/
shindig/trunk/extras/src/main/appended-resources/META-INF/
shindig/trunk/extras/src/main/appended-resources/META-INF/NOTICE
shindig/trunk/features/src/main/appended-resources/
shindig/trunk/features/src/main/appended-resources/META-INF/
shindig/trunk/features/src/main/appended-resources/META-INF/LICENSE
shindig/trunk/features/src/main/appended-resources/META-INF/NOTICE
shindig/trunk/java/server/src/main/appended-resources/
shindig/trunk/java/server/src/main/appended-resources/META-INF/
shindig/trunk/java/server/src/main/appended-resources/META-INF/LICENSE
shindig/trunk/java/server/src/main/appended-resources/META-INF/NOTICE
shindig/trunk/java/uber/src/
shindig/trunk/java/uber/src/main/
shindig/trunk/java/uber/src/main/appended-resources/
shindig/trunk/java/uber/src/main/appended-resources/META-INF/
shindig/trunk/java/uber/src/main/appended-resources/META-INF/LICENSE
shindig/trunk/java/uber/src/main/appended-resources/META-INF/NOTICE
Modified:
shindig/trunk/LICENSE
shindig/trunk/NOTICE
shindig/trunk/extras/NOTICE
shindig/trunk/features/LICENSE
shindig/trunk/features/NOTICE
shindig/trunk/features/pom.xml
shindig/trunk/java/LICENSE
shindig/trunk/java/NOTICE
shindig/trunk/php/LICENSE
shindig/trunk/php/NOTICE
Modified: shindig/trunk/LICENSE
URL:
http://svn.apache.org/viewvc/shindig/trunk/LICENSE?rev=1303895&r1=1303894&r2=1303895&view=diff
==============================================================================
--- shindig/trunk/LICENSE (original)
+++ shindig/trunk/LICENSE Thu Mar 22 17:10:46 2012
@@ -312,20 +312,106 @@ OUT OF OR IN CONNECTION WITH THE SOFTWAR
SOFTWARE.
===============================================================================
-OpenSocial Javascript API
+OpenSocial Specification 0.8:
- Copyright (c) 2009 The OpenSocial Foundation
+Copyright (c) 2008 OpenSocial Foundation (http://www.opensocial.org)
+Released under the Apache License 2.0
(http://www.apache.org/licenses/LICENSE-2.0)
+===============================================================================
+Code Mirror:
+ Copyright (c) 2007-2010 Marijn Haverbeke
- Licensed 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
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any
+ damages arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any
+ purpose, including commercial applications, and to alter it and
+ redistribute it freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must
+ not claim that you wrote the original software. If you use this
+ software in a product, an acknowledgment in the product
+ documentation would be appreciated but is not required.
- http://www.apache.org/licenses/LICENSE-2.0
+ 2. Altered source versions must be plainly marked as such, and must
+ not be misrepresented as being the original software.
- 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.
+ 3. This notice may not be removed or altered from any source
+ distribution.
===============================================================================
+swfobject:
+
+The MIT License
+
+Copyright (c) 2007-2008 Geoff Stearns, Michael Williams, and Bobby van der
Sluis
+
+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.
+
+
+ Marijn Haverbeke
+ [email protected]
+
+===============================================================================
+OAuth.php:
+
+The MIT License
+
+Copyright (c) 2007 Andy Smith
+
+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.
+
+===============================================================================
+Symphony ClassLoader:
+
+Copyright (c) 2004-2011 Fabien Potencier
+
+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: shindig/trunk/NOTICE
URL:
http://svn.apache.org/viewvc/shindig/trunk/NOTICE?rev=1303895&r1=1303894&r2=1303895&view=diff
==============================================================================
--- shindig/trunk/NOTICE (original)
+++ shindig/trunk/NOTICE Thu Mar 22 17:10:46 2012
@@ -1,5 +1,5 @@
Apache Shindig
-Copyright 2010 The Apache Software Foundation
+Copyright 2012 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
@@ -10,30 +10,10 @@ This product includes software (Gadget S
originally developed by Google Inc. (http://code.google.com/) and licensed
to the ASF as initial contribution for Shindig.
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
This product includes software (JSUnit) developed by
Joerg Schaible (http://jsunit.berlios.de/).
-This product includes software (swfobject) developed by
-Geoff Stearns, Michael Williams, and Bobby van der Sluis
(http://code.google.com/p/swfobject/)
-
-This product includes software (opensocial-resources) developed by
-The OpenSocial Foundation
(http://opensocial-resources.googlecode.com/svn/spec/0.8/)
-
-This product includes software (Zend) developed by
-Zend Technologies Ltd (http://framework.zend.com/).
-
-This product includes software (JSMin) developed by
-Douglas Crockford (http://www.crockford.com/).
-
-This product includes software (OAuth.php) developed by
-Andy Smith (http://oauth.googlecode.com/svn/code/php/LICENSE.txt)
-
-This product includs software (OpenAjax Hub) developed by
-OpenAjax Alliance (http://www.openajax.org/)
-
-This product includs software (CodeMirror) developed by
-Marijn Haverbeke (http://codemirror.net/)
+This product contains software (sha1 JS impl) developed by Google Inc.
+This product includes software (wave) developed by Google, Inc
+Copyright 2010 Google Inc.
Modified: shindig/trunk/extras/NOTICE
URL:
http://svn.apache.org/viewvc/shindig/trunk/extras/NOTICE?rev=1303895&r1=1303894&r2=1303895&view=diff
==============================================================================
--- shindig/trunk/extras/NOTICE (original)
+++ shindig/trunk/extras/NOTICE Thu Mar 22 17:10:46 2012
@@ -1,11 +0,0 @@
-Apache Shindig
-Copyright 2012 The Apache Software Foundation
-
------------------------------------------------------------
-
-This product includes software (OpenAjax Hub) developed by
-OpenAjax Alliance (http://www.openajax.org/)
-
-This product includes software (wave) developed by Google, Inc
-Copyright 2010 Google Inc.
-
Added: shindig/trunk/extras/src/main/appended-resources/META-INF/NOTICE
URL:
http://svn.apache.org/viewvc/shindig/trunk/extras/src/main/appended-resources/META-INF/NOTICE?rev=1303895&view=auto
==============================================================================
--- shindig/trunk/extras/src/main/appended-resources/META-INF/NOTICE (added)
+++ shindig/trunk/extras/src/main/appended-resources/META-INF/NOTICE Thu Mar 22
17:10:46 2012
@@ -0,0 +1,2 @@
+This product includes software (wave) developed by Google, Inc
+Copyright 2010 Google Inc.
Modified: shindig/trunk/features/LICENSE
URL:
http://svn.apache.org/viewvc/shindig/trunk/features/LICENSE?rev=1303895&r1=1303894&r2=1303895&view=diff
==============================================================================
--- shindig/trunk/features/LICENSE (original)
+++ shindig/trunk/features/LICENSE Thu Mar 22 17:10:46 2012
@@ -1,233 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed 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.
-
-
-===============================================================================
-
-The Apache Shindig distribution includes a number of subcomponents
-with separate copyright notices and license terms. Your use of the
-code for the these subcomponents is subject to the terms and
-conditions of the following licenses.
-
-===============================================================================
-The MIT License
-
-Copyright (c) 2007-2008 Geoff Stearns, Michael Williams, and Bobby van der
Sluis
-
-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: shindig/trunk/features/NOTICE
URL:
http://svn.apache.org/viewvc/shindig/trunk/features/NOTICE?rev=1303895&r1=1303894&r2=1303895&view=diff
==============================================================================
--- shindig/trunk/features/NOTICE (original)
+++ shindig/trunk/features/NOTICE Thu Mar 22 17:10:46 2012
@@ -1,25 +0,0 @@
-Apache Shindig
-Copyright 2010 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
------------------------------------------------------------
-
-This product includes software (Gadget Server, Gadget Container)
-originally developed by Google Inc. (http://code.google.com/) and licensed
-to the ASF as initial contribution for Shindig.
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-This product includes software (JSUnit) developed by
-Joerg Schaible (http://jsunit.berlios.de/).
-
-This product includes software (swfobject) developed by
-Geoff Stearns, Michael Williams, and Bobby van der Sluis
(http://code.google.com/p/swfobject/)
-
-This product includes software (opensocial-resources) developed by
-The OpenSocial Foundation
(http://opensocial-resources.googlecode.com/svn/spec/0.8/)
-
-This product contains software (sha1 JS impl) developed by Google Inc.
Modified: shindig/trunk/features/pom.xml
URL:
http://svn.apache.org/viewvc/shindig/trunk/features/pom.xml?rev=1303895&r1=1303894&r2=1303895&view=diff
==============================================================================
--- shindig/trunk/features/pom.xml (original)
+++ shindig/trunk/features/pom.xml Thu Mar 22 17:10:46 2012
@@ -54,13 +54,6 @@
<targetPath>features</targetPath>
<directory>${basedir}/src/main/javascript/features</directory>
</resource>
- <resource>
- <targetPath>META-INF</targetPath>
- <directory>${basedir}</directory>
- <includes>
- <include>NOTICE</include>
- </includes>
- </resource>
</resources>
<testResources>
<testResource>
Added: shindig/trunk/features/src/main/appended-resources/META-INF/LICENSE
URL:
http://svn.apache.org/viewvc/shindig/trunk/features/src/main/appended-resources/META-INF/LICENSE?rev=1303895&view=auto
==============================================================================
--- shindig/trunk/features/src/main/appended-resources/META-INF/LICENSE (added)
+++ shindig/trunk/features/src/main/appended-resources/META-INF/LICENSE Thu Mar
22 17:10:46 2012
@@ -0,0 +1,64 @@
+===============================================================================
+
+The Apache Shindig distribution includes a number of subcomponents
+with separate copyright notices and license terms. Your use of the
+code for the these subcomponents is subject to the terms and
+conditions of the following licenses.
+
+===============================================================================
+OpenSocial Specification 0.8:
+
+Copyright (c) 2008 OpenSocial Foundation (http://www.opensocial.org)
+Released under the Apache License 2.0
(http://www.apache.org/licenses/LICENSE-2.0)
+===============================================================================
+Code Mirror:
+ Copyright (c) 2007-2010 Marijn Haverbeke
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any
+ damages arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any
+ purpose, including commercial applications, and to alter it and
+ redistribute it freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must
+ not claim that you wrote the original software. If you use this
+ software in a product, an acknowledgment in the product
+ documentation would be appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must
+ not be misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source
+ distribution.
+
+===============================================================================
+swfobject:
+
+The MIT License
+
+Copyright (c) 2007-2008 Geoff Stearns, Michael Williams, and Bobby van der
Sluis
+
+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.
+
+
+ Marijn Haverbeke
+ [email protected]
+
Added: shindig/trunk/features/src/main/appended-resources/META-INF/NOTICE
URL:
http://svn.apache.org/viewvc/shindig/trunk/features/src/main/appended-resources/META-INF/NOTICE?rev=1303895&view=auto
==============================================================================
--- shindig/trunk/features/src/main/appended-resources/META-INF/NOTICE (added)
+++ shindig/trunk/features/src/main/appended-resources/META-INF/NOTICE Thu Mar
22 17:10:46 2012
@@ -0,0 +1,5 @@
+This product includes software (Gadget Server, Gadget Container)
+originally developed by Google Inc. (http://code.google.com/) and licensed
+to the ASF as initial contribution for Shindig.
+
+This product contains software (sha1 JS impl) developed by Google Inc.
Modified: shindig/trunk/java/LICENSE
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/LICENSE?rev=1303895&r1=1303894&r2=1303895&view=diff
==============================================================================
--- shindig/trunk/java/LICENSE (original)
+++ shindig/trunk/java/LICENSE Thu Mar 22 17:10:46 2012
@@ -210,3 +210,58 @@ code for the these subcomponents is subj
conditions of the following licenses.
===============================================================================
+OpenSocial Specification 0.8:
+
+Copyright (c) 2008 OpenSocial Foundation (http://www.opensocial.org)
+Released under the Apache License 2.0
(http://www.apache.org/licenses/LICENSE-2.0)
+===============================================================================
+Code Mirror:
+ Copyright (c) 2007-2010 Marijn Haverbeke
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any
+ damages arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any
+ purpose, including commercial applications, and to alter it and
+ redistribute it freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must
+ not claim that you wrote the original software. If you use this
+ software in a product, an acknowledgment in the product
+ documentation would be appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must
+ not be misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source
+ distribution.
+
+===============================================================================
+swfobject:
+
+The MIT License
+
+Copyright (c) 2007-2008 Geoff Stearns, Michael Williams, and Bobby van der
Sluis
+
+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.
+
+
+ Marijn Haverbeke
+ [email protected]
Modified: shindig/trunk/java/NOTICE
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/NOTICE?rev=1303895&r1=1303894&r2=1303895&view=diff
==============================================================================
--- shindig/trunk/java/NOTICE (original)
+++ shindig/trunk/java/NOTICE Thu Mar 22 17:10:46 2012
@@ -1,5 +1,5 @@
Apache Shindig
-Copyright 2010 The Apache Software Foundation
+Copyright 2012 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
@@ -10,15 +10,7 @@ This product includes software (Gadget S
originally developed by Google Inc. (http://code.google.com/) and licensed
to the ASF as initial contribution for Shindig.
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-This product includes software (JSUnit) developed by
-Joerg Schaible (http://jsunit.berlios.de/).
-
-This product includes software (swfobject) developed by
-Geoff Stearns, Michael Williams, and Bobby van der Sluis
(http://code.google.com/p/swfobject/)
-
-This product includes software (opensocial-resources) developed by
-The OpenSocial Foundation
(http://opensocial-resources.googlecode.com/svn/spec/0.8/)
+This product contains software (sha1 JS impl) developed by Google Inc.
+This product includes software (wave) developed by Google, Inc
+Copyright 2010 Google Inc.
