You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by mf...@apache.org on 2011/06/29 18:17:41 UTC
svn commit: r1141145 - in /incubator/rave/trunk:
rave-portal/src/main/dist/LICENSE rave-portal/src/main/dist/NOTICE
rave-shindig/src/main/appended-resources/META-INF/LICENSE
rave-shindig/src/main/appended-resources/META-INF/NOTICE
Author: mfranklin
Date: Wed Jun 29 16:17:41 2011
New Revision: 1141145
URL: http://svn.apache.org/viewvc?rev=1141145&view=rev
Log:
Removed Zend license as it is not necessary for the Java Shindig dependency
Modified:
incubator/rave/trunk/rave-portal/src/main/dist/LICENSE
incubator/rave/trunk/rave-portal/src/main/dist/NOTICE
incubator/rave/trunk/rave-shindig/src/main/appended-resources/META-INF/LICENSE
incubator/rave/trunk/rave-shindig/src/main/appended-resources/META-INF/NOTICE
Modified: incubator/rave/trunk/rave-portal/src/main/dist/LICENSE
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/dist/LICENSE?rev=1141145&r1=1141144&r2=1141145&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/dist/LICENSE (original)
+++ incubator/rave/trunk/rave-portal/src/main/dist/LICENSE Wed Jun 29 16:17:41 2011
@@ -790,38 +790,6 @@ The above copyright notice and this perm
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.
-===============================================================================
-
-For Zend Framework:
-
-Copyright (c) 2005-2010, Zend Technologies USA, Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- * Neither the name of Zend Technologies USA, Inc. nor the names of its
- contributors may be used to endorse or promote products derived from this
- software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS 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 COPYRIGHT OWNER OR 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.
-
=================================================================================================================
MOZILLA PUBLIC LICENSE
Modified: incubator/rave/trunk/rave-portal/src/main/dist/NOTICE
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/dist/NOTICE?rev=1141145&r1=1141144&r2=1141145&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/dist/NOTICE (original)
+++ incubator/rave/trunk/rave-portal/src/main/dist/NOTICE Wed Jun 29 16:17:41 2011
@@ -115,8 +115,5 @@ Geoff Stearns, Michael Williams, and Bob
This product includes software (opensocial-resources) developed by
The OpenSocial Foundation (http://opensocial-resources.googlecode.com/svn/spec/), which is licensed under the Apache 2.0 License
-This product includes software (Zend) developed by
-Zend Technologies Ltd (http://framework.zend.com/), which is licensed under the New BSD license.
-
This product includes software (OpenAjax Hub) developed by
OpenAjax Alliance (http://www.openajax.org/), which is licensed under the Apache 2.0 license
Modified: incubator/rave/trunk/rave-shindig/src/main/appended-resources/META-INF/LICENSE
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-shindig/src/main/appended-resources/META-INF/LICENSE?rev=1141145&r1=1141144&r2=1141145&view=diff
==============================================================================
--- incubator/rave/trunk/rave-shindig/src/main/appended-resources/META-INF/LICENSE (original)
+++ incubator/rave/trunk/rave-shindig/src/main/appended-resources/META-INF/LICENSE Wed Jun 29 16:17:41 2011
@@ -373,33 +373,4 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOU
===============================================================================
-
-For Zend Framework:
-
-Copyright (c) 2005-2010, Zend Technologies USA, Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- * Neither the name of Zend Technologies USA, Inc. nor the names of its
- contributors may be used to endorse or promote products derived from this
- software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS 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 COPYRIGHT OWNER OR 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.
\ No newline at end of file
+POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
Modified: incubator/rave/trunk/rave-shindig/src/main/appended-resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-shindig/src/main/appended-resources/META-INF/NOTICE?rev=1141145&r1=1141144&r2=1141145&view=diff
==============================================================================
--- incubator/rave/trunk/rave-shindig/src/main/appended-resources/META-INF/NOTICE (original)
+++ incubator/rave/trunk/rave-shindig/src/main/appended-resources/META-INF/NOTICE Wed Jun 29 16:17:41 2011
@@ -84,9 +84,6 @@ Geoff Stearns, Michael Williams, and Bob
This product includes software (opensocial-resources) developed by
The OpenSocial Foundation (http://opensocial-resources.googlecode.com/svn/spec/), which is licensed under the Apache 2.0 License
-This product includes software (Zend) developed by
-Zend Technologies Ltd (http://framework.zend.com/), which is licensed under the New BSD license.
-
This product includes software (OpenAjax Hub) developed by
OpenAjax Alliance (http://www.openajax.org/), which is licensed under the Apache 2.0 license