I have moved the Copyright notification to the NOTICE file and trimmed it
from the LICENSE.  These changes will be part of the release.

On 5/31/12 12:13 PM, "Franklin, Matthew B." <[email protected]> wrote:

>
>On 5/31/12 7:59 AM, "[email protected]" <[email protected]> wrote:
>
>>Author: psharples
>>Date: Thu May 31 11:59:31 2012
>>New Revision: 1344661
>>
>>URL: http://svn.apache.org/viewvc?rev=1344661&view=rev
>>Log:
>>Added entry for OpenAjaxManagedHub to LICENCE (was added to wookie in
>>v0.10.0).  Also updated pom.xml to point to wookie version 0.10.0. See
>>RAVE-633.
>>
>>Modified:
>>    rave/trunk/pom.xml
>>    rave/trunk/rave-portal/src/main/dist/LICENSE
>>
>>Modified: rave/trunk/pom.xml
>>URL: 
>>http://svn.apache.org/viewvc/rave/trunk/pom.xml?rev=1344661&r1=1344660&r2
>>=
>>1344661&view=diff
>>=========================================================================
>>=
>>====
>>--- rave/trunk/pom.xml (original)
>>+++ rave/trunk/pom.xml Thu May 31 11:59:31 2012
>>@@ -43,7 +43,7 @@
>> 
>>     <properties>
>>         <apache.shindig.version>2.5.0-beta1</apache.shindig.version>
>>-        <apache.wookie.version>0.9.2-incubating</apache.wookie.version>
>>+        <apache.wookie.version>0.10.0-incubating</apache.wookie.version>
>>         
>><org.springframework.version>3.1.0.RELEASE</org.springframework.version>
>>         
>><org.springframework.mobile.version>1.0.0.M3</org.springframework.mobile.
>>v
>>ersion>
>>         <jstl.version>1.2</jstl.version>
>>
>>Modified: rave/trunk/rave-portal/src/main/dist/LICENSE
>>URL: 
>>http://svn.apache.org/viewvc/rave/trunk/rave-portal/src/main/dist/LICENSE
>>?
>>rev=1344661&r1=1344660&r2=1344661&view=diff
>>=========================================================================
>>=
>>====
>>--- rave/trunk/rave-portal/src/main/dist/LICENSE (original)
>>+++ rave/trunk/rave-portal/src/main/dist/LICENSE Thu May 31 11:59:31 2012
>>@@ -2045,6 +2045,19 @@ 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
>
>Since the license is ASL v2, the copyright notice should just be added to
>NOTICE
>
>>+  *
>>+  * 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 MIT Licensed
>> 
>>=========================================================================
>>=
>>===== 
>>
>>
>
>

Reply via email to