[jboss-cvs] Repository SVN: r1416 - in jboss/web: 2.0.0.GA_CP02-brew and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Sep 24 10:11:08 EDT 2007
Author: fnasser at redhat.com
Date: 2007-09-24 10:11:08 -0400 (Mon, 24 Sep 2007)
New Revision: 1416
Added:
jboss/web/2.0.0.GA_CP02-brew/
jboss/web/2.0.0.GA_CP02-brew/component-info.xml
jboss/web/2.0.0.GA_CP02-brew/lib/
jboss/web/2.0.0.GA_CP02-brew/lib/el-api.jar
jboss/web/2.0.0.GA_CP02-brew/lib/jasper-jdt.jar
jboss/web/2.0.0.GA_CP02-brew/lib/jbossweb-extras.jar
jboss/web/2.0.0.GA_CP02-brew/lib/jbossweb-src.zip
jboss/web/2.0.0.GA_CP02-brew/lib/jbossweb.jar
jboss/web/2.0.0.GA_CP02-brew/lib/jsp-api.jar
jboss/web/2.0.0.GA_CP02-brew/lib/servlet-api.jar
jboss/web/2.0.0.GA_CP02-brew/src/
jboss/web/2.0.0.GA_CP02-brew/src/JBOSSWEB_2_0_0_GA_CP01.tar.gz
jboss/web/2.0.0.GA_CP02-brew/src/jbossweb-JBWEB-85.patch
jboss/web/2.0.0.GA_CP02-brew/src/jbossweb-versionless-jbossas-dep.patch
Log:
>From Remy Maucherat <rmaucher at redhat.com>: Patch for JBWEB-85 (JBCTS-624)
Added: jboss/web/2.0.0.GA_CP02-brew/component-info.xml
===================================================================
--- jboss/web/2.0.0.GA_CP02-brew/component-info.xml (rev 0)
+++ jboss/web/2.0.0.GA_CP02-brew/component-info.xml 2007-09-24 14:11:08 UTC (rev 1416)
@@ -0,0 +1,35 @@
+<project name="jboss/web-component-info">
+
+ <component id="jboss/web"
+ licenseType="lgpl"
+ version="2.0.0.GA_CP02-brew"
+ description="JBoss Web 2.0.0.GA_CP02 (= CP01 + patch)"
+ scm=":ext:cvs.devel.redhat.com:/cvs/dist/jbossweb"
+ tag="jbossweb-2_0_0-3_CP02_0jpp_ep1_1">
+ <!-- Built using JDK 5 -->
+ <artifact id="el-api.jar"/>
+ <artifact id="jasper-jdt.jar"/>
+ <artifact id="jbossweb.jar"/>
+ <artifact id="jbossweb-extras.jar"/>
+ <artifact id="jsp-api.jar"/>
+ <artifact id="servlet-api.jar"/>
+ <artifact id="jbossweb-src.zip"/>
+ <import componentref="apache-logging">
+ <compatible version="1.0.3"/>
+ <compatible version="1.0.4jboss"/>
+ <compatible version="1.0.4.1jboss"/>
+ <compatible version="1.0.5.GA-jboss"/>
+ <compatible version="1.0.5.SP1-jboss"/>
+ <compatible version="1.1.0.jboss"/>
+ </import>
+ <export>
+ <include input="el-api.jar"/>
+ <include input="jasper-jdt.jar"/>
+ <include input="jbossweb.jar"/>
+ <include input="jbossweb-extras.jar"/>
+ <include input="jsp-api.jar"/>
+ <include input="servlet-api.jar"/>
+ </export>
+ </component>
+
+</project>
Added: jboss/web/2.0.0.GA_CP02-brew/lib/el-api.jar
===================================================================
(Binary files differ)
Property changes on: jboss/web/2.0.0.GA_CP02-brew/lib/el-api.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: jboss/web/2.0.0.GA_CP02-brew/lib/jasper-jdt.jar
===================================================================
(Binary files differ)
Property changes on: jboss/web/2.0.0.GA_CP02-brew/lib/jasper-jdt.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: jboss/web/2.0.0.GA_CP02-brew/lib/jbossweb-extras.jar
===================================================================
(Binary files differ)
Property changes on: jboss/web/2.0.0.GA_CP02-brew/lib/jbossweb-extras.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: jboss/web/2.0.0.GA_CP02-brew/lib/jbossweb-src.zip
===================================================================
(Binary files differ)
Property changes on: jboss/web/2.0.0.GA_CP02-brew/lib/jbossweb-src.zip
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: jboss/web/2.0.0.GA_CP02-brew/lib/jbossweb.jar
===================================================================
(Binary files differ)
Property changes on: jboss/web/2.0.0.GA_CP02-brew/lib/jbossweb.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: jboss/web/2.0.0.GA_CP02-brew/lib/jsp-api.jar
===================================================================
(Binary files differ)
Property changes on: jboss/web/2.0.0.GA_CP02-brew/lib/jsp-api.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: jboss/web/2.0.0.GA_CP02-brew/lib/servlet-api.jar
===================================================================
(Binary files differ)
Property changes on: jboss/web/2.0.0.GA_CP02-brew/lib/servlet-api.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: jboss/web/2.0.0.GA_CP02-brew/src/JBOSSWEB_2_0_0_GA_CP01.tar.gz
===================================================================
(Binary files differ)
Property changes on: jboss/web/2.0.0.GA_CP02-brew/src/JBOSSWEB_2_0_0_GA_CP01.tar.gz
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: jboss/web/2.0.0.GA_CP02-brew/src/jbossweb-JBWEB-85.patch
===================================================================
--- jboss/web/2.0.0.GA_CP02-brew/src/jbossweb-JBWEB-85.patch (rev 0)
+++ jboss/web/2.0.0.GA_CP02-brew/src/jbossweb-JBWEB-85.patch 2007-09-24 14:11:08 UTC (rev 1416)
@@ -0,0 +1,110 @@
+Index: src/share/classes/org/apache/catalina/startup/WebRuleSet.java
+===================================================================
+--- src/share/classes/org/apache/catalina/startup/WebRuleSet.java (revision 236)
++++ src/share/classes/org/apache/catalina/startup/WebRuleSet.java (revision 274)
+@@ -24,6 +24,8 @@
+
+ import org.apache.catalina.Context;
+ import org.apache.catalina.Wrapper;
++import org.apache.catalina.deploy.ContextHandler;
++import org.apache.catalina.deploy.ContextService;
+ import org.apache.catalina.deploy.SecurityConstraint;
+ import org.apache.tomcat.util.IntrospectionUtils;
+ import org.apache.tomcat.util.digester.CallMethodRule;
+@@ -40,7 +42,7 @@
+ * deployment descriptor (<code>/WEB-INF/web.xml</code>) resource.</p>
+ *
+ * @author Craig R. McClanahan
+- * @version $Revision: 513349 $ $Date: 2007-03-01 15:33:06 +0100 (jeu., 01 mars 2007) $
++ * @version $Revision: 550263 $ $Date: 2007-06-24 19:28:45 +0200 (dim., 24 juin 2007) $
+ */
+
+ public class WebRuleSet extends RuleSetBase {
+@@ -391,10 +393,7 @@
+ "setWsdlfile", 0);
+ digester.addCallMethod(prefix + "web-app/service-ref/jaxrpc-mapping-file",
+ "setJaxrpcmappingfile", 0);
+- digester.addCallMethod(prefix + "web-app/service-ref/service-qname/namespaceURI",
+- "setServiceqnameNamespaceURI", 0);
+- digester.addCallMethod(prefix + "web-app/service-ref/service-qname/localpart",
+- "setServiceqnameLocalpart", 0);
++ digester.addRule(prefix + "web-app/service-ref/service-qname", new ServiceQnameRule());
+
+ digester.addRule(prefix + "web-app/service-ref/port-component-ref",
+ new CallMethodMultiRule("addPortcomponent", 2, 1));
+@@ -419,12 +418,7 @@
+ digester.addCallParam(prefix + "web-app/service-ref/handler/init-param/param-value",
+ 1);
+
+- digester.addCallMethod(prefix + "web-app/service-ref/handler/soap-header",
+- "addSoapHeaders", 2);
+- digester.addCallParam(prefix + "web-app/service-ref/handler/soap-header/localpart",
+- 0);
+- digester.addCallParam(prefix + "web-app/service-ref/handler/soap-header/namespaceURI",
+- 1);
++ digester.addRule(prefix + "web-app/service-ref/handler/soap-header", new SoapHeaderRule());
+
+ digester.addCallMethod(prefix + "web-app/service-ref/handler/soap-role",
+ "addSoapRole", 0);
+@@ -629,7 +623,6 @@
+ public void begin(String namespace, String name, Attributes attributes)
+ throws Exception {
+
+- Context context = (Context) digester.peek(digester.getCount() - 1);
+ Object top = digester.peek();
+ Class paramClasses[] = new Class[1];
+ paramClasses[0] = "String".getClass();
+@@ -826,3 +819,53 @@
+ }
+
+ }
++
++/**
++ * A Rule that sets soap headers on the ContextHandler.
++ *
++ */
++final class SoapHeaderRule extends Rule {
++
++ public SoapHeaderRule() {
++ }
++
++ public void body(String text)
++ throws Exception {
++ String namespaceuri = null;
++ String localpart = text;
++ int colon = text.indexOf(':');
++ if (colon >= 0) {
++ String prefix = text.substring(0,colon);
++ namespaceuri = digester.findNamespaceURI(prefix);
++ localpart = text.substring(colon+1);
++ }
++ ContextHandler contextHandler = (ContextHandler)digester.peek();
++ contextHandler.addSoapHeaders(localpart,namespaceuri);
++ }
++}
++
++/**
++ * A Rule that sets service qname on the ContextService.
++ *
++ */
++final class ServiceQnameRule extends Rule {
++
++ public ServiceQnameRule() {
++ }
++
++ public void body(String text)
++ throws Exception {
++ String namespaceuri = null;
++ String localpart = text;
++ int colon = text.indexOf(':');
++ if (colon >= 0) {
++ String prefix = text.substring(0,colon);
++ namespaceuri = digester.findNamespaceURI(prefix);
++ localpart = text.substring(colon+1);
++ }
++ ContextService contextService = (ContextService)digester.peek();
++ contextService.setServiceqnameLocalpart(localpart);
++ contextService.setServiceqnameNamespaceURI(namespaceuri);
++ }
++}
++
Added: jboss/web/2.0.0.GA_CP02-brew/src/jbossweb-versionless-jbossas-dep.patch
===================================================================
--- jboss/web/2.0.0.GA_CP02-brew/src/jbossweb-versionless-jbossas-dep.patch (rev 0)
+++ jboss/web/2.0.0.GA_CP02-brew/src/jbossweb-versionless-jbossas-dep.patch 2007-09-24 14:11:08 UTC (rev 1416)
@@ -0,0 +1,11 @@
+--- ./build.xml.old 2007-08-29 14:43:29.000000000 -0400
++++ ./build.xml 2007-08-29 16:32:32.000000000 -0400
+@@ -39,7 +39,7 @@
+ value="${basedir}/.."/>
+
+ <!-- Build Defaults -->
+- <property name="jboss.build" value="${basedir}/jboss/jboss-${jboss.version}"/>
++ <property name="jboss.build" value="${basedir}/jboss/jboss-eap/jboss-as"/>
+ <property name="jbossweb.build" value="${basedir}/output"/>
+ <property name="jbossweb.release" value="${basedir}/release"/>
+
More information about the jboss-cvs-commits
mailing list