geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r636511 - in /geronimo/specs/trunk: ./ geronimo-servlet_2.5_spec/ geronimo-servlet_2.5_spec/src/main/appended-resources/ geronimo-servlet_2.5_spec/src/main/appended-resources/META-INF/ geronimo-servlet_2.5_spec/src/main/java/javax/servlet/h...
Date Wed, 12 Mar 2008 21:11:30 GMT
Author: djencks
Date: Wed Mar 12 14:11:22 2008
New Revision: 636511

URL: http://svn.apache.org/viewvc?rev=636511&view=rev
Log:
GERONIMO-3896 fix HEAD requests.  Also upgrade to genesis 1.4

Added:
    geronimo/specs/trunk/LICENSE
      - copied, changed from r636482, geronimo/specs/trunk/LICENSE.txt
    geronimo/specs/trunk/NOTICE
      - copied unchanged from r636482, geronimo/specs/trunk/NOTICE.txt
    geronimo/specs/trunk/README
      - copied unchanged from r636482, geronimo/specs/trunk/README.txt
    geronimo/specs/trunk/geronimo-servlet_2.5_spec/src/main/appended-resources/
    geronimo/specs/trunk/geronimo-servlet_2.5_spec/src/main/appended-resources/META-INF/
    geronimo/specs/trunk/geronimo-servlet_2.5_spec/src/main/appended-resources/META-INF/LICENSE
  (contents, props changed)
      - copied, changed from r636482, geronimo/specs/trunk/geronimo-servlet_2.5_spec/LICENSE.txt
    geronimo/specs/trunk/geronimo-servlet_2.5_spec/src/main/appended-resources/META-INF/NOTICE
  (contents, props changed)
      - copied, changed from r636482, geronimo/specs/trunk/geronimo-servlet_2.5_spec/NOTICE.txt
Removed:
    geronimo/specs/trunk/LICENSE.txt
    geronimo/specs/trunk/NOTICE.txt
    geronimo/specs/trunk/README.txt
    geronimo/specs/trunk/geronimo-servlet_2.5_spec/LICENSE.txt
    geronimo/specs/trunk/geronimo-servlet_2.5_spec/NOTICE.txt
Modified:
    geronimo/specs/trunk/geronimo-servlet_2.5_spec/pom.xml
    geronimo/specs/trunk/geronimo-servlet_2.5_spec/src/main/java/javax/servlet/http/HttpServlet.java
    geronimo/specs/trunk/geronimo-servlet_2.5_spec/src/site/site.xml
    geronimo/specs/trunk/pom.xml
    geronimo/specs/trunk/src/site/site.xml

