[jboss-cvs] Repository SVN: r1281 - in jboss/web/2.0.0.GA_CP01-brew: src and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Sep 12 11:06:53 EDT 2007
Author: fnasser at redhat.com
Date: 2007-09-12 11:06:52 -0400 (Wed, 12 Sep 2007)
New Revision: 1281
Modified:
jboss/web/2.0.0.GA_CP01-brew/lib/el-api.jar
jboss/web/2.0.0.GA_CP01-brew/lib/jbossweb-extras.jar
jboss/web/2.0.0.GA_CP01-brew/lib/jbossweb-src.zip
jboss/web/2.0.0.GA_CP01-brew/lib/jbossweb.jar
jboss/web/2.0.0.GA_CP01-brew/lib/jsp-api.jar
jboss/web/2.0.0.GA_CP01-brew/lib/servlet-api.jar
jboss/web/2.0.0.GA_CP01-brew/src/jbossweb-versionless-jbossas-dep.patch
Log:
Revert to the Brew-built version
Modified: jboss/web/2.0.0.GA_CP01-brew/lib/el-api.jar
===================================================================
(Binary files differ)
Modified: jboss/web/2.0.0.GA_CP01-brew/lib/jbossweb-extras.jar
===================================================================
(Binary files differ)
Modified: jboss/web/2.0.0.GA_CP01-brew/lib/jbossweb-src.zip
===================================================================
(Binary files differ)
Modified: jboss/web/2.0.0.GA_CP01-brew/lib/jbossweb.jar
===================================================================
(Binary files differ)
Modified: jboss/web/2.0.0.GA_CP01-brew/lib/jsp-api.jar
===================================================================
(Binary files differ)
Modified: jboss/web/2.0.0.GA_CP01-brew/lib/servlet-api.jar
===================================================================
(Binary files differ)
Modified: jboss/web/2.0.0.GA_CP01-brew/src/jbossweb-versionless-jbossas-dep.patch
===================================================================
--- jboss/web/2.0.0.GA_CP01-brew/src/jbossweb-versionless-jbossas-dep.patch 2007-09-12 12:02:55 UTC (rev 1280)
+++ jboss/web/2.0.0.GA_CP01-brew/src/jbossweb-versionless-jbossas-dep.patch 2007-09-12 15:06:52 UTC (rev 1281)
@@ -9,115 +9,3 @@
<property name="jbossweb.build" value="${basedir}/output"/>
<property name="jbossweb.release" value="${basedir}/release"/>
-
-
---- src/share/classes/org/apache/catalina/startup/WebRuleSet.java.old 2007-09-07 10:41:25 UTC (rev 273)
-+++ src/share/classes/org/apache/catalina/startup/WebRuleSet.java 2007-09-10 14:50:39 UTC (rev 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);
-+ }
-+}
-+
-
-
More information about the jboss-cvs-commits
mailing list