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 2012/05/31 19:06:37 UTC
svn commit: r1344817 - in /rave/trunk/rave-portal/src/main/dist: LICENSE
NOTICE
Author: mfranklin
Date: Thu May 31 17:06:37 2012
New Revision: 1344817
URL: http://svn.apache.org/viewvc?rev=1344817&view=rev
Log:
Moved copyright attributions to the NOTICE
Modified:
rave/trunk/rave-portal/src/main/dist/LICENSE
rave/trunk/rave-portal/src/main/dist/NOTICE
Modified: rave/trunk/rave-portal/src/main/dist/LICENSE
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal/src/main/dist/LICENSE?rev=1344817&r1=1344816&r2=1344817&view=diff
==============================================================================
--- rave/trunk/rave-portal/src/main/dist/LICENSE (original)
+++ rave/trunk/rave-portal/src/main/dist/LICENSE Thu May 31 17:06:37 2012
@@ -204,7 +204,7 @@
===============================================================================
-The Apache Rave (inclubating) distribution includes a number of subcomponents
+The Apache Rave 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.
@@ -2018,46 +2018,15 @@ The following licenses relate to subcomp
not already included above.
===============================================================================
===============================================================================
-The following components come under Apache Software License 2.0
+The following components come under Apache License 2.0
===============================================================================
dwr-2.0.5
- Containing Project URL: http://directwebremoting.org/
-
- /*
- * Copyright 2005 Joe Walker
- *
- * 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.
- */
-
enyo.js
enyo.css
-
-/* Enyo v2.0.0 | Copyright 2011-2012 Hewlett-Packard Development Company, L.P. | enyojs.com | enyojs.com/license */
-
OpenAjaxManagedHub-all.js
-
- /*
- * Copyright 2006 OpenAjax Alliance
- *
- * 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.
- */
+google-collections-1.0-rc2.jar
+
===============================================================================
The following components are MIT Licensed
===============================================================================
@@ -2455,30 +2424,6 @@ s5
"As of version 1.1, the technology itself has been explicitly released into the
Public Domain, so there are no restrictions whatsoever on its use or reuse
(nor can there ever be)"
-
-===============================================================================
-The following components come under Apache Software License 2.0
-===============================================================================
-
-
-google-collections-1.0-rc2.jar
- Containing Project URL: http://code.google.com/p/google-collections/
-
-/*
- * Copyright (C) 2009 Google Inc.
- *
- * 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 following components are BSD Licensed
Modified: rave/trunk/rave-portal/src/main/dist/NOTICE
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal/src/main/dist/NOTICE?rev=1344817&r1=1344816&r2=1344817&view=diff
==============================================================================
--- rave/trunk/rave-portal/src/main/dist/NOTICE (original)
+++ rave/trunk/rave-portal/src/main/dist/NOTICE Thu May 31 17:06:37 2012
@@ -7,6 +7,18 @@ The Apache Software Foundation (http://w
This product includes software (Bootstrap) developed at
Twitter (http://www.twitter.com/).
+This product includes software (Direct Web Remoting) which is released under the Apache License 2.0 and is
+Copyright 2005 Joe Walker (http://directwebremoting.org).
+
+This product includes software (Enyo 2.0.0) which is released under the Apache License 2.0 and is
+Copyright 2011-2012 Hewlett-Packard Development Company, L.P. (http://enyojs.com).
+
+This product includes software (OpenAjax Managed Hub) which is released under the Apache License 2.0 and is
+Copyright 2006 OpenAjax Alliance (http://www.openajax.org).
+
+This product includes software (Google Collections) which is released under the Apache License 2.0 and is
+Copyright (C) 2009 Google Inc. (http://code.google.com/p/google-collections/).
+
Java compilation software for JSP pages is provided by Eclipse, which is open source software. The original software and
related information is available at http://www.eclipse.org.