August 2007 - jbossweb-commits - Jboss List Archives

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2007-08-28 06:40:52 -0400 (Tue, 28 Aug 2007) New Revision: 243 Added: tags/JBOSSWEB_2_0_1_CR7/ Log: - JBoss Web 2.0.1 CR 7 (fix SSL attributes in java.io HTTP). Copied: tags/JBOSSWEB_2_0_1_CR7 (from rev 242, branches/2.0.x)

16 years, 8 months

1
0
0 / 0

JBossWeb SVN: r242 - branches/2.0.x/src/share/classes/org/apache/coyote/http11.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2007-08-28 05:59:31 -0400 (Tue, 28 Aug 2007) New Revision: 242 Modified: branches/2.0.x/src/share/classes/org/apache/coyote/http11/Http11Protocol.java Log: - Restore arbitrary attributes for java.io connector (SSL factories really need them in the end). Modified: branches/2.0.x/src/share/classes/org/apache/coyote/http11/Http11Protocol.java =================================================================== --- branches/2.0.x/src/share/classes/org/apache/coyote/http11/Http11Protocol.java 2007-08-28 09:58:46 UTC (rev 241) +++ branches/2.0.x/src/share/classes/org/apache/coyote/http11/Http11Protocol.java 2007-08-28 09:59:31 UTC (rev 242) @@ -120,8 +120,21 @@ return attributes.keySet().iterator(); } + /** + * Set a property. + */ + public void setProperty(String name, String value) { + setAttribute(name, value); + } /** + * Get a property + */ + public String getProperty(String name) { + return (String)getAttribute(name); + } + + /** * The adapter, used to call the connector. */ protected Adapter adapter;

16 years, 8 months

1
0
0 / 0

