You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by bi...@apache.org on 2004/02/23 00:32:15 UTC

cvs commit: jakarta-tomcat/src/examples/jsp/plugin/applet Clock2.java

billbarker    2004/02/22 15:32:15

  Modified:    src/examples/jsp/plugin plugin.html plugin.jsp plugin.txt
               src/examples/jsp/plugin/applet Clock2.java
  Log:
  Updating to the Apache License v2.0.
  
  Revision  Changes    Path
  1.4       +14 -3     jakarta-tomcat/src/examples/jsp/plugin/plugin.html
  
  Index: plugin.html
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/plugin/plugin.html,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- plugin.html	10 Mar 2001 03:00:55 -0000	1.3
  +++ plugin.html	22 Feb 2004 23:32:15 -0000	1.4
  @@ -1,7 +1,18 @@
   <html>
  -<!--
  -  Copyright (c) 1999 The Apache Software Foundation.  All rights 
  -  reserved.
  +<!--   
  +    Copyright 1999-2004 The Apache Software Foundation
  +  
  +    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.
   -->
   <head>
   <title>Untitled Document</title>
  
  
  
  1.3       +14 -3     jakarta-tomcat/src/examples/jsp/plugin/plugin.jsp
  
  Index: plugin.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/plugin/plugin.jsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- plugin.jsp	20 Oct 1999 23:19:50 -0000	1.2
  +++ plugin.jsp	22 Feb 2004 23:32:15 -0000	1.3
  @@ -1,7 +1,18 @@
   <html>
  -<!-- 
  -  Copyright (c) 1999 The Apache Software Foundation.  All rights 
  -  reserved.
  +<!--   
  +    Copyright 1999-2004 The Apache Software Foundation
  +  
  +    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.
   -->
   <title> Plugin example </title>
   <body bgcolor="white">
  
  
  
  1.3       +14 -3     jakarta-tomcat/src/examples/jsp/plugin/plugin.txt
  
  Index: plugin.txt
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/plugin/plugin.txt,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- plugin.txt	20 Oct 1999 23:19:51 -0000	1.2
  +++ plugin.txt	22 Feb 2004 23:32:15 -0000	1.3
  @@ -1,7 +1,18 @@
   <html>
  -<!-- 
  -  Copyright (c) 1999 The Apache Software Foundation.  All rights 
  -  reserved.
  +<!--   
  +    Copyright 1999-2004 The Apache Software Foundation
  +  
  +    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.
   -->
   <title> Plugin example </title>
   <body bgcolor="white">
  
  
  
  1.3       +14 -3     jakarta-tomcat/src/examples/jsp/plugin/applet/Clock2.java
  
  Index: Clock2.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/examples/jsp/plugin/applet/Clock2.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Clock2.java	20 Oct 1999 23:19:53 -0000	1.2
  +++ Clock2.java	22 Feb 2004 23:32:15 -0000	1.3
  @@ -1,6 +1,17 @@
  -/*
  - * Copyright (c) 1999 The Apache Software Foundation.  All rights 
  - * reserved.
  +/*   
  + *  Copyright 1999-2004 The Apache Software Foundation
  + *
  + *  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.
    */
   
   import java.util.*;
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Re: cvs commit: jakarta-tomcat/src/examples/jsp/plugin/applet Clock2.java

Posted by Henri Gomez <hg...@apache.org>.
Remy Maucherat wrote:

> Henri Gomez wrote:
> 
>> ant or shells scripts ?
>>
>> Pointers more than welcome
> 
> 
> Here's one from commons-dev, and the reference page is here: 
> http://www.apache.org/dev/apply-license.html

Should just update the build to handle .c, .h

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Re: cvs commit: jakarta-tomcat/src/examples/jsp/plugin/applet Clock2.java

Posted by Remy Maucherat <re...@apache.org>.
Henri Gomez wrote:
> ant or shells scripts ?
> 
> Pointers more than welcome

Here's one from commons-dev, and the reference page is here: 
http://www.apache.org/dev/apply-license.html

Rémy


Re: cvs commit: jakarta-tomcat/src/examples/jsp/plugin/applet Clock2.java

Posted by Henri Gomez <hg...@apache.org>.
Remy Maucherat wrote:

> Henri Gomez wrote:
> 
>> billbarker@apache.org wrote:
>>
>>> billbarker    2004/02/22 15:32:15
>>>
>>>   Modified:    src/examples/jsp/plugin plugin.html plugin.jsp plugin.txt
>>>                src/examples/jsp/plugin/applet Clock2.java
>>>   Log:
>>>   Updating to the Apache License v2.0.
>>>     Revision  Changes    Path
>>>   1.4       +14 -3     
>>> jakarta-tomcat/src/examples/jsp/plugin/plugin.html
>>
>>
>>
>> Should we update jk and jk2 to Apache License 2.0 ?
> 
> 
> I think the official word is: all releases after the 1st of March must 
> be Apache License 2.0. So there's one week left if you don't want to 
> update yet.
> (I've seen scripts to do automatic rreplacements, but haven't tested 
> them; I won't do it manually, that's for sure)

ant or shells scripts ?

Pointers more than welcome

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Re: cvs commit: jakarta-tomcat/src/examples/jsp/plugin/applet Clock2.java

Posted by Remy Maucherat <re...@apache.org>.
Henri Gomez wrote:
> billbarker@apache.org wrote:
> 
>> billbarker    2004/02/22 15:32:15
>>
>>   Modified:    src/examples/jsp/plugin plugin.html plugin.jsp plugin.txt
>>                src/examples/jsp/plugin/applet Clock2.java
>>   Log:
>>   Updating to the Apache License v2.0.
>>     Revision  Changes    Path
>>   1.4       +14 -3     jakarta-tomcat/src/examples/jsp/plugin/plugin.html
> 
> 
> Should we update jk and jk2 to Apache License 2.0 ?

I think the official word is: all releases after the 1st of March must 
be Apache License 2.0. So there's one week left if you don't want to 
update yet.
(I've seen scripts to do automatic rreplacements, but haven't tested 
them; I won't do it manually, that's for sure)

Rémy


---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Re: cvs commit: jakarta-tomcat/src/examples/jsp/plugin/applet Clock2.java

Posted by Henri Gomez <hg...@apache.org>.
billbarker@apache.org wrote:

> billbarker    2004/02/22 15:32:15
> 
>   Modified:    src/examples/jsp/plugin plugin.html plugin.jsp plugin.txt
>                src/examples/jsp/plugin/applet Clock2.java
>   Log:
>   Updating to the Apache License v2.0.
>   
>   Revision  Changes    Path
>   1.4       +14 -3     jakarta-tomcat/src/examples/jsp/plugin/plugin.html

Should we update jk and jk2 to Apache License 2.0 ?

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org