Re: [VOTE] Release build 6.0.15
On Fri, 2007-11-09 at 22:23 +, Mark Thomas wrote: > > These sources can be found in the specification documents. > That doesn't mean we can just copy them. > > > Geronimo > > should also have the same files somewhere. > > I believe they use the CDDL ones but I'll check. I'll prepare a patch for > 6.0.16 that uses whatever they use. There's also the option of not shipping those files, it would only remove (until the user adds an official jar somewhere) validation capabilities for the newest webapps. So, the possibilities are: 1) Add a CDDL xsd 2) Remove xsd 3) Use some binary from somewhere Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [VOTE] Release build 6.0.15
Remy Maucherat wrote: > On Fri, 2007-11-09 at 22:23 +, Mark Thomas wrote: >>> These sources can be found in the specification documents. >> That doesn't mean we can just copy them. >> >>> Geronimo >>> should also have the same files somewhere. >> I believe they use the CDDL ones but I'll check. I'll prepare a patch for >> 6.0.16 that uses whatever they use. > > There's also the option of not shipping those files, it would only > remove (until the user adds an official jar somewhere) validation > capabilities for the newest webapps. > > So, the possibilities are: > 1) Add a CDDL xsd > 2) Remove xsd > 3) Use some binary from somewhere I like just using the ones Geronimo ship. They are AL2 licensed and do everything we need them to with no additional licensing requirements. I'll put together a patch over the weekend. Mark - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r593814 - in /tomcat/trunk/java/javax/servlet/jsp/resources: jsp_2_1.xsd web-jsptaglibrary_2_1.xsd
Author: markt
Date: Sat Nov 10 14:08:06 2007
New Revision: 593814
URL: http://svn.apache.org/viewvc?rev=593814&view=rev
Log:
Resolve licensing issue with these files by replacing them with AL2 licensed
ones from Geronimo. I didn't svn copy these files as I wanted to retain their
history. The contents came from
geronimo/specs/tags/geronimo-jsp_2.1_spec-1.0/src/main/schema/
Modified:
tomcat/trunk/java/javax/servlet/jsp/resources/jsp_2_1.xsd
tomcat/trunk/java/javax/servlet/jsp/resources/web-jsptaglibrary_2_1.xsd
Modified: tomcat/trunk/java/javax/servlet/jsp/resources/jsp_2_1.xsd
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/resources/jsp_2_1.xsd?rev=593814&r1=593813&r2=593814&view=diff
==
--- tomcat/trunk/java/javax/servlet/jsp/resources/jsp_2_1.xsd (original)
+++ tomcat/trunk/java/javax/servlet/jsp/resources/jsp_2_1.xsd Sat Nov 10
14:08:06 2007
@@ -1,6 +1,7 @@
+
-http://www.w3.org/2001/XMLSchema";
- targetNamespace="http://java.sun.com/xml/ns/javaee";
- xmlns:javaee="http://java.sun.com/xml/ns/javaee";
- xmlns:xsd="http://www.w3.org/2001/XMLSchema";
- elementFormDefault="qualified"
- attributeFormDefault="unqualified"
- version="2.1">
-
-
- @(#)jsp_2_1.xsds 1.5 08/11/05
-
-
-
-
-
-
- Copyright 2003-2005 Sun Microsystems, Inc.
- 4150 Network Circle
- Santa Clara, California 95054
- U.S.A
- All rights reserved.
-
- Sun Microsystems, Inc. has intellectual property rights
- relating to technology described in this document. In
- particular, and without limitation, these intellectual
- property rights may include one or more of the U.S. patents
- listed at http://www.sun.com/patents and one or more
- additional patents or pending patent applications in the
- U.S. and other countries.
-
- This document and the technology which it describes are
- distributed under licenses restricting their use, copying,
- distribution, and decompilation. No part of this document
- may be reproduced in any form by any means without prior
- written authorization of Sun and its licensors, if any.
-
- Third-party software, including font technology, is
- copyrighted and licensed from Sun suppliers.
-
- Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
- JavaServer Pages, Enterprise JavaBeans and the Java Coffee
- Cup logo are trademarks or registered trademarks of Sun
- Microsystems, Inc. in the U.S. and other countries.
-
- Federal Acquisitions: Commercial Software - Government Users
- Subject to Standard License Terms and Conditions.
-
-
-
-
-
-
-
- This is the XML Schema for the JSP 2.1 deployment descriptor
- types. The JSP 2.1 schema contains all the special
- structures and datatypes that are necessary to use JSP files
- from a web application.
-
- The contents of this schema is used by the web-app_2_5.xsd
- file to define JSP specific content.
-
-
-
-
-
-
-
- The following conventions apply to all Java EE
- deployment descriptor elements unless indicated otherwise.
-
- - In elements that specify a pathname to a file within the
- same JAR file, relative filenames (i.e., those not
- starting with "/") are considered relative to the root of
- the JAR file's namespace. Absolute filenames (i.e., those
- starting with "/") also specify names in the root of the
- JAR file's namespace. In general, relative names are
- preferred. The exception is .war files where absolute
- names are preferred for consistency with the Servlet API.
-
-
-
-
-
-
-
-
-
-
-
-
-
- The jsp-configType is used to provide global configuration
- information for the JSP files in a web application. It has
- two subelements, taglib and jsp-property-group.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- The jsp-file element contains the full path to a JSP file
- within the web application beginning with a `/'.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- The jsp-property-groupType is used to group a number of
- files so they can be given global property information.
- All files so described are deemed to be JSP files. The
- following additional properties can be described:
-
- - Control whether EL is ignored.
- - Control whether scripting elements are invalid.
- - Indicate pageEncoding information.
- - Indicate that a resource is a JSP document (XML).
- - Prelude and Coda automatic includes.
-- Control whether the character sequence #{ is allowed
- when used as a String literal.
-- Control whether templat
svn commit: r593815 - /tomcat/tc6.0.x/trunk/STATUS
Author: markt Date: Sat Nov 10 14:12:54 2007 New Revision: 593815 URL: http://svn.apache.org/viewvc?rev=593815&view=rev Log: Add JSP schema fix Modified: tomcat/tc6.0.x/trunk/STATUS Modified: tomcat/tc6.0.x/trunk/STATUS URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS?rev=593815&r1=593814&r2=593815&view=diff == --- tomcat/tc6.0.x/trunk/STATUS (original) +++ tomcat/tc6.0.x/trunk/STATUS Sat Nov 10 14:12:54 2007 @@ -53,3 +53,7 @@ -1: markt - only the double quoting part - see http://marc.info/?l=tomcat-dev&m=119454915422424&w=2 for reasons -1: fhanik - I still think it needs some work, will discuss on dev list +* Fix licensing of JSP 2.1 schema + svn diff -c r593814 + +1: markt + -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r593817 - /tomcat/tc6.0.x/trunk/STATUS
Author: fhanik Date: Sat Nov 10 14:17:56 2007 New Revision: 593817 URL: http://svn.apache.org/viewvc?rev=593817&view=rev Log: proposed patch, correct handling of the escape character when escaping double quotes Modified: tomcat/tc6.0.x/trunk/STATUS Modified: tomcat/tc6.0.x/trunk/STATUS URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS?rev=593817&r1=593816&r2=593817&view=diff == --- tomcat/tc6.0.x/trunk/STATUS (original) +++ tomcat/tc6.0.x/trunk/STATUS Sat Nov 10 14:17:56 2007 @@ -51,7 +51,7 @@ and $Version parsing +1: jfclere, pero -1: markt - only the double quoting part - see http://marc.info/?l=tomcat-dev&m=119454915422424&w=2 for reasons - -1: fhanik - I still think it needs some work, will discuss on dev list + -1: fhanik - proposed patch http://people.apache.org/~fhanik/patches/cookies-fix.patch * Fix licensing of JSP 2.1 schema svn diff -c r593814 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r593820 - /tomcat/tc6.0.x/trunk/STATUS
Author: fhanik Date: Sat Nov 10 15:03:58 2007 New Revision: 593820 URL: http://svn.apache.org/viewvc?rev=593820&view=rev Log: Propose cookie fix without the already quoted solution Modified: tomcat/tc6.0.x/trunk/STATUS Modified: tomcat/tc6.0.x/trunk/STATUS URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS?rev=593820&r1=593819&r2=593820&view=diff == --- tomcat/tc6.0.x/trunk/STATUS (original) +++ tomcat/tc6.0.x/trunk/STATUS Sat Nov 10 15:03:58 2007 @@ -53,6 +53,12 @@ -1: markt - only the double quoting part - see http://marc.info/?l=tomcat-dev&m=119454915422424&w=2 for reasons -1: fhanik - proposed patch http://people.apache.org/~fhanik/patches/cookies-fix.patch +* Alternate Cookies fix - http://people.apache.org/~fhanik/patches/cookies-fix-2.patch + Includes: Version fix, Escape fix + Excludes: Already quoted fix, vetoed in prev proposal + +1: fhanik + -1: + * Fix licensing of JSP 2.1 schema svn diff -c r593814 +1: markt - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
