You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomee.apache.org by Jacek Laskowski <ja...@japila.pl> on 2011/09/25 11:06:56 UTC
Re: svn commit: r1175333 - in /openejb/trunk/openejb3:
assembly/openejb-tomcat/tomee-embedded/src/main/resources/org/apache/openejb/tomee/configs/
container/openejb-jee/src/test/resources/jsf/1_1_dtd/ container/openejb-junit/src/main/resources/META-I
On Sun, Sep 25, 2011 at 10:45 AM, <db...@apache.org> wrote:
> Author: dblevins
> Date: Sun Sep 25 08:45:28 2011
> New Revision: 1175333
>
> URL: http://svn.apache.org/viewvc?rev=1175333&view=rev
> Log:
> added license headers
...
> Modified: openejb/trunk/openejb3/container/openejb-jee/src/test/resources/jsf/1_1_dtd/faces-config.xml
> URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/jsf/1_1_dtd/faces-config.xml?rev=1175333&r1=1175332&r2=1175333&view=diff
> ==============================================================================
> --- openejb/trunk/openejb3/container/openejb-jee/src/test/resources/jsf/1_1_dtd/faces-config.xml (original)
> +++ openejb/trunk/openejb3/container/openejb-jee/src/test/resources/jsf/1_1_dtd/faces-config.xml Sun Sep 25 08:45:28 2011
> @@ -3,10 +3,21 @@ PUBLIC "-//Sun Microsystems, Inc.//DTD J
> "http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
>
> <!--
> - Copyright 2004 Sun Microsystems, Inc. All rights reserved.
> - SUN PROPRIETARY/CONFIDENTIAL. Use is subject license terms.
>
> - $ID$
> + Licensed to the Apache Software Foundation (ASF) under one or more
> + contributor license agreements. See the NOTICE file distributed with
> + this work for additional information regarding copyright ownership.
> + The ASF licenses this file to You 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.
> -->
>
> <faces-config>
I believe it's safer (from legal point of view) to remove the file
altogether - it had Sun's copyright - and create a new one instead -
ours. Even though the end result is alike, we must not modify a file
we don't own.
Jacek
--
Jacek Laskowski
Java EE, functional languages and IBM WebSphere - http://blog.japila.pl
Warszawa JUG conference = Confitura (formerly Javarsovia) :: http://confitura.pl
Re: svn commit: r1175333 - in /openejb/trunk/openejb3: assembly/openejb-tomcat/tomee-embedded/src/main/resources/org/apache/openejb/tomee/configs/ container/openejb-jee/src/test/resources/jsf/1_1_dtd/ container/openejb-junit/src/main/resources/META-I
Posted by David Blevins <da...@gmail.com>.
On Sep 25, 2011, at 2:06 AM, Jacek Laskowski wrote:
> On Sun, Sep 25, 2011 at 10:45 AM, <db...@apache.org> wrote:
>> Author: dblevins
>> Date: Sun Sep 25 08:45:28 2011
>> New Revision: 1175333
>>
>> URL: http://svn.apache.org/viewvc?rev=1175333&view=rev
>> Log:
>> added license headers
> ...
>> Modified: openejb/trunk/openejb3/container/openejb-jee/src/test/resources/jsf/1_1_dtd/faces-config.xml
>> URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/jsf/1_1_dtd/faces-config.xml?rev=1175333&r1=1175332&r2=1175333&view=diff
>> ==============================================================================
>> --- openejb/trunk/openejb3/container/openejb-jee/src/test/resources/jsf/1_1_dtd/faces-config.xml (original)
>> +++ openejb/trunk/openejb3/container/openejb-jee/src/test/resources/jsf/1_1_dtd/faces-config.xml Sun Sep 25 08:45:28 2011
>> @@ -3,10 +3,21 @@ PUBLIC "-//Sun Microsystems, Inc.//DTD J
>> "http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
>>
>> <!--
>> - Copyright 2004 Sun Microsystems, Inc. All rights reserved.
>> - SUN PROPRIETARY/CONFIDENTIAL. Use is subject license terms.
>>
>> - $ID$
>> + Licensed to the Apache Software Foundation (ASF) under one or more
>> + contributor license agreements. See the NOTICE file distributed with
>> + this work for additional information regarding copyright ownership.
>> + The ASF licenses this file to You 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.
>> -->
>>
>> <faces-config>
>
> I believe it's safer (from legal point of view) to remove the file
> altogether - it had Sun's copyright - and create a new one instead -
> ours. Even though the end result is alike, we must not modify a file
> we don't own.
Done.
-David