geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gdam...@apache.org
Subject cvs commit: incubator-geronimo/modules/jetty/src/test-resources/deployables/war1/WEB-INF geronimo-web.xml web.xml
Date Wed, 10 Mar 2004 09:58:56 GMT
gdamour     2004/03/10 01:58:56

  Modified:    modules/jetty maven.xml project.xml
               modules/jetty/src/etc/META-INF geronimo-service.xml
               modules/jetty/src/java/org/apache/geronimo/jetty
                        JettyContainer.java JettyContainerImpl.java
                        JettyWebApplicationContext.java
               modules/jetty/src/java/org/apache/geronimo/jetty/connector
                        AJP13Connector.java HTTPConnector.java
                        HTTPSConnector.java JettyConnector.java
               modules/jetty/src/java/org/apache/geronimo/jetty/deployment
                        WARConfigBuilder.java WARConfiguration.java
                        WARConfigurer.java WebAppDConfigBean.java
                        WebAppDConfigRoot.java
               modules/jetty/src/schema geronimo-jetty.xsd
               modules/jetty/src/test/org/apache/geronimo/jetty
                        ApplicationTest.java ContainerTest.java
               modules/jetty/src/test/org/apache/geronimo/jetty/deployment
                        WebAppDConfigTest.java
               modules/jetty/src/test-resources/deployables/war1/WEB-INF
                        geronimo-web.xml web.xml
  Added:       modules/jetty NOTICE.txt
  Log:
  Reporters: David Jencks, Dain Sundstrom.
  
  Copyright range fix subsequent to the License migration 1.1 => 2.0.
  
  Revision  Changes    Path
  1.4       +18 -1     incubator-geronimo/modules/jetty/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/jetty/maven.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- maven.xml	10 Feb 2004 23:30:10 -0000	1.3
  +++ maven.xml	10 Mar 2004 09:58:55 -0000	1.4
  @@ -1,4 +1,21 @@
   <?xml version="1.0" encoding="ISO-8859-1"?>
  +<!--
  +
  +    Copyright 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.
  +-->
  +  
   
   <!-- $Revision$ $Date$ -->
   
  
  
  
  1.22      +18 -1     incubator-geronimo/modules/jetty/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/jetty/project.xml,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- project.xml	19 Feb 2004 09:00:28 -0000	1.21
  +++ project.xml	10 Mar 2004 09:58:55 -0000	1.22
  @@ -1,4 +1,21 @@
   <?xml version="1.0" encoding="ISO-8859-1"?>
  +<!--
  +
  +    Copyright 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.
  +-->
  +  
   
   <!-- $Revision$ $Date$ -->
   
  
  
  
  1.1                  incubator-geronimo/modules/jetty/NOTICE.txt
  
  Index: NOTICE.txt
  ===================================================================
  This product includes software developed by
  The Apache Software Foundation (http://www.apache.org/).
  
  
  
  
  1.8       +17 -0     incubator-geronimo/modules/jetty/src/etc/META-INF/geronimo-service.xml
  
  Index: geronimo-service.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/jetty/src/etc/META-INF/geronimo-service.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- geronimo-service.xml	12 Feb 2004 23:21:53 -0000	1.7
  +++ geronimo-service.xml	10 Mar 2004 09:58:55 -0000	1.8
  @@ -1,4 +1,21 @@
   <?xml version="1.0" encoding="UTF-8"?>
  +<!--
  +
  +    Copyright 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.
  +-->
  +  
   <service xmlns="http://geronimo.apache.org/xml/ns/deployment">
       <dependency>
           <uri>jetty/jars/org.mortbay.jetty-5.0.beta0.jar</uri>
  
  
  
  1.3       +2 -2      incubator-geronimo/modules/jetty/src/java/org/apache/geronimo/jetty/JettyContainer.java
  
  Index: JettyContainer.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/jetty/src/java/org/apache/geronimo/jetty/JettyContainer.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- JettyContainer.java	25 Feb 2004 09:57:44 -0000	1.2
  +++ JettyContainer.java	10 Mar 2004 09:58:55 -0000	1.3
  @@ -1,6 +1,6 @@
   /**
    *
  - * Copyright 2004 The Apache Software Foundation
  + * Copyright 2003-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.
  
  
  
  1.4       +2 -2      incubator-geronimo/modules/jetty/src/java/org/apache/geronimo/jetty/JettyContainerImpl.java
  
  Index: JettyContainerImpl.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/jetty/src/java/org/apache/geronimo/jetty/JettyContainerImpl.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- JettyContainerImpl.java	25 Feb 2004 09:57:44 -0000	1.3
  +++ JettyContainerImpl.java	10 Mar 2004 09:58:55 -0000	1.4
  @@ -1,6 +1,6 @@
   /**
    *
  - * Copyright 2004 The Apache Software Foundation
  + * Copyright 2003-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.
  
  
  
  1.11      +2 -2      incubator-geronimo/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebApplicationContext.java
  
  Index: JettyWebApplicationContext.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebApplicationContext.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- JettyWebApplicationContext.java	25 Feb 2004 09:57:44 -0000	1.10
  +++ JettyWebApplicationContext.java	10 Mar 2004 09:58:55 -0000	1.11
  @@ -1,6 +1,6 @@
   /**
    *
  - * Copyright 2004 The Apache Software Foundation
  + * Copyright 2003-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.
  
  
  
  1.3       +2 -2      incubator-geronimo/modules/jetty/src/java/org/apache/geronimo/jetty/connector/AJP13Connector.java
  
  Index: AJP13Connector.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/jetty/src/java/org/apache/geronimo/jetty/connector/AJP13Connector.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AJP13Connector.java	25 Feb 2004 09:57:44 -0000	1.2
  +++ AJP13Connector.java	10 Mar 2004 09:58:56 -0000	1.3
  @@ -1,6 +1,6 @@
   /**
    *
  - * Copyright 2004 The Apache Software Foundation
  + * Copyright 2003-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.
  
  
  
  1.3       +2 -2      incubator-geronimo/modules/jetty/src/java/org/apache/geronimo/jetty/connector/HTTPConnector.java
  
  Index: HTTPConnector.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/jetty/src/java/org/apache/geronimo/jetty/connector/HTTPConnector.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- HTTPConnector.java	25 Feb 2004 09:57:44 -0000	1.2
  +++ HTTPConnector.java	10 Mar 2004 09:58:56 -0000	1.3
  @@ -1,6 +1,6 @@
   /**
    *
  - * Copyright 2004 The Apache Software Foundation
  + * Copyright 2003-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.
  
  
  
  1.3       +2 -2      incubator-geronimo/modules/jetty/src/java/org/apache/geronimo/jetty/connector/HTTPSConnector.java
  
  Index: HTTPSConnector.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/jetty/src/java/org/apache/geronimo/jetty/connector/HTTPSConnector.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- HTTPSConnector.java	25 Feb 2004 09:57:44 -0000	1.2
  +++ HTTPSConnector.java	10 Mar 2004 09:58:56 -0000	1.3
  @@ -1,6 +1,6 @@
   /**
    *
  - * Copyright 2004 The Apache Software Foundation
  + * Copyright 2003-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.
  
  
  
  1.5       +2 -2      incubator-geronimo/modules/jetty/src/java/org/apache/geronimo/jetty/connector/JettyConnector.java
  
  Index: JettyConnector.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/jetty/src/java/org/apache/geronimo/jetty/connector/JettyConnector.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- JettyConnector.java	25 Feb 2004 09:57:44 -0000	1.4
  +++ JettyConnector.java	10 Mar 2004 09:58:56 -0000	1.5
  @@ -1,6 +1,6 @@
   /**
    *
  - * Copyright 2004 The Apache Software Foundation
  + * Copyright 2003-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.
  
  
  
  1.14      +2 -2      incubator-geronimo/modules/jetty/src/java/org/apache/geronimo/jetty/deployment/WARConfigBuilder.java
  
  Index: WARConfigBuilder.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/jetty/src/java/org/apache/geronimo/jetty/deployment/WARConfigBuilder.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- WARConfigBuilder.java	9 Mar 2004 22:49:07 -0000	1.13
  +++ WARConfigBuilder.java	10 Mar 2004 09:58:56 -0000	1.14
  @@ -1,6 +1,6 @@
   /**
    *
  - * Copyright 2004 The Apache Software Foundation
  + * Copyright 2003-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.
  
  
  
  1.7       +2 -2      incubator-geronimo/modules/jetty/src/java/org/apache/geronimo/jetty/deployment/WARConfiguration.java
  
  Index: WARConfiguration.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/jetty/src/java/org/apache/geronimo/jetty/deployment/WARConfiguration.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- WARConfiguration.java	25 Feb 2004 09:57:44 -0000	1.6
  +++ WARConfiguration.java	10 Mar 2004 09:58:56 -0000	1.7
  @@ -1,6 +1,6 @@
   /**
    *
  - * Copyright 2004 The Apache Software Foundation
  + * Copyright 2003-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.
  
  
  
  1.3       +2 -2      incubator-geronimo/modules/jetty/src/java/org/apache/geronimo/jetty/deployment/WARConfigurer.java
  
  Index: WARConfigurer.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/jetty/src/java/org/apache/geronimo/jetty/deployment/WARConfigurer.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- WARConfigurer.java	25 Feb 2004 09:57:44 -0000	1.2
  +++ WARConfigurer.java	10 Mar 2004 09:58:56 -0000	1.3
  @@ -1,6 +1,6 @@
   /**
    *
  - * Copyright 2004 The Apache Software Foundation
  + * Copyright 2003-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.
  
  
  
  1.14      +2 -2      incubator-geronimo/modules/jetty/src/java/org/apache/geronimo/jetty/deployment/WebAppDConfigBean.java
  
  Index: WebAppDConfigBean.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/jetty/src/java/org/apache/geronimo/jetty/deployment/WebAppDConfigBean.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- WebAppDConfigBean.java	9 Mar 2004 18:03:52 -0000	1.13
  +++ WebAppDConfigBean.java	10 Mar 2004 09:58:56 -0000	1.14
  @@ -1,6 +1,6 @@
   /**
    *
  - * Copyright 2004 The Apache Software Foundation
  + * Copyright 2003-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.
  
  
  
  1.9       +2 -2      incubator-geronimo/modules/jetty/src/java/org/apache/geronimo/jetty/deployment/WebAppDConfigRoot.java
  
  Index: WebAppDConfigRoot.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/jetty/src/java/org/apache/geronimo/jetty/deployment/WebAppDConfigRoot.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- WebAppDConfigRoot.java	25 Feb 2004 09:57:44 -0000	1.8
  +++ WebAppDConfigRoot.java	10 Mar 2004 09:58:56 -0000	1.9
  @@ -1,6 +1,6 @@
   /**
    *
  - * Copyright 2004 The Apache Software Foundation
  + * Copyright 2003-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.
  
  
  
  1.7       +17 -0     incubator-geronimo/modules/jetty/src/schema/geronimo-jetty.xsd
  
  Index: geronimo-jetty.xsd
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/jetty/src/schema/geronimo-jetty.xsd,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- geronimo-jetty.xsd	9 Mar 2004 18:03:52 -0000	1.6
  +++ geronimo-jetty.xsd	10 Mar 2004 09:58:56 -0000	1.7
  @@ -1,4 +1,21 @@
   <?xml version="1.0" encoding="UTF-8"?>
  +<!--
  +
  +    Copyright 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.
  +-->
  +  
   <xs:schema
       xmlns:jetty="http://geronimo.apache.org/xml/ns/web/jetty"
       targetNamespace="http://geronimo.apache.org/xml/ns/web/jetty"
  
  
  
  1.7       +2 -2      incubator-geronimo/modules/jetty/src/test/org/apache/geronimo/jetty/ApplicationTest.java
  
  Index: ApplicationTest.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/jetty/src/test/org/apache/geronimo/jetty/ApplicationTest.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ApplicationTest.java	25 Feb 2004 09:57:44 -0000	1.6
  +++ ApplicationTest.java	10 Mar 2004 09:58:56 -0000	1.7
  @@ -1,6 +1,6 @@
   /**
    *
  - * Copyright 2004 The Apache Software Foundation
  + * Copyright 2003-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.
  
  
  
  1.5       +2 -2      incubator-geronimo/modules/jetty/src/test/org/apache/geronimo/jetty/ContainerTest.java
  
  Index: ContainerTest.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/jetty/src/test/org/apache/geronimo/jetty/ContainerTest.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ContainerTest.java	25 Feb 2004 09:57:44 -0000	1.4
  +++ ContainerTest.java	10 Mar 2004 09:58:56 -0000	1.5
  @@ -1,6 +1,6 @@
   /**
    *
  - * Copyright 2004 The Apache Software Foundation
  + * Copyright 2003-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.
  
  
  
  1.12      +2 -2      incubator-geronimo/modules/jetty/src/test/org/apache/geronimo/jetty/deployment/WebAppDConfigTest.java
  
  Index: WebAppDConfigTest.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/jetty/src/test/org/apache/geronimo/jetty/deployment/WebAppDConfigTest.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- WebAppDConfigTest.java	25 Feb 2004 09:57:44 -0000	1.11
  +++ WebAppDConfigTest.java	10 Mar 2004 09:58:56 -0000	1.12
  @@ -1,6 +1,6 @@
   /**
    *
  - * Copyright 2004 The Apache Software Foundation
  + * Copyright 2003-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.
  
  
  
  1.7       +17 -0     incubator-geronimo/modules/jetty/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml
  
  Index: geronimo-web.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/jetty/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- geronimo-web.xml	20 Feb 2004 07:19:13 -0000	1.6
  +++ geronimo-web.xml	10 Mar 2004 09:58:56 -0000	1.7
  @@ -1,4 +1,21 @@
   <?xml version="1.0" encoding="UTF-8"?>
  +<!--
  +
  +    Copyright 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.
  +-->
  +  
   <jetty:web-app
       xmlns:jetty="http://geronimo.apache.org/xml/ns/web/jetty"
       configId="org/apache/geronimo/jetty/Test"
  
  
  
  1.5       +17 -0     incubator-geronimo/modules/jetty/src/test-resources/deployables/war1/WEB-INF/web.xml
  
  Index: web.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/jetty/src/test-resources/deployables/war1/WEB-INF/web.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- web.xml	25 Jan 2004 01:53:17 -0000	1.4
  +++ web.xml	10 Mar 2004 09:58:56 -0000	1.5
  @@ -1,4 +1,21 @@
   <?xml version="1.0" encoding="UTF-8"?>
  +<!--
  +
  +    Copyright 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.
  +-->
  +  
   <!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
   
   <web-app>
  
  
  

Mime
View raw message