Copied: geronimo/specs/trunk/LICENSE (from r636482, geronimo/specs/trunk/LICENSE.txt)
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/LICENSE?p2=geronimo/specs/trunk/LICENSE&p1=geronimo/specs/trunk/LICENSE.txt&r1=636482&r2=636511&rev=636511&view=diff
==============================================================================
--- geronimo/specs/trunk/LICENSE.txt (original)
+++ geronimo/specs/trunk/LICENSE Wed Mar 12 14:11:22 2008
@@ -201,3 +201,57 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 
+
+#########################################################################
+## ADDITIONAL LICENSES                                                 ##
+#########################################################################
+
+The XMLSchema.dtd included in this project was developed by the
+W3C Consortium (http://www.w3c.org/).
+Use of the source code, thus licensed, and the resultant binary are
+subject to the terms and conditions of the following license.
+
+W3C¨ SOFTWARE NOTICE AND LICENSE
+Copyright © 1994-2002 World Wide Web Consortium, (Massachusetts Institute of
+Technology, Institut National de Recherche en Informatique et en Automatique,
+Keio University). All Rights Reserved. http://www.w3.org/Consortium/Legal/
+
+This W3C work (including software, documents, or other related items) is
+being provided by the copyright holders under the following license. By
+obtaining, using and/or copying this work, you (the licensee) agree that you
+have read, understood, and will comply with the following terms and
+conditions:
+
+Permission to use, copy, modify, and distribute this software and its
+documentation, with or without modification,  for any purpose and without
+fee or royalty is hereby granted, provided that you include the following on
+ALL copies of the software and documentation or portions thereof, including
+modifications, that you make:
+
+   1. The full text of this NOTICE in a location viewable to users of the
+         redistributed or derivative work.
+   2. Any pre-existing intellectual property disclaimers, notices, or terms
+         and conditions. If none exist, a short notice of the following form
+         (hypertext is preferred, text is permitted) should be used within
+         the body of any redistributed or derivative code: "Copyright ©
+         [$date-of-software] World Wide Web Consortium, (Massachusetts Institute
+         of Technology, Institut National de Recherche en Informatique et en
+         Automatique, Keio University). All Rights Reserved.
+         http://www.w3.org/Consortium/Legal/"
+   3. Notice of any changes or modifications to the W3C files, including the
+         date changes were made. (We recommend you provide URIs to the location
+         from which the code is derived.)
+
+THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE
+NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT
+THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS,
+COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
+
+The name and trademarks of copyright holders may NOT be used in advertising or
+publicity pertaining to the software without specific, written prior permission.
+Title to copyright in this software and any associated documentation will at all
+times remain with copyright holders.

Modified: geronimo/specs/trunk/geronimo-servlet_2.5_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-servlet_2.5_spec/pom.xml?rev=636511&r1=636510&r2=636511&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_2.5_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-servlet_2.5_spec/pom.xml Wed Mar 12 14:11:22 2008
@@ -27,26 +27,53 @@
     <parent>
         <groupId>org.apache.geronimo.specs</groupId>
         <artifactId>specs</artifactId>
-        <version>1.4</version>
+        <version>1.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-servlet_2.5_spec</artifactId>
     <packaging>jar</packaging>
     <name>Servlet 2.5</name>
-    <version>1.1.3-SNAPSHOT</version>
+    <version>1.2-SNAPSHOT</version>
 
     <description>Servlet 2.5 Specification</description>
 
+    <url>http://geronimo.apache.org/maven/${siteId}/${version}</url>
+    <distributionManagement>
+        <site>
+            <id>geronimo-website</id>
+            <url>${staging.siteURL}/${siteId}/${version}</url>
+        </site>
+    </distributionManagement>
+
     <properties>
+        <siteId>specs/servlet-2.5</siteId>
+
         <geronimo.osgi.export.pkg>javax.servlet*</geronimo.osgi.export.pkg>
         <geronimo.osgi.export.version>2.5</geronimo.osgi.export.version>
     </properties>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-servlet_2.5_spec/</connection>
-        <developerConnection>scm:svn:http://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-servlet_2.5_spec/</developerConnection>
+        <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-servlet_2.5_spec/</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-servlet_2.5_spec/</developerConnection>
         <url>http://svn.apache.org/viewcvs.cgi/geronimo/specs/trunk/geronimo-servlet_2.5_spec/</url>
     </scm>
+    <profiles>
+        <profile>
+            <id>release</id>
 
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-release-plugin</artifactId>
+                        <configuration>
+                            <tagBase>https://svn.apache.org/repos/asf/geronimo/specs/tags
+                            </tagBase>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>

Copied: geronimo/specs/trunk/geronimo-servlet_2.5_spec/src/main/appended-resources/META-INF/LICENSE
(from r636482, geronimo/specs/trunk/geronimo-servlet_2.5_spec/LICENSE.txt)
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-servlet_2.5_spec/src/main/appended-resources/META-INF/LICENSE?p2=geronimo/specs/trunk/geronimo-servlet_2.5_spec/src/main/appended-resources/META-INF/LICENSE&p1=geronimo/specs/trunk/geronimo-servlet_2.5_spec/LICENSE.txt&r1=636482&r2=636511&rev=636511&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_2.5_spec/LICENSE.txt (original)
+++ geronimo/specs/trunk/geronimo-servlet_2.5_spec/src/main/appended-resources/META-INF/LICENSE
Wed Mar 12 14:11:22 2008
@@ -1,206 +1,4 @@
 
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   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.
-
 #########################################################################
 ## ADDITIONAL LICENSES                                                 ##
 #########################################################################

Propchange: geronimo/specs/trunk/geronimo-servlet_2.5_spec/src/main/appended-resources/META-INF/LICENSE
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/specs/trunk/geronimo-servlet_2.5_spec/src/main/appended-resources/META-INF/LICENSE
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/specs/trunk/geronimo-servlet_2.5_spec/src/main/appended-resources/META-INF/LICENSE
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: geronimo/specs/trunk/geronimo-servlet_2.5_spec/src/main/appended-resources/META-INF/NOTICE
(from r636482, geronimo/specs/trunk/geronimo-servlet_2.5_spec/NOTICE.txt)
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-servlet_2.5_spec/src/main/appended-resources/META-INF/NOTICE?p2=geronimo/specs/trunk/geronimo-servlet_2.5_spec/src/main/appended-resources/META-INF/NOTICE&p1=geronimo/specs/trunk/geronimo-servlet_2.5_spec/NOTICE.txt&r1=636482&r2=636511&rev=636511&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_2.5_spec/NOTICE.txt (original)
+++ geronimo/specs/trunk/geronimo-servlet_2.5_spec/src/main/appended-resources/META-INF/NOTICE
Wed Mar 12 14:11:22 2008
@@ -1,8 +1,3 @@
-Apache Geronimo 
-Copyright 2003-2008 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
 
 This product includes software developed by
 The W3C Consortium (http://www.w3.org/).

Propchange: geronimo/specs/trunk/geronimo-servlet_2.5_spec/src/main/appended-resources/META-INF/NOTICE
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/specs/trunk/geronimo-servlet_2.5_spec/src/main/appended-resources/META-INF/NOTICE
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/specs/trunk/geronimo-servlet_2.5_spec/src/main/appended-resources/META-INF/NOTICE
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/specs/trunk/geronimo-servlet_2.5_spec/src/main/java/javax/servlet/http/HttpServlet.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-servlet_2.5_spec/src/main/java/javax/servlet/http/HttpServlet.java?rev=636511&r1=636510&r2=636511&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_2.5_spec/src/main/java/javax/servlet/http/HttpServlet.java
(original)
+++ geronimo/specs/trunk/geronimo-servlet_2.5_spec/src/main/java/javax/servlet/http/HttpServlet.java
Wed Mar 12 14:11:22 2008
@@ -817,47 +817,34 @@
  * to the HTTP Servlet Response object used to construct this one.
  */
 // file private
-class NoBodyResponse implements HttpServletResponse {
-    private HttpServletResponse		resp;
+class NoBodyResponse extends HttpServletResponseWrapper {
     private NoBodyOutputStream		noBody;
     private PrintWriter			writer;
     private boolean			didSetContentLength;
 
     // file private
     NoBodyResponse(HttpServletResponse r) {
-	resp = r;
+        super(r);
 	noBody = new NoBodyOutputStream();
     }
 
     // file private
     void setContentLength() {
 	if (!didSetContentLength)
-	  resp.setContentLength(noBody.getContentLength());
+	  super.setContentLength(noBody.getContentLength());
     }
 
 
     // SERVLET RESPONSE interface methods
 
     public void setContentLength(int len) {
-	resp.setContentLength(len);
+	super.setContentLength(len);
 	didSetContentLength = true;
     }
 
-    public void setCharacterEncoding(String charset)
-      { resp.setCharacterEncoding(charset); }
-
-    public void setContentType(String type)
-      { resp.setContentType(type); }
-
-    public String getContentType()
-      { return resp.getContentType(); }
-
     public ServletOutputStream getOutputStream() throws IOException
       { return noBody; }
 
-    public String getCharacterEncoding()
-	{ return resp.getCharacterEncoding(); }
-
     public PrintWriter getWriter() throws UnsupportedEncodingException
     {
 	if (writer == null) {
@@ -868,109 +855,6 @@
 	}
 	return writer;
     }
-
-    public void setBufferSize(int size) throws IllegalStateException
-      { resp.setBufferSize(size); }
-
-    public int getBufferSize()
-      { return resp.getBufferSize(); }
-
-    public void reset() throws IllegalStateException
-      { resp.reset(); }
-      
-      public void resetBuffer() throws IllegalStateException
-      { resp.resetBuffer(); }
-
-    public boolean isCommitted()
-      { return resp.isCommitted(); }
-
-    public void flushBuffer() throws IOException
-      { resp.flushBuffer(); }
-
-    public void setLocale(Locale loc)
-      { resp.setLocale(loc); }
-
-    public Locale getLocale()
-      { return resp.getLocale(); }
-
-
-    // HTTP SERVLET RESPONSE interface methods
-
-    public void addCookie(Cookie cookie)
-      { resp.addCookie(cookie); }
-
-    public boolean containsHeader(String name)
-      { return resp.containsHeader(name); }
-
-    /** @deprecated */
-    public void setStatus(int sc, String sm)
-      { resp.setStatus(sc, sm); }
-
-    public void setStatus(int sc)
-      { resp.setStatus(sc); }
-
-    public void setHeader(String name, String value)
-      { resp.setHeader(name, value); }
-
-    public void setIntHeader(String name, int value)
-      { resp.setIntHeader(name, value); }
-
-    public void setDateHeader(String name, long date)
-      { resp.setDateHeader(name, date); }
-
-    public void sendError(int sc, String msg) throws IOException
-      { resp.sendError(sc, msg); }
-
-    public void sendError(int sc) throws IOException
-      { resp.sendError(sc); }
-
-    public void sendRedirect(String location) throws IOException
-      { resp.sendRedirect(location); }
-    
-    public String encodeURL(String url) 
-      { return resp.encodeURL(url); }
-
-    public String encodeRedirectURL(String url)
-      { return resp.encodeRedirectURL(url); }
-      
-    public void addHeader(String name, String value)
-      { resp.addHeader(name, value); }
-      
-    public void addDateHeader(String name, long value)
-      { resp.addDateHeader(name, value); }
-      
-    public void addIntHeader(String name, int value)
-      { resp.addIntHeader(name, value); }
-      
-      
-      
-
-    /**
-     * @deprecated	As of Version 2.1, replaced by
-     * 			{@link HttpServletResponse#encodeURL}.
-     *
-     */
-     
-     
-    public String encodeUrl(String url) 
-      { return this.encodeURL(url); }
-      
-      
-      
-      
-      
-      
-      
-
-    /**
-     * @deprecated	As of Version 2.1, replaced by
-     *			{@link HttpServletResponse#encodeRedirectURL}.
-     *
-     */
-     
-     
-    public String encodeRedirectUrl(String url)
-      { return this.encodeRedirectURL(url); }
 
 }
 

Modified: geronimo/specs/trunk/geronimo-servlet_2.5_spec/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-servlet_2.5_spec/src/site/site.xml?rev=636511&r1=636510&r2=636511&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_2.5_spec/src/site/site.xml (original)
+++ geronimo/specs/trunk/geronimo-servlet_2.5_spec/src/site/site.xml Wed Mar 12 14:11:22 2008
@@ -22,14 +22,20 @@
 
 <project name="${project.name}">
     
+    <skin>
+        <groupId>org.apache.geronimo.genesis.config</groupId>
+        <artifactId>geronimo-skin</artifactId>
+        <version>1.4</version>
+    </skin>
+
+    <publishDate format="dd MMM yyyy"/>
+
+    <bannerLeft>
+        <src>images/topleft_logo_437x64.gif</src>
+        <href>http://geronimo.apache.org</href>
+    </bannerLeft>
     <body>
-        
-        ${parentProject}
-        
-        ${modules}
-        
-        ${reports}
-        
+        <menu ref="reports" />
     </body>
 
 </project>

Modified: geronimo/specs/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/pom.xml?rev=636511&r1=636510&r2=636511&view=diff
==============================================================================
--- geronimo/specs/trunk/pom.xml (original)
+++ geronimo/specs/trunk/pom.xml Wed Mar 12 14:11:22 2008
@@ -1,32 +1,31 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    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.
+-->
 
-	<!--
-	    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.
-	-->
+<!-- $Rev$ $Date$ -->
 
-	<!-- $Rev$ $Date$ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.apache.geronimo.genesis.config</groupId>
         <artifactId>project-config</artifactId>
-        <version>1.2</version>
+        <version>1.4</version>
     </parent>
 
     <groupId>org.apache.geronimo.specs</groupId>
@@ -45,30 +44,31 @@
         <url>http://svn.apache.org/viewvc/geronimo/specs/trunk/</url>
     </scm>
 
-    <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>3.8.1</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
+    <url>http://geronimo.apache.org/maven/${siteId}/${version}</url>
+    <distributionManagement>
+        <site>
+            <id>geronimo-website</id>
+            <url>${staging.siteURL}/${siteId}/${version}</url>
+        </site>
+    </distributionManagement>
 
     <properties>
-	    <!--
-	     |
-	     | Geronimo OSGi properties
-	     | 
-	     | Note: when modules can override these properties.
-	     |
-	     -->
-	    <geronimo.osgi.import.pkg>*</geronimo.osgi.import.pkg>
-	    <geronimo.osgi.export.pkg>*</geronimo.osgi.export.pkg>
-	    <geronimo.osgi.private.pkg />
-	    <geronimo.osgi.export>!META-INF*,${geronimo.osgi.export.pkg}*;version=${geronimo.osgi.export.version}</geronimo.osgi.export>
-	    <geronimo.osgi.export.version>${project.version}</geronimo.osgi.export.version>
-	    <geronimo.osgi.import>!META-INF*,${geronimo.osgi.import.pkg}</geronimo.osgi.import>
-	    <geronimo.osgi.symbolic.name>${groupId}.${artifactId}</geronimo.osgi.symbolic.name>
+        <siteId>specs</siteId>
+        <projectName>Apache Geronimo Specifications</projectName>
+        <!--
+              |
+              | Geronimo OSGi properties
+              |
+              | Note: when modules can override these properties.
+              |
+              -->
+        <geronimo.osgi.import.pkg>*</geronimo.osgi.import.pkg>
+        <geronimo.osgi.export.pkg>*</geronimo.osgi.export.pkg>
+        <geronimo.osgi.private.pkg/>
+        <geronimo.osgi.export>!META-INF*,${geronimo.osgi.export.pkg}*;version=${geronimo.osgi.export.version}</geronimo.osgi.export>
+        <geronimo.osgi.export.version>${project.version}</geronimo.osgi.export.version>
+        <geronimo.osgi.import>!META-INF*,${geronimo.osgi.import.pkg}</geronimo.osgi.import>
+        <geronimo.osgi.symbolic.name>${groupId}.${artifactId}</geronimo.osgi.symbolic.name>
     </properties>
 
     <build>
@@ -76,67 +76,15 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.0.2</version>
                 <configuration>
                     <source>1.5</source>
                     <target>1.5</target>
                 </configuration>
             </plugin>
 
-            <!-- We want to package up license resources in the JARs produced -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-remote-resources-plugin</artifactId>
-                <version>1.0-beta-2</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>process</goal>
-                        </goals>
-                        <configuration>
-                            <resourceBundles>
-                                <resourceBundle>org.apache:apache-jar-resource-bundle:1.0</resourceBundle>
-                            </resourceBundles>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.1</version>
-                <inherited>true</inherited>
-                <executions>
-                    <execution>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <copy file="LICENSE.txt" tofile="${project.build.directory}/maven-shared-archive-resources/META-INF/LICENSE"
overwrite="true" />
-                                <copy file="NOTICE.txt" tofile="${project.build.directory}/maven-shared-archive-resources/META-INF/NOTICE"
overwrite="true" />
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.3</version>
-                <inherited>true</inherited>
-                <configuration>
-                    <source>1.5</source>
-                </configuration>
-            </plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-idea-plugin</artifactId>
-                <version>2.1</version>
                 <configuration>
                     <jdkName>1.5</jdkName>
                     <linkModules>true</linkModules>
@@ -144,34 +92,22 @@
             </plugin>
 
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-release-plugin</artifactId>
-		        <version>2.0-beta-7</version>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <version>1.2.0</version>
+                <extensions>true</extensions>
                 <configuration>
-                    <tagBase>https://svn.apache.org/repos/asf/geronimo/specs/tags/</tagBase>
-                    <useReleaseProfile>false</useReleaseProfile>
-                    <goals>deploy</goals>
-                    <arguments>-Prelease</arguments>
+                    <instructions>
+                        <Bundle-Name>${artifactId}</Bundle-Name>
+                        <Bundle-SymbolicName>${geronimo.osgi.symbolic.name}</Bundle-SymbolicName>
+                        <Export-Package>${geronimo.osgi.export}</Export-Package>
+                        <Import-Package>${geronimo.osgi.import}</Import-Package>
+                        <Private-Package>${geronimo.osgi.private.pkg}</Private-Package>
+                        <Implementation-Title>Apache Geronimo</Implementation-Title>
+                        <Implementation-Version>${project.version}</Implementation-Version>
+                    </instructions>
                 </configuration>
-            </plugin>
-
-	        <plugin>
-	            <groupId>org.apache.felix</groupId>
-	            <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.2.0</version>
-	            <extensions>true</extensions>
-	            <configuration>
-		            <instructions>
-		                <Bundle-Name>${artifactId}</Bundle-Name>
-		                <Bundle-SymbolicName>${geronimo.osgi.symbolic.name}</Bundle-SymbolicName>
-		                <Export-Package>${geronimo.osgi.export}</Export-Package>
-		                <Import-Package>${geronimo.osgi.import}</Import-Package>
-		                <Private-Package>${geronimo.osgi.private.pkg}</Private-Package>
-		                <Implementation-Title>Apache Geronimo</Implementation-Title>
-		                <Implementation-Version>${project.version}</Implementation-Version>
-		           </instructions>
-		        </configuration>
-		        <executions>
+                <executions>
                     <execution>
                         <id>bundle-manifest</id>
                         <phase>process-classes</phase>
@@ -179,8 +115,8 @@
                             <goal>manifest</goal>
                         </goals>
                     </execution>
-		        </executions>
-	        </plugin>
+                </executions>
+            </plugin>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -195,107 +131,5 @@
 
         </plugins>
     </build>
-
-    <profiles>
-        <profile>
-            <id>release</id>
-
-            <build>
-                <plugins>
-		            <!-- We want the sources JAR published with the release -->
-		            <plugin>
-		                <groupId>org.apache.maven.plugins</groupId>
-		                <artifactId>maven-source-plugin</artifactId>
-		                <version>2.0.4</version>
-		                <inherited>true</inherited>
-		                <executions>
-		                    <execution>
-		                        <id>attach-sources</id>
-		                        <goals>
-		                            <goal>jar</goal>
-		                        </goals>
-		                    </execution>
-		                </executions>
-		            </plugin>
-
-		            <!-- We want the JavaDoc JAR published with the release -->
-		            <plugin>
-		                <groupId>org.apache.maven.plugins</groupId>
-		                <artifactId>maven-javadoc-plugin</artifactId>
-		                <version>2.3</version>
-		                <inherited>true</inherited>
-		                <configuration>
-		                    <source>1.5</source>
-		                </configuration>
-		                <executions>
-		                    <execution>
-		                        <id>attach-javadocs</id>
-                                <phase>compile</phase>
-		                        <goals>
-		                            <goal>jar</goal>
-		                        </goals>
-		                    </execution>
-		                </executions>
-		            </plugin>
-
-		            <!-- We want to deploy the artifact to a staging location for perusal -->
-		            <plugin>
-		                <groupId>org.apache.maven.plugins</groupId>
-		                <artifactId>maven-deploy-plugin</artifactId>
-		                <version>2.3</version>
-		                <inherited>true</inherited>
-		                <configuration>
-		                    <updateReleaseInfo>true</updateReleaseInfo>
-		                    <altDeploymentRepository>${deploy.repository}</altDeploymentRepository>
-		                </configuration>
-		            </plugin>
-
-		            <!-- We want to deploy the site to a staging location for perusal -->
-		            <plugin>
-		                <groupId>org.apache.maven.plugins</groupId>
-		                <artifactId>maven-site-plugin</artifactId>
-		                <version>2.0-beta-6</version>
-		                <executions>
-		                    <execution>
-		                        <goals>
-		                            <goal>stage-deploy</goal>
-		                        </goals>
-		                        <configuration>
-		                            <stagingSiteURL>${deploy.siteURL}</stagingSiteURL>
-		                        </configuration>
-		                    </execution>
-		                </executions>
-		            </plugin>
-
-		            <!-- We want to sign the artifact, the POM, and all attached artifacts -->
-		            <plugin>
-		                <groupId>org.apache.maven.plugins</groupId>
-		                <artifactId>maven-gpg-plugin</artifactId>
-		                <version>1.0-alpha-4</version>
-		                <configuration>
-		                    <passphrase>${gpg.passphrase}</passphrase>
-		                </configuration>
-		                <executions>
-		                    <execution>
-		                        <goals>
-		                            <goal>sign</goal>
-		                        </goals>
-		                    </execution>
-		                </executions>
-		            </plugin>
-                </plugins> 
-            </build>
-        </profile>
-    </profiles>
-    
-    <distributionManagement>
-        <!--
-        NOTE: The repository and snapshotRepository are picked up from Genesis.
-        -->
-        <site>
-            <id>geronimo-website</id>
-            <url>scp://people.apache.org/www/geronimo.apache.org/maven/specs</url>
-        </site>
-    </distributionManagement>
 
 </project>

Modified: geronimo/specs/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/src/site/site.xml?rev=636511&r1=636510&r2=636511&view=diff
==============================================================================
--- geronimo/specs/trunk/src/site/site.xml (original)
+++ geronimo/specs/trunk/src/site/site.xml Wed Mar 12 14:11:22 2008
@@ -20,12 +20,21 @@
 
 <project name="${project.name}">
     
+    <skin>
+        <groupId>org.apache.geronimo.genesis.config</groupId>
+        <artifactId>geronimo-skin</artifactId>
+        <version>1.4</version>
+    </skin>
+
+    <publishDate format="dd MMM yyyy"/>
+
+    <bannerLeft>
+        <src>images/topleft_logo_437x64.gif</src>
+        <href>http://geronimo.apache.org</href>
+    </bannerLeft>
+
     <body>
-        
-        ${modules}
-        
-        ${reports}
-        
+        <menu ref="reports" />
     </body>
 
 </project>



Mime
View raw message