JBossWeb SVN: r241 - in trunk/java/org/apache: coyote/http11 and 1 other directory.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2007-08-28 05:58:46 -0400 (Tue, 28 Aug 2007) New Revision: 241 Modified: trunk/java/org/apache/catalina/startup/NamingRuleSet.java trunk/java/org/apache/coyote/http11/Http11Protocol.java Log: - Class name typo. - Restore arbitrary attributes for java.io connector (SSL factories really need them in the end). Modified: trunk/java/org/apache/catalina/startup/NamingRuleSet.java =================================================================== --- trunk/java/org/apache/catalina/startup/NamingRuleSet.java 2007-08-24 12:00:42 UTC (rev 240) +++ trunk/java/org/apache/catalina/startup/NamingRuleSet.java 2007-08-28 09:58:46 UTC (rev 241) @@ -124,7 +124,7 @@ "org.apache.catalina.deploy.ContextResourceEnvRef")); digester.addObjectCreate(prefix + "ServiceRef", - "org.apache.catalina.deploy.Contextservice"); + "org.apache.catalina.deploy.ContextService"); digester.addRule(prefix + "ServiceRef", new SetAllPropertiesRule()); digester.addRule(prefix + "ServiceRef", new SetNextNamingRule("addService", Modified: trunk/java/org/apache/coyote/http11/Http11Protocol.java =================================================================== --- trunk/java/org/apache/coyote/http11/Http11Protocol.java 2007-08-24 12:00:42 UTC (rev 240) +++ trunk/java/org/apache/coyote/http11/Http11Protocol.java 2007-08-28 09:58:46 UTC (rev 241) @@ -120,8 +120,21 @@ return attributes.keySet().iterator(); } + /** + * Set a property. + */ + public void setProperty(String name, String value) { + setAttribute(name, value); + } /** + * Get a property + */ + public String getProperty(String name) { + return (String)getAttribute(name); + } + + /** * The adapter, used to call the connector. */ protected Adapter adapter;

16 years, 8 months

1
0
0 / 0

JBossWeb SVN: r240 - branches/2.0.x/src/share/classes/org/apache/tomcat/util/buf.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2007-08-24 08:00:42 -0400 (Fri, 24 Aug 2007) New Revision: 240 Modified: branches/2.0.x/src/share/classes/org/apache/tomcat/util/buf/B2CConverter.java Log: - B2C fix (which may occur when a char in incompletely read). Modified: branches/2.0.x/src/share/classes/org/apache/tomcat/util/buf/B2CConverter.java =================================================================== --- branches/2.0.x/src/share/classes/org/apache/tomcat/util/buf/B2CConverter.java 2007-08-24 12:00:13 UTC (rev 239) +++ branches/2.0.x/src/share/classes/org/apache/tomcat/util/buf/B2CConverter.java 2007-08-24 12:00:42 UTC (rev 240) @@ -82,7 +82,7 @@ { try { // read from the reader - while( true ) { // conv.ready() ) { + while( iis.available()>0 ) { // conv.ready() ) { int cnt=conv.read( result, 0, BUFFER_SIZE ); if( cnt <= 0 ) { // End of stream ! - we may be in a bad state @@ -255,6 +255,9 @@ return (pos < end ) ? (buf[pos++] & 0xff) : -1; } + public int available() throws IOException { + return end-pos; + } // -------------------- Internal methods -------------------- void setBuffer( byte b[], int p, int l ) {

16 years, 8 months

1
0
0 / 0

JBossWeb SVN: r239 - in trunk/java/org/apache: tomcat/util/buf and 1 other directory.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2007-08-24 08:00:13 -0400 (Fri, 24 Aug 2007) New Revision: 239 Modified: trunk/java/org/apache/catalina/connector/Connector.java trunk/java/org/apache/tomcat/util/buf/B2CConverter.java Log: - Fix bad connector classname. - B2C fix (which may occur when a char in incompletely read). Modified: trunk/java/org/apache/catalina/connector/Connector.java =================================================================== --- trunk/java/org/apache/catalina/connector/Connector.java 2007-08-23 23:22:37 UTC (rev 238) +++ trunk/java/org/apache/catalina/connector/Connector.java 2007-08-24 12:00:13 UTC (rev 239) @@ -610,7 +610,7 @@ || "org.apache.coyote.http11.Http11AprProtocol".equals (getProtocolHandlerClassName())) { return "HTTP/1.1"; - } else if ("org.apache.jk.server.JkCoyoteHandler".equals + } else if ("org.apache.coyote.ajp.AjpProtocol".equals (getProtocolHandlerClassName()) || "org.apache.coyote.ajp.AjpAprProtocol".equals (getProtocolHandlerClassName())) { Modified: trunk/java/org/apache/tomcat/util/buf/B2CConverter.java =================================================================== --- trunk/java/org/apache/tomcat/util/buf/B2CConverter.java 2007-08-23 23:22:37 UTC (rev 238) +++ trunk/java/org/apache/tomcat/util/buf/B2CConverter.java 2007-08-24 12:00:13 UTC (rev 239) @@ -82,7 +82,7 @@ { try { // read from the reader - while( true ) { // conv.ready() ) { + while( iis.available()>0 ) { // conv.ready() ) { int cnt=conv.read( result, 0, BUFFER_SIZE ); if( cnt <= 0 ) { // End of stream ! - we may be in a bad state @@ -255,6 +255,9 @@ return (pos < end ) ? (buf[pos++] & 0xff) : -1; } + public int available() throws IOException { + return end-pos; + } // -------------------- Internal methods -------------------- void setBuffer( byte b[], int p, int l ) {

16 years, 8 months

1
0
0 / 0

JBossWeb SVN: r238 - in branches/2.0.x: lib and 1 other directory.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2007-08-23 19:22:37 -0400 (Thu, 23 Aug 2007) New Revision: 238 Added: branches/2.0.x/lib/ant.jar Modified: branches/2.0.x/.classpath Log: - Fix 2.0.x Eclipse project. Modified: branches/2.0.x/.classpath =================================================================== --- branches/2.0.x/.classpath 2007-08-23 23:06:34 UTC (rev 237) +++ branches/2.0.x/.classpath 2007-08-23 23:22:37 UTC (rev 238) @@ -1,11 +1,8 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" path="src/share/classes"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/JBoss5"/> - <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Ant165"/> - <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3.8.1"/> - <classpathentry kind="lib" path="lib/commons-logging.jar"/> - <classpathentry kind="lib" path="lib/jasper-jdt.jar"/> - <classpathentry kind="output" path="output"/> -</classpath> +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry excluding="org/jboss/web/rewrite/RewriteTestCase.java" kind="src" path="src/share/classes"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="lib" path="lib/jasper-jdt.jar"/> + <classpathentry kind="lib" path="lib/ant.jar"/> + <classpathentry kind="output" path="output"/> +</classpath> Added: branches/2.0.x/lib/ant.jar =================================================================== (Binary files differ) Property changes on: branches/2.0.x/lib/ant.jar ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream

16 years, 8 months

1
0
0 / 0

JBossWeb SVN: r237 - trunk.

by jbossweb-commits＠lists.jboss.org

Author: remy.maucherat(a)jboss.com Date: 2007-08-23 19:06:34 -0400 (Thu, 23 Aug 2007) New Revision: 237 Modified: trunk/.classpath Log: - Exclude WS from the build. Modified: trunk/.classpath =================================================================== --- trunk/.classpath 2007-08-23 12:18:19 UTC (rev 236) +++ trunk/.classpath 2007-08-23 23:06:34 UTC (rev 237) @@ -1,8 +1,8 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry excluding="**/.svn/**|org/apache/tomcat/util/net/puretls/" kind="src" path="java"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="lib" path="lib/ant.jar"/> - <classpathentry kind="lib" path="lib/jasper-jdt.jar"/> - <classpathentry kind="output" path=".settings/output"/> -</classpath> +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry excluding="**/.svn/**|org/apache/naming/factory/webservices/|org/apache/tomcat/util/net/puretls/" kind="src" path="java"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="lib" path="lib/ant.jar"/> + <classpathentry kind="lib" path="lib/jasper-jdt.jar"/> + <classpathentry kind="output" path=".settings/output"/> +</classpath>

16 years, 8 months

1
0
0 / 0

JBossWeb SVN: r236 - tags/JBOSSWEB_2_0_0_GA_CP01.

by jbossweb-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2007-08-23 08:18:19 -0400 (Thu, 23 Aug 2007) New Revision: 236 Modified: tags/JBOSSWEB_2_0_0_GA_CP01/build.properties.default Log: Bump the patch version. Modified: tags/JBOSSWEB_2_0_0_GA_CP01/build.properties.default =================================================================== --- tags/JBOSSWEB_2_0_0_GA_CP01/build.properties.default 2007-08-22 14:53:01 UTC (rev 235) +++ tags/JBOSSWEB_2_0_0_GA_CP01/build.properties.default 2007-08-23 12:18:19 UTC (rev 236) @@ -13,7 +13,7 @@ version.major=2 version.minor=0 version.build=0 -version.patch=dev +version.patch=GA_CP01 # ----- Vesion Control Flags ----- jboss.version.major=5

16 years, 8 months

1
0
0 / 0

JBossWeb SVN: r235 - sandbox/webapps/src.

by jbossweb-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2007-08-22 10:53:01 -0400 (Wed, 22 Aug 2007) New Revision: 235 Modified: sandbox/webapps/src/GrowCookies.java sandbox/webapps/src/MyCookies.java Log: Improve the testing by displaying the excepted result. Modified: sandbox/webapps/src/GrowCookies.java =================================================================== --- sandbox/webapps/src/GrowCookies.java 2007-08-22 09:10:27 UTC (rev 234) +++ sandbox/webapps/src/GrowCookies.java 2007-08-22 14:53:01 UTC (rev 235) @@ -75,6 +75,14 @@ } out.println("Size (names+values)=" + size + "<br>"); + String createValue = request.getParameter("create"); + int icreate = 1; + if (createValue != null) { + Integer iwait = new Integer(createValue); + icreate = iwait.intValue(); + } + out.println("creates " + icreate + " new cookies"); + /* value of the new cookie */ StringBuffer buffer = new StringBuffer(); // buffer.append("<xml><name>John Doe</name><age attribute=\"this breaks\">45</age></xml>"); @@ -83,13 +91,16 @@ buffer.append("<xml><name>John Doe</name><age attribute=this_breaks>45</age></xml>"); buffer.append("<xml><name>John Doe</name><age attribute=this_breaks>45</age></xml>"); buffer.append("<xml><name>John Doe</name><age attribute=this_breaks>45</age></xml>"); - /* name of the new cookie */ - String name = String.valueOf(i); - name.concat("Test"); - Cookie cookie = new Cookie(name, buffer.toString()); - response.addCookie(cookie); + for (int j=0; j<icreate; j++) { + /* name of the new cookie */ + String name = String.valueOf(i + j); + name = name.concat("Test"); + Cookie cookie = new Cookie(name, buffer.toString()); + response.addCookie(cookie); + } + /* Get the servlet name */ String servletname = request.getServletPath().substring(1); Modified: sandbox/webapps/src/MyCookies.java =================================================================== --- sandbox/webapps/src/MyCookies.java 2007-08-22 09:10:27 UTC (rev 234) +++ sandbox/webapps/src/MyCookies.java 2007-08-22 14:53:01 UTC (rev 235) @@ -37,6 +37,26 @@ public class MyCookies extends HttpServlet { + public class Test { + String Name; + String Value; + public Test(String Name, String Value) { + this.Name = Name; + this.Value = Value; + } + } + public Cookie CreateCookie(Test test) { + Cookie cookie = new Cookie(test.Name, test.Value); + return cookie; + } + public String GetVal(Test[] test, String Name) { + for (int i=0; i<test.length; i++) { + if (Name.equals(test[i].Name)) + return test[i].Value; + } + return "Failed: Unknown"; + } + public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException @@ -57,35 +77,40 @@ out.println("<h3>" + title + "</h3>"); + /* + * create the name/value pairs + */ + Test[] mytest = new Test[10]; + StringBuffer buffer = new StringBuffer(); + buffer.append("<xml><name>John Doe</name><age attribute=\"this breaks\">45</age></xml>"); + mytest[0] = new Test("xmlCookie",buffer.toString()); + mytest[1] = new Test("Multiparam","I am testing..."); + mytest[2] = new Test("SingleParam","I_am_testing..."); + mytest[3] = new Test("Quoted1","\"I am testing...\""); + mytest[4] = new Test("Quoted2","I am \"testing..."); + // A " in a not quoted-string is not ok, see rfc 2965 and 2616 */ + mytest[5] = new Test("Quoted3","I_am\"_esting..."); + mytest[6] = new Test("Quoted4","\\\"I am\"_esting...\\\""); + mytest[7] = new Test("Quoted5","'"); + mytest[8] = new Test("Quoted6","A"); + mytest[9] = new Test("Quoted7","val'ue"); + mytest[10] = new Test("Quoted8","I am \" testing..."); + Cookie[] cookies = request.getCookies(); if(cookies != null) { for(int i=0;i<cookies.length;i++) { out.println("Name=" + cookies[i].getName() + "<br>"); out.println("Value=" + cookies[i].getValue() + "<br>"); + out.println("Expected=" + GetVal(mytest, cookies[i].getName()) + "<br>"); } } - StringBuffer buffer = new StringBuffer(); - buffer.append("<xml><name>John Doe</name><age attribute=\"this breaks\">45</age></xml>"); - Cookie cookie = new Cookie("xmlCookie",buffer.toString()); - response.addCookie(cookie); - Cookie cookie2 = new Cookie("Multiparam","I am testing..."); - response.addCookie(cookie2); - Cookie cookie3 = new Cookie("SingleParam","I_am_testing..."); - response.addCookie(cookie3); - Cookie cookie4 = new Cookie("Quoted1","\"I am testing...\""); - response.addCookie(cookie4); - Cookie cookie5 = new Cookie("Quoted2","I am \"testing..."); - response.addCookie(cookie5); - // A " in a not quoted-string is not ok, see rfc 2965 and 2616 */ - Cookie cookie6 = new Cookie("Quoted3","I_am\"_esting..."); - response.addCookie(cookie6); - Cookie cookie7 = new Cookie("Quoted4","\\\"I am\"_esting...\\\""); - response.addCookie(cookie7); - Cookie cookie8 = new Cookie("Quoted5","'"); - response.addCookie(cookie8); - Cookie cookie9 = new Cookie("Quoted6","A"); - response.addCookie(cookie9); + /* create the cookies */ + for (int i=0; i<mytest.length; i++) { + Cookie cookie = CreateCookie(mytest[i]); + response.addCookie(cookie); + } + out.println("<P>"); out.println("<P>");

16 years, 8 months

1
0
0 / 0

JBossWeb SVN: r234 - trunk.

by jbossweb-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2007-08-22 05:10:27 -0400 (Wed, 22 Aug 2007) New Revision: 234 Modified: trunk/build.properties.default Log: typo. Modified: trunk/build.properties.default =================================================================== --- trunk/build.properties.default 2007-08-22 08:38:46 UTC (rev 233) +++ trunk/build.properties.default 2007-08-22 09:10:27 UTC (rev 234) @@ -9,7 +9,7 @@ # $Id: build.properties.default 526202 2007-04-06 15:44:38Z remm $ # ----------------------------------------------------------------------------- -# ----- Vesion Control Flags ----- +# ----- Version Control Flags ----- version.major=2 version.minor=1 version.build=0

16 years, 8 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbossweb-commits August 2007