[jbossws-commits] JBossWS SVN: r1258 - in branches/jbossws-1.0/src: main/java/org/jboss/ws/deployment main/java/org/jboss/ws/integration/jboss main/java/org/jboss/ws/integration/tomcat main/java/org/jboss/ws/metadata main/java/org/jboss/ws/utils main/resources/schema test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity test/resources test/resources/jaxrpc/jbws1121/WEB-INF test/resources/jaxrpc/samples/wssecurity/WEB-INF test/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/WEB-INF test/resources/jaxw

Author: thomas.diesler(a)jboss.com Date: 2006-10-18 16:20:11 -0400 (Wed, 18 Oct 2006) New Revision: 1258 Added: branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/tomcat/CrossContextLoader.java branches/jbossws-1.0/src/main/resources/schema/javaee_web_services_1_2.xsd branches/jbossws-1.0/src/main/resources/schema/javaee_web_services_client_1_2.xsd Removed: branches/jbossws-1.0/src/main/resources/schema/handler-chain.xsd branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1121/WEB-INF/jboss-web.xml branches/jbossws-1.0/src/test/resources/jaxrpc/samples/wssecurity/WEB-INF/jboss-web.xml branches/jbossws-1.0/src/test/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/WEB-INF/jboss-web.xml Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/jboss/JBossContextServlet.java branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/jboss/JBossServiceEndpointServlet.java branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/tomcat/KernelBootstrap.java branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/tomcat/TomcatContextServlet.java branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointServlet.java branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/HandlerMetaData.java branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/ServiceMetaData.java branches/jbossws-1.0/src/main/java/org/jboss/ws/utils/JBossWSEntityResolver.java branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java branches/jbossws-1.0/src/test/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/WEB-INF/web.xml branches/jbossws-1.0/src/test/resources/jaxws/jsr181/handlerchain/WEB-INF/jaxws-handlers.xml branches/jbossws-1.0/src/test/resources/jaxws/samples/wsaddressing/WEB-INF/jaxws-handlers.xml branches/jbossws-1.0/src/test/resources/tests-tomcat-excludes.txt Log: Fix Tomcat integration. Update JEE5 schema. Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java 2006-10-18 19:56:42 UTC (rev 1257) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java 2006-10-18 20:20:11 UTC (rev 1258) @@ -84,6 +84,7 @@ import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; import org.jboss.ws.tools.ToolsUtils; import org.jboss.ws.utils.HolderUtils; +import org.jboss.ws.utils.JBossWSEntityResolver; import org.jboss.xb.binding.ObjectModelFactory; import org.jboss.xb.binding.Unmarshaller; import org.jboss.xb.binding.UnmarshallerFactory; @@ -553,6 +554,7 @@ Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller(); unmarshaller.setValidation(true); unmarshaller.setSchemaValidation(true); + unmarshaller.setEntityResolver(new JBossWSEntityResolver()); ObjectModelFactory factory = new HandlerChainFactory(); handlerChainsMetaData = (HandlerChainsMetaData)unmarshaller.unmarshal(is, factory, null); } Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/jboss/JBossContextServlet.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/jboss/JBossContextServlet.java 2006-10-18 19:56:42 UTC (rev 1257) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/jboss/JBossContextServlet.java 2006-10-18 20:20:11 UTC (rev 1258) @@ -23,12 +23,8 @@ // $Id$ -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; - import org.jboss.logging.Logger; import org.jboss.ws.common.CommonContextServlet; -import org.jboss.ws.server.ServiceEndpointManager; import org.jboss.ws.server.ServiceEndpointManagerFactory; /** @@ -42,14 +38,6 @@ // provide logging protected final Logger log = Logger.getLogger(JBossContextServlet.class); - protected ServiceEndpointManager epManager; - - public void init(ServletConfig config) throws ServletException - { - super.init(config); - initServiceEndpointManager(); - } - protected void initServiceEndpointManager() { ServiceEndpointManagerFactory factory = ServiceEndpointManagerFactory.getInstance(); Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/jboss/JBossServiceEndpointServlet.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/jboss/JBossServiceEndpointServlet.java 2006-10-18 19:56:42 UTC (rev 1257) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/jboss/JBossServiceEndpointServlet.java 2006-10-18 20:20:11 UTC (rev 1258) @@ -81,7 +81,7 @@ // Add post handlers sepMetaData.addHandlers(sepConfig.getHandlers(sepMetaData, HandlerType.POST)); - log.debug("Updated server meta data" + sepMetaData); + log.debug("Updated endpoint meta data" + sepMetaData); } } } Added: branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/tomcat/CrossContextLoader.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/tomcat/CrossContextLoader.java 2006-10-18 19:56:42 UTC (rev 1257) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/tomcat/CrossContextLoader.java 2006-10-18 20:20:11 UTC (rev 1258) @@ -0,0 +1,101 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.integration.tomcat; + +// $Id$ + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import java.net.URLClassLoader; + +import javax.servlet.ServletContext; + +/** + * A URLClassLoader that provides access to the webapp base dir + * + * @author Thomas.Diesler(a)jboss.org + * @since 16-May-2006 + */ +public class CrossContextLoader extends URLClassLoader +{ + public CrossContextLoader(URL[] urls, ClassLoader parent) + { + super(urls, parent); + } + + public static CrossContextLoader newInstance(ServletContext context) + { + ClassLoader parent = Thread.currentThread().getContextClassLoader(); + if (parent instanceof CrossContextLoader) + throw new IllegalStateException("Circular classloader parent association"); + + CrossContextLoader loader = new CrossContextLoader(new URL[] {}, parent); + + String path = context.getRealPath("/"); + File contextDir = new File(path); + if (contextDir.exists() == false || contextDir.isDirectory() == false) + throw new IllegalStateException("Cannot find expanded dir: " + contextDir); + + // Add URL to context root + loader.addURL(toURL(contextDir)); + + File jbosswsDir = new File(path + "../jbossws"); + if (jbosswsDir.exists() == false || jbosswsDir.isDirectory() == false) + throw new IllegalStateException("Cannot find expanded dir: " + jbosswsDir); + + // Add URL to jbossws context root + loader.addURL(toURL(jbosswsDir)); + + // Add jars in jbossws/WEB-INF/lib + File classesDir = new File(path + "../jbossws/WEB-INF/classes"); + if (classesDir.exists() && classesDir.isDirectory()) + loader.addURL(toURL(classesDir)); + + // Add jars in jbossws/WEB-INF/lib + File libDir = new File(path + "../jbossws/WEB-INF/lib"); + if (libDir.exists() && libDir.isDirectory()) + { + File[] files = libDir.listFiles(); + for (int i = 0; i < files.length; i++) + { + File file = files[i]; + loader.addURL(toURL(file)); + } + } + + return loader; + } + + private static URL toURL(File file) + { + try + { + return file.toURL(); + } + catch (MalformedURLException e) + { + // ignore + return null; + } + } +} Property changes on: branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/tomcat/CrossContextLoader.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/tomcat/KernelBootstrap.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/tomcat/KernelBootstrap.java 2006-10-18 19:56:42 UTC (rev 1257) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/tomcat/KernelBootstrap.java 2006-10-18 20:20:11 UTC (rev 1258) @@ -21,7 +21,7 @@ */ package org.jboss.ws.integration.tomcat; -// $Id$ +// $Id:KernelBootstrap.java 915 2006-09-08 08:40:45Z thomas.diesler(a)jboss.com $ import java.net.URL; @@ -38,17 +38,17 @@ */ public class KernelBootstrap extends BasicBootstrap { + // provide logging + protected final Logger log = Logger.getLogger(KernelBootstrap.class); + + protected BeanXMLDeployer deployer; + // FIXME: remove ctor that throws exception public KernelBootstrap() throws Exception { super(); } - // provide logging - protected final Logger log = Logger.getLogger(KernelBootstrap.class); - - protected BeanXMLDeployer deployer; - public void bootstrap(URL beansXML) { // synchronize bootstrap access Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/tomcat/TomcatContextServlet.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/tomcat/TomcatContextServlet.java 2006-10-18 19:56:42 UTC (rev 1257) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/tomcat/TomcatContextServlet.java 2006-10-18 20:20:11 UTC (rev 1258) @@ -29,6 +29,7 @@ import java.net.URL; import javax.servlet.ServletConfig; +import javax.servlet.ServletContext; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; @@ -51,20 +52,14 @@ // provide logging protected final Logger log = Logger.getLogger(TomcatContextServlet.class); - - public void init(ServletConfig config) throws ServletException - { - super.init(config); - initServiceEndpointManager(); - } - protected void initServiceEndpointManager() { try { - URL beansXML = new File(getServletContext().getRealPath("/META-INF/jboss-beans.xml")).toURL(); + String beansPath = getServletContext().getRealPath("/META-INF/jboss-beans.xml"); + URL beansXML = new File(beansPath).toURL(); if (beansXML == null) - throw new IllegalStateException("Invalid null kernel deployment"); + throw new IllegalStateException("Cannot find: " + beansPath); new KernelBootstrap().bootstrap(beansXML); } Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointServlet.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointServlet.java 2006-10-18 19:56:42 UTC (rev 1257) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointServlet.java 2006-10-18 20:20:11 UTC (rev 1258) @@ -23,12 +23,16 @@ // $Id$ +import java.io.File; +import java.io.IOException; import java.net.URL; import java.net.URLClassLoader; import javax.servlet.ServletConfig; import javax.servlet.ServletContext; import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.jboss.kernel.spi.registry.KernelRegistry; import org.jboss.kernel.spi.registry.KernelRegistryEntry; @@ -54,8 +58,25 @@ public void init(ServletConfig config) throws ServletException { - super.init(config); - deployServiceEndpoints(getServletContext()); + ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader(); + try + { + CrossContextLoader jbwsLoader = CrossContextLoader.newInstance(config.getServletContext()); + Thread.currentThread().setContextClassLoader(jbwsLoader); + + super.init(config); + deployServiceEndpoints(getServletContext()); + } + catch (Exception ex) + { + String message = "Failed to initialze service endpoint"; + log.error(message, ex); + throw new WSException(message, ex); + } + finally + { + Thread.currentThread().setContextClassLoader(ctxLoader); + } } public void destroy() @@ -64,29 +85,48 @@ super.destroy(); } + public void service(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException + { + ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader(); + try + { + if ((ctxLoader instanceof CrossContextLoader) == false) + { + CrossContextLoader jbwsLoader = CrossContextLoader.newInstance(getServletContext()); + Thread.currentThread().setContextClassLoader(jbwsLoader); + } + super.service(req, res); + } + finally + { + Thread.currentThread().setContextClassLoader(ctxLoader); + } + } + /** * Bootstrap the Microkernel and initialize the * ServiceEndpointManager */ protected void initServiceEndpointManager() { - // bootstrap the microkernel - URLClassLoader ctxLoader = (URLClassLoader)Thread.currentThread().getContextClassLoader(); - URL beansXML = ctxLoader.findResource("META-INF/jboss-beans.xml"); - if (beansXML == null) - throw new IllegalStateException("Invalid null kernel deployment"); + String jbosswsPath = getServletContext().getRealPath("/") + "../jbossws"; + File jbosswsDir = new File(jbosswsPath); + if (jbosswsDir.exists() == false || jbosswsDir.isDirectory() == false) + throw new IllegalStateException("Cannot find expanded dir: " + jbosswsDir); + + File beansFile = new File(jbosswsPath + "/META-INF/jboss-beans.xml"); + if (beansFile.exists() == false) + throw new IllegalStateException("Cannot find jboss-beans.xml at: " + beansFile); try { - new KernelBootstrap().bootstrap(beansXML); + new KernelBootstrap().bootstrap(beansFile.toURL()); } - catch (RuntimeException rte) - { - throw rte; - } catch (Exception ex) { - throw new WSException("Cannot bootstrap kernel", ex); + String message = "Failed to bootstrap kernel"; + log.error(message, ex); + throw new WSException(message, ex); } // init the service endpoint manager @@ -107,13 +147,11 @@ deployer.create(udi); deployer.start(udi); } - catch (RuntimeException rte) - { - throw rte; - } catch (Throwable th) { - throw new WSException("Cannot deploy service endpoint", th); + String message = "Failed to deploy service endpoint"; + log.error(message); + throw new WSException(message, th); } } } @@ -148,13 +186,10 @@ deployer.stop(udi); deployer.destroy(udi); } - catch (RuntimeException rte) - { - throw rte; - } catch (Throwable th) { - throw new WSException("Cannot deploy service endpoint", th); + String message = "Failed to undeploy service endpoint"; + log.error(message); } } } Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/HandlerMetaData.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/HandlerMetaData.java 2006-10-18 19:56:42 UTC (rev 1257) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/HandlerMetaData.java 2006-10-18 20:20:11 UTC (rev 1258) @@ -31,6 +31,7 @@ import javax.xml.namespace.QName; +import org.jboss.logging.Logger; import org.jboss.ws.WSException; import org.jboss.ws.wsse.jaxrpc.WSSecurityHandlerInbound; import org.jboss.ws.wsse.jaxrpc.WSSecurityHandlerOutbound; @@ -43,6 +44,9 @@ */ public abstract class HandlerMetaData implements Serializable { + // provide logging + private static final Logger log = Logger.getLogger(HandlerMetaData.class); + public enum HandlerType { PRE, ENDPOINT, POST, ALL @@ -154,7 +158,7 @@ if (securityHandlers.contains(handlerClassName)) { if (epMetaData.getServiceMetaData().getSecurityConfiguration() == null) - throw new IllegalStateException("WS-Security requires security configuration"); + log.warn("WS-Security requires security configuration"); } } Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/ServiceMetaData.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/ServiceMetaData.java 2006-10-18 19:56:42 UTC (rev 1257) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/ServiceMetaData.java 2006-10-18 20:20:11 UTC (rev 1258) @@ -357,14 +357,14 @@ handlerCount += epMetaData.getHandlerMetaData(HandlerType.ALL).size(); } if (handlerCount == 0) - throw new IllegalStateException("WS-Security requires a security handler to be configured"); + log.warn("WS-Security requires a security handler to be configured"); } // Validate endpoints for (EndpointMetaData epMetaData : endpoints.values()) epMetaData.validate(); } - + /** * @see UnifiedMetaData#eagerInitialize() */ @@ -377,7 +377,8 @@ WSDLTypes types = definitions.getWsdlTypes(); if (types != null) { - JBossXSModel model = WSDLUtils.getSchemaModel(types);; + JBossXSModel model = WSDLUtils.getSchemaModel(types); + ; if (model != null) model.eagerInitialize(); } @@ -393,25 +394,26 @@ String javaTypeName = tmMetaData.getJavaTypeName(); QName xmlType = tmMetaData.getXmlType(); if (xmlType != null) - { + { List<Class> registeredTypes = typeMapping.getJavaTypes(xmlType); - + boolean registered = false; - for (Class current : registeredTypes) { + for (Class current : registeredTypes) + { if (current.getName().equals(javaTypeName)) { registered = true; break; } } - + if (registered == false) { try { ClassLoader classLoader = wsMetaData.getClassLoader(); Class javaType = JavaUtils.loadJavaType(javaTypeName, classLoader); - + if (JavaUtils.isPrimitive(javaTypeName)) javaType = JavaUtils.getWrapperType(javaType); Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/utils/JBossWSEntityResolver.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/utils/JBossWSEntityResolver.java 2006-10-18 19:56:42 UTC (rev 1257) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/utils/JBossWSEntityResolver.java 2006-10-18 20:20:11 UTC (rev 1258) @@ -21,7 +21,7 @@ */ package org.jboss.ws.utils; -// $Id: $ +// $Id$ import java.io.IOException; import java.net.URL; @@ -46,7 +46,7 @@ { registerEntity("urn:jboss:jaxrpc-config:2.0", "schema/jaxrpc-config_2_0.xsd"); registerEntity("urn:jboss:jaxws-config:2.0", "schema/jaxws-config_2_0.xsd"); - registerEntity("http://java.sun.com/xml/ns/javaee";, "schema/handler-chain.xsd"); + registerEntity("http://java.sun.com/xml/ns/javaee";, "schema/javaee_web_services_1_2.xsd"); registerEntity("http://www.w3.org/2005/08/addressing";, "schema/ws-addr.xsd"); registerEntity("http://schemas.xmlsoap.org/ws/2004/08/eventing";, "eventing.xsd"); } Deleted: branches/jbossws-1.0/src/main/resources/schema/handler-chain.xsd =================================================================== --- branches/jbossws-1.0/src/main/resources/schema/handler-chain.xsd 2006-10-18 19:56:42 UTC (rev 1257) +++ branches/jbossws-1.0/src/main/resources/schema/handler-chain.xsd 2006-10-18 20:20:11 UTC (rev 1258) @@ -1,252 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xsd:schema xmlns="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="1.0"> - - <xsd:include schemaLocation="javaee_5.xsd"/> - -<!-- **************************************************** --> - - <xsd:element name="handler-chains" type="javaee:handler-chainsType"> - <xsd:annotation> - <xsd:documentation> - - The handler-chains element is the root element for defining handlerchains. - - </xsd:documentation> - </xsd:annotation> - </xsd:element> - -<!-- **************************************************** --> - - <xsd:complexType name="handler-chainsType"> - <xsd:annotation> - <xsd:documentation> - - The handler-chains element defines the handlerchains associated with this - service or service endpoint. - - </xsd:documentation> - </xsd:annotation> - - <xsd:sequence> - <xsd:element name="handler-chain" - type="javaee:handler-chainType" - minOccurs="1" maxOccurs="unbounded"/> - </xsd:sequence> - - <xsd:attribute name="id" type="xsd:ID"/> - </xsd:complexType> - -<!-- **************************************************** --> - - <xsd:complexType name="handler-chainType"> - <xsd:annotation> - <xsd:documentation> - - The handler-chain element defines the handlerchain. - Handlerchain can be defined such that the handlers in the - handlerchain operate,all ports of a service, on a specific - port or on a list of protocol-bindings. The choice of elements - service-name-pattern, port-name-pattern and protocol-bindings - are used to specify whether the handlers in handler-chain are - for a service, port or protocol binding. If none of these - choices are specified with the handler-chain element then the - handlers specified in the handler-chain will be applied on - everything. - - </xsd:documentation> - </xsd:annotation> - - <xsd:sequence> - - <xsd:choice minOccurs="0" maxOccurs="1"> - <xsd:element name="service-name-pattern" - type="javaee:qname-pattern" /> - <xsd:element name="port-name-pattern" - type="javaee:qname-pattern" /> - <xsd:element name="protocol-bindings" - type="javaee:protocol-bindingListType"/> - </xsd:choice> - - <xsd:element name="handler" - type="javaee:handlerType" - minOccurs="1" maxOccurs="unbounded"/> - </xsd:sequence> - - <xsd:attribute name="id" type="xsd:ID"/> - </xsd:complexType> - -<!-- **************************************************** --> - - <xsd:simpleType name="protocol-URIAliasType"> - <xsd:annotation> - <xsd:documentation> - Defines the type that is used for specifying tokens that - start with ## which are used to alias existing standard - protocol bindings and support aliases for new standard - binding URIs that are introduced in future specifications. - - The following tokens alias the standard protocol binding - URIs: - - ##SOAP11_HTTP = "http://schemas.xmlsoap.org/wsdl/soap/http" - ##SOAP12_HTTP = "http://www.w3.org/2003/05/soap/bindings/HTTP/" - ##XML_HTTP = "http://www.w3.org/2004/08/wsdl/http" - - </xsd:documentation> - </xsd:annotation> - <xsd:restriction base="xsd:token"> - <xsd:pattern value="##.+"/> - </xsd:restriction> - </xsd:simpleType> - -<!-- **************************************************** --> - - <xsd:simpleType name="protocol-bindingListType"> - <xsd:annotation> - <xsd:documentation> - Defines the type used for specifying a list of - protocol-bindingType(s). For e.g. - - ##SOAP11_HTTP ##SOAP12_HTTP ##XML_HTTP - - </xsd:documentation> - </xsd:annotation> - <xsd:list itemType="javaee:protocol-bindingType"/> - </xsd:simpleType> - -<!-- **************************************************** --> - - <xsd:simpleType name="protocol-bindingType"> - <xsd:annotation> - <xsd:documentation> - Defines the type used for specifying the URI for the - protocol binding used by the port-component. For - portability one could use one of the following tokens that - alias the standard binding types: - - ##SOAP11_HTTP - ##SOAP12_HTTP - ##XML_HTTP - - Other specifications could define tokens that start with ## - to alias new standard binding URIs that are introduced. - - </xsd:documentation> - </xsd:annotation> - <xsd:union memberTypes="xsd:anyURI javaee:protocol-URIAliasType"/> - </xsd:simpleType> - -<!-- **************************************************** --> - - <xsd:simpleType name="qname-pattern"> - <xsd:annotation> - <xsd:documentation> - This is used to specify the QName pattern in the - attribute service-name-pattern and port-name-pattern in - the handler-chain element - - For example, the various forms acceptable here for - service-name-pattern attribute in handler-chain element - are : - - Exact Name: service-name-pattern="ns1:EchoService" - - In this case, handlers specified in this - handler-chain element will apply to all ports with - this exact service name. The namespace prefix must - have been declared in a namespace declaration - attribute in either the start-tag of the element - where the prefix is used or in an an ancestor - element (i.e. an element in whose content the - prefixed markup occurs) - - Pattern : service-name-pattern="ns1:EchoService*" - - In this case, handlers specified in this - handler-chain element will apply to all ports whose - Service names are like EchoService1, EchoServiceFoo - etc. The namespace prefix must have been declared in - a namespace declaration attribute in either the - start-tag of the element where the prefix is used or - in an an ancestor element (i.e. an element in whose - content the prefixed markup occurs) - - Wild Card : service-name-pattern="*" - - In this case, handlers specified in this handler-chain - element will apply to ports of all service names. - - The same can be applied to port-name attribute in - handler-chain element. - - </xsd:documentation> - </xsd:annotation> - - <xsd:restriction base="xsd:token"> - <xsd:pattern value="\*|([\i-[:]][\c-[:]]*:)?[\i-[:]][\c-[:]]*\*?"/> - </xsd:restriction> - - </xsd:simpleType> - - -<!-- **************************************************** --> - - <xsd:complexType name="handlerType"> - <xsd:annotation> - <xsd:documentation> - - Declares the handler. Handlers can access the - init-param name/value pairs using the HandlerInfo interface. - - </xsd:documentation> - </xsd:annotation> - <xsd:sequence> - <xsd:group ref="javaee:descriptionGroup"/> - <xsd:element name="handler-name" - type="javaee:string"> - <xsd:annotation> - <xsd:documentation> - - Defines the name of the handler. - - </xsd:documentation> - </xsd:annotation> - </xsd:element> - <xsd:element name="handler-class" - type="javaee:fully-qualified-classType"> - <xsd:annotation> - <xsd:documentation> - - Defines a fully qualified class name for the handler implementation. - - </xsd:documentation> - </xsd:annotation> - </xsd:element> - <xsd:element name="init-param" - type="javaee:param-valueType" - minOccurs="0" maxOccurs="unbounded"/> - - <xsd:element name="soap-role" - type="javaee:string" - minOccurs="0" maxOccurs="unbounded"> - <xsd:annotation> - <xsd:documentation> - - The soap-role element contains a SOAP actor definition that the - Handler will play as a role. - - </xsd:documentation> - </xsd:annotation> - </xsd:element> - </xsd:sequence> - <xsd:attribute name="id" type="xsd:ID"/> - </xsd:complexType> - -</xsd:schema> - Added: branches/jbossws-1.0/src/main/resources/schema/javaee_web_services_1_2.xsd =================================================================== --- branches/jbossws-1.0/src/main/resources/schema/javaee_web_services_1_2.xsd 2006-10-18 19:56:42 UTC (rev 1257) +++ branches/jbossws-1.0/src/main/resources/schema/javaee_web_services_1_2.xsd 2006-10-18 20:20:11 UTC (rev 1258) @@ -0,0 +1,747 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xsd:schema xmlns="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="1.2"> + <xsd:annotation> + <xsd:documentation> + @(#)javaee_web_services_1_2.xsds 1.18 02/13/06 + </xsd:documentation> + </xsd:annotation> + + <xsd:annotation> + <xsd:documentation> + + Copyright 2003-2006 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. + + </xsd:documentation> + </xsd:annotation> + + <xsd:annotation> + <xsd:documentation> + + (C) Copyright International Business Machines Corporation 2002 + + </xsd:documentation> + </xsd:annotation> + + <xsd:annotation> + <xsd:documentation> + <![CDATA[ + + The webservices element is the root element for the web services + deployment descriptor. It specifies the set of web service + descriptions that are to be deployed into the Java EE Application + Server and the dependencies they have on container resources and + services. The deployment descriptor must be named + "META-INF/webservices.xml" in the web services' jar file. + + Used in: webservices.xml + + All webservices deployment descriptors must indicate the + webservices schema by using the Java EE namespace: + + http://java.sun.com/xml/ns/javaee + + and by indicating the version of the schema by using the version + element as shown below: + + <webservices xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee + http://java.sun.com/xml/ns/javaee/javaee_web_services_1_2.xsd" + version="1.2"> + ... + </webservices> + + The instance documents may indicate the published version of the + schema using the xsi:schemaLocation attribute for the Java EE + namespace with the following location: + + http://java.sun.com/xml/ns/javaee/javaee_web_services_1_2.xsd + + ]]> + </xsd:documentation> + </xsd:annotation> + + <xsd:annotation> + <xsd:documentation> + + 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. + + </xsd:documentation> + </xsd:annotation> + + <xsd:include schemaLocation="javaee_5.xsd"/> + + +<!-- **************************************************** --> + + <xsd:element name="webservices" type="javaee:webservicesType"> + <xsd:annotation> + <xsd:documentation> + + The webservices element is the root element for the web services + deployment descriptor. It specifies the set of web service + descriptions that are to be deployed into the Java EE Application Server + and the dependencies they have on container resources and services. + + Used in: webservices.xml + + </xsd:documentation> + </xsd:annotation> + + <xsd:key name="webservice-description-name-key"> + <xsd:annotation> + <xsd:documentation> + + The webservice-description-name identifies the collection of + port-components associated with a WSDL file and JAX-RPC mapping. The + name must be unique within the deployment descriptor. + + </xsd:documentation> + </xsd:annotation> + <xsd:selector xpath="javaee:webservice-description"/> + <xsd:field xpath="javaee:webservice-description-name"/> + </xsd:key> + </xsd:element> + +<!-- **************************************************** --> + + <xsd:complexType name="handler-chainType"> + <xsd:annotation> + <xsd:documentation> + + The handler-chain element defines the handlerchain. + Handlerchain can be defined such that the handlers in the + handlerchain operate,all ports of a service, on a specific + port or on a list of protocol-bindings. The choice of elements + service-name-pattern, port-name-pattern and protocol-bindings + are used to specify whether the handlers in handler-chain are + for a service, port or protocol binding. If none of these + choices are specified with the handler-chain element then the + handlers specified in the handler-chain will be applied on + everything. + + </xsd:documentation> + </xsd:annotation> + + <xsd:sequence> + + <xsd:choice minOccurs="0" maxOccurs="1"> + <xsd:element name="service-name-pattern" + type="javaee:qname-pattern" /> + <xsd:element name="port-name-pattern" + type="javaee:qname-pattern" /> + <xsd:element name="protocol-bindings" + type="javaee:protocol-bindingListType"/> + </xsd:choice> + + <xsd:element name="handler" + type="javaee:port-component_handlerType" + minOccurs="1" maxOccurs="unbounded"/> + </xsd:sequence> + + <xsd:attribute name="id" type="xsd:ID"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="handler-chainsType"> + <xsd:annotation> + <xsd:documentation> + + The handler-chains element defines the handlerchains associated + with this service or service endpoint. + + </xsd:documentation> + </xsd:annotation> + + <xsd:sequence> + <xsd:element name="handler-chain" + type="javaee:handler-chainType" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + + <xsd:attribute name="id" type="xsd:ID"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="port-componentType"> + <xsd:annotation> + <xsd:documentation> + + The port-component element associates a WSDL port with a web service + interface and implementation. It defines the name of the port as a + component, optional description, optional display name, optional iconic + representations, WSDL port QName, Service Endpoint Interface, Service + Implementation Bean. + + This element also associates a WSDL service with a JAX-WS Provider + implementation. + + </xsd:documentation> + </xsd:annotation> + + <xsd:sequence> + <xsd:element name="description" + type="javaee:descriptionType" + minOccurs="0" maxOccurs="1"/> + <xsd:element name="display-name" + type="javaee:display-nameType" + minOccurs="0" maxOccurs="1"/> + <xsd:element name="icon" + type="javaee:iconType" + minOccurs="0" maxOccurs="1"/> + <xsd:element name="port-component-name" + type="javaee:string"> + <xsd:annotation> + <xsd:documentation> + <![CDATA[ + + The port-component-name element specifies a port component's + name. This name is assigned by the module producer to name + the service implementation bean in the module's deployment + descriptor. The name must be unique among the port component + names defined in the same module. + + Used in: port-component + + Example: + <port-component-name>EmployeeService + </port-component-name> + + ]]> + </xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name="wsdl-service" + type="javaee:xsdQNameType" + minOccurs="0" maxOccurs="1"> + <xsd:annotation> + <xsd:documentation> + + Defines the name space and local name part of the WSDL + service QName. This is required to be specified for + port components that are JAX-WS Provider implementations. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name="wsdl-port" + type="javaee:xsdQNameType" + minOccurs="0" maxOccurs="1"> + <xsd:annotation> + <xsd:documentation> + + Defines the name space and local name part of the WSDL + port QName. This is not required to be specified for port + components that are JAX-WS Provider implementations + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name="enable-mtom" + type="javaee:true-falseType" + minOccurs="0" maxOccurs="1"> + <xsd:annotation> + <xsd:documentation> + + Used to enable or disable SOAP MTOM/XOP mechanism for an + endpoint implementation. + + Not to be specified for JAX-RPC runtime + </xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name="protocol-binding" + type="javaee:protocol-bindingType" + minOccurs="0" maxOccurs="1"> + <xsd:annotation> + <xsd:documentation> + + Used to specify the protocol binding used by the port-component. + If this element is not specified, then the default binding is + used (SOAP 1.1 over HTTP) + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + <xsd:element name="service-endpoint-interface" + type="javaee:fully-qualified-classType" + minOccurs="0" maxOccurs="1"> + <xsd:annotation> + <xsd:documentation> + <![CDATA[ + + The service-endpoint-interface element contains the + fully-qualified name of the port component's Service Endpoint + Interface. + + Used in: port-component + + Example: + <remote>com.wombat.empl.EmployeeService</remote> + + This may not be specified in case there is no Service + Enpoint Interface as is the case with directly using an + implementation class with the @WebService annotation. + + When the port component is a Provider implementation + this is not specified. + + ]]> + </xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name="service-impl-bean" + type="javaee:service-impl-beanType"/> + + <xsd:choice> + <xsd:element name="handler" + type="javaee:port-component_handlerType" + minOccurs="0" maxOccurs="unbounded"> + <xsd:annotation> + <xsd:documentation> + To be used with JAX-RPC based runtime only. + </xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name="handler-chains" + type="javaee:handler-chainsType" + minOccurs="0" maxOccurs="1"> + <xsd:annotation> + <xsd:documentation> + To be used with JAX-WS based runtime only. + </xsd:documentation> + </xsd:annotation> + </xsd:element> + </xsd:choice> + + </xsd:sequence> + <xsd:attribute name="id" type="xsd:ID"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="port-component_handlerType"> + <xsd:annotation> + <xsd:documentation> + + Declares the handler for a port-component. Handlers can access the + init-param name/value pairs using the HandlerInfo interface. + + Used in: port-component + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:group ref="javaee:descriptionGroup"/> + <xsd:element name="handler-name" + type="javaee:string"> + <xsd:annotation> + <xsd:documentation> + + Defines the name of the handler. The name must be unique within the + module. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name="handler-class" + type="javaee:fully-qualified-classType"> + <xsd:annotation> + <xsd:documentation> + + Defines a fully qualified class name for the handler implementation. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name="init-param" + type="javaee:param-valueType" + minOccurs="0" maxOccurs="unbounded"/> + + <xsd:element name="soap-header" + type="javaee:xsdQNameType" + minOccurs="0" maxOccurs="unbounded"> + <xsd:annotation> + <xsd:documentation> + + Defines the QName of a SOAP header that will be processed by the + handler. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name="soap-role" + type="javaee:string" + minOccurs="0" maxOccurs="unbounded"> + <xsd:annotation> + <xsd:documentation> + + The soap-role element contains a SOAP actor definition that the + Handler will play as a role. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + </xsd:sequence> + <xsd:attribute name="id" type="xsd:ID"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:simpleType name="protocol-URIAliasType"> + <xsd:annotation> + <xsd:documentation> + Defines the type that is used for specifying tokens that + start with ## which are used to alias existing standard + protocol bindings and support aliases for new standard + binding URIs that are introduced in future specifications. + + The following tokens alias the standard protocol binding + URIs: + + ##SOAP11_HTTP = "http://schemas.xmlsoap.org/wsdl/soap/http" + ##SOAP11_HTTP_MTOM = + "http://schemas.xmlsoap.org/wsdl/soap/http?mtom=true" + ##SOAP12_HTTP = "http://www.w3.org/2003/05/soap/bindings/HTTP/" + ##SOAP12_HTTP_MTOM = + "http://www.w3.org/2003/05/soap/bindings/HTTP/?mtom=true" + ##XML_HTTP = "http://www.w3.org/2004/08/wsdl/http" + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:token"> + <xsd:pattern value="##.+"/> + </xsd:restriction> + </xsd:simpleType> + +<!-- **************************************************** --> + + <xsd:simpleType name="protocol-bindingListType"> + <xsd:annotation> + <xsd:documentation> + Defines the type used for specifying a list of + protocol-bindingType(s). For e.g. + + ##SOAP11_HTTP ##SOAP12_HTTP ##XML_HTTP + + </xsd:documentation> + </xsd:annotation> + <xsd:list itemType="javaee:protocol-bindingType"/> + </xsd:simpleType> + +<!-- **************************************************** --> + + <xsd:simpleType name="protocol-bindingType"> + <xsd:annotation> + <xsd:documentation> + Defines the type used for specifying the URI for the + protocol binding used by the port-component. For + portability one could use one of the following tokens that + alias the standard binding types: + + ##SOAP11_HTTP + ##SOAP11_HTTP_MTOM + ##SOAP12_HTTP + ##SOAP12_HTTP_MTOM + ##XML_HTTP + + Other specifications could define tokens that start with ## + to alias new standard binding URIs that are introduced. + + </xsd:documentation> + </xsd:annotation> + <xsd:union memberTypes="xsd:anyURI javaee:protocol-URIAliasType"/> + </xsd:simpleType> + +<!-- **************************************************** --> + + <xsd:simpleType name="qname-pattern"> + <xsd:annotation> + <xsd:documentation> + This is used to specify the QName pattern in the + attribute service-name-pattern and port-name-pattern in + the handler-chain element + + For example, the various forms acceptable here for + service-name-pattern attribute in handler-chain element + are : + + Exact Name: service-name-pattern="ns1:EchoService" + + In this case, handlers specified in this + handler-chain element will apply to all ports with + this exact service name. The namespace prefix must + have been declared in a namespace declaration + attribute in either the start-tag of the element + where the prefix is used or in an an ancestor + element (i.e. an element in whose content the + prefixed markup occurs) + + Pattern : service-name-pattern="ns1:EchoService*" + + In this case, handlers specified in this + handler-chain element will apply to all ports whose + Service names are like EchoService1, EchoServiceFoo + etc. The namespace prefix must have been declared in + a namespace declaration attribute in either the + start-tag of the element where the prefix is used or + in an an ancestor element (i.e. an element in whose + content the prefixed markup occurs) + + Wild Card : service-name-pattern="*" + + In this case, handlers specified in this handler-chain + element will apply to ports of all service names. + + The same can be applied to port-name attribute in + handler-chain element. + + </xsd:documentation> + </xsd:annotation> + + <xsd:restriction base="xsd:token"> + <xsd:pattern value="\*|([\i-[:]][\c-[:]]*:)?[\i-[:]][\c-[:]]*\*?"/> + </xsd:restriction> + + </xsd:simpleType> + +<!-- **************************************************** --> + + <xsd:complexType name="service-impl-beanType"> + <xsd:annotation> + <xsd:documentation> + + The service-impl-bean element defines the web service implementation. + A service implementation can be an EJB bean class or JAX-RPC web + component. Existing EJB implementations are exposed as a web service + using an ejb-link. + + Used in: port-component + + </xsd:documentation> + </xsd:annotation> + <xsd:choice> + <xsd:element name="ejb-link" + type="javaee:ejb-linkType"/> + <xsd:element name="servlet-link" + type="javaee:servlet-linkType"/> + </xsd:choice> + <xsd:attribute name="id" type="xsd:ID"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="servlet-linkType"> + <xsd:annotation> + <xsd:documentation> + <![CDATA[ + + The servlet-link element is used in the service-impl-bean element + to specify that a Service Implementation Bean is defined as a + JAX-RPC Service Endpoint. + + The value of the servlet-link element must be the servlet-name of + a JAX-RPC Service Endpoint in the same WAR file. + + Used in: service-impl-bean + + Example: + <servlet-link>StockQuoteService</servlet-link> + + ]]> + </xsd:documentation> + </xsd:annotation> + <xsd:simpleContent> + <xsd:restriction base="javaee:string"/> + </xsd:simpleContent> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="webservice-descriptionType"> + <xsd:annotation> + <xsd:documentation> + + The webservice-description element defines a WSDL document file + and the set of Port components associated with the WSDL ports + defined in the WSDL document. There may be multiple + webservice-descriptions defined within a module. + + All WSDL file ports must have a corresponding port-component element + defined. + + Used in: webservices + + </xsd:documentation> + </xsd:annotation> + + <xsd:sequence> + <xsd:element name="description" + type="javaee:descriptionType" + minOccurs="0" maxOccurs="1"/> + <xsd:element name="display-name" + type="javaee:display-nameType" + minOccurs="0" maxOccurs="1"/> + <xsd:element name="icon" + type="javaee:iconType" + minOccurs="0" maxOccurs="1"/> + <xsd:element name="webservice-description-name" + type="javaee:string"> + <xsd:annotation> + <xsd:documentation> + + The webservice-description-name identifies the collection of + port-components associated with a WSDL file and JAX-RPC + mapping. The name must be unique within the deployment descriptor. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name="wsdl-file" + type="javaee:pathType" + minOccurs="0" maxOccurs="1"> + <xsd:annotation> + <xsd:documentation> + + The wsdl-file element contains the name of a WSDL file in the + module. The file name is a relative path within the module. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name="jaxrpc-mapping-file" + type="javaee:pathType" + minOccurs="0" maxOccurs="1"> + <xsd:annotation> + <xsd:documentation> + + The jaxrpc-mapping-file element contains the name of a file that + describes the JAX-RPC mapping between the Java interaces used by + the application and the WSDL description in the wsdl-file. The + file name is a relative path within the module. + + This is not required when JAX-WS based runtime is used. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name="port-component" + type="javaee:port-componentType" + minOccurs="1" maxOccurs="unbounded"> + <xsd:key name="port-component_handler-name-key"> + <xsd:annotation> + <xsd:documentation> + + Defines the name of the handler. The name must be unique + within the module. + + </xsd:documentation> + </xsd:annotation> + <xsd:selector xpath="javaee:handler"/> + <xsd:field xpath="javaee:handler-name"/> + </xsd:key> + </xsd:element> + </xsd:sequence> + <xsd:attribute name="id" type="xsd:ID"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="webservicesType"> + <xsd:sequence> + <xsd:group ref="javaee:descriptionGroup"/> + <xsd:element name="webservice-description" + type="javaee:webservice-descriptionType" + minOccurs="1" maxOccurs="unbounded"> + <xsd:key name="port-component-name-key"> + <xsd:annotation> + <xsd:documentation> + <![CDATA[ + + The port-component-name element specifies a port + component's name. This name is assigned by the module + producer to name the service implementation bean in the + module's deployment descriptor. The name must be unique + among the port component names defined in the same module. + + Used in: port-component + + Example: + <port-component-name>EmployeeService + </port-component-name> + + ]]> + </xsd:documentation> + </xsd:annotation> + <xsd:selector xpath="javaee:port-component"/> + <xsd:field xpath="javaee:port-component-name"/> + </xsd:key> + </xsd:element> + </xsd:sequence> + + <xsd:attribute name="version" + type="javaee:dewey-versionType" + fixed="1.2" + use="required"> + <xsd:annotation> + <xsd:documentation> + + The required value for the version is 1.2. + + </xsd:documentation> + </xsd:annotation> + </xsd:attribute> + + <xsd:attribute name="id" type="xsd:ID"/> + </xsd:complexType> + +</xsd:schema> + Property changes on: branches/jbossws-1.0/src/main/resources/schema/javaee_web_services_1_2.xsd ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-1.0/src/main/resources/schema/javaee_web_services_client_1_2.xsd =================================================================== --- branches/jbossws-1.0/src/main/resources/schema/javaee_web_services_client_1_2.xsd 2006-10-18 19:56:42 UTC (rev 1257) +++ branches/jbossws-1.0/src/main/resources/schema/javaee_web_services_client_1_2.xsd 2006-10-18 20:20:11 UTC (rev 1258) @@ -0,0 +1,578 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xsd:schema xmlns="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="1.2"> + <xsd:annotation> + <xsd:documentation> + @(#)javaee_web_services_client_1_2.xsds 1.19 02/13/06 + </xsd:documentation> + </xsd:annotation> + + <xsd:annotation> + <xsd:documentation> + + Copyright 2003-2006 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. + + </xsd:documentation> + </xsd:annotation> + + <xsd:annotation> + <xsd:documentation> + + (C) Copyright International Business Machines Corporation 2002 + + </xsd:documentation> + </xsd:annotation> + + +<!-- **************************************************** --> + + <xsd:complexType name="port-component-refType"> + <xsd:annotation> + <xsd:documentation> + + The port-component-ref element declares a client dependency + on the container for resolving a Service Endpoint Interface + to a WSDL port. It optionally associates the Service Endpoint + Interface with a particular port-component. This is only used + by the container for a Service.getPort(Class) method call. + + </xsd:documentation> + </xsd:annotation> + + <xsd:sequence> + <xsd:element name="service-endpoint-interface" + type="javaee:fully-qualified-classType"> + <xsd:annotation> + <xsd:documentation> + + The service-endpoint-interface element defines a fully qualified + Java class that represents the Service Endpoint Interface of a + WSDL port. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + <xsd:element name="enable-mtom" + type="javaee:true-falseType" + minOccurs="0" maxOccurs="1"> + <xsd:annotation> + <xsd:documentation> + + Used to enable or disable SOAP MTOM/XOP mechanism on the client + side for a port-component. + + Not to be specified for JAX-RPC runtime + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + <xsd:element name="port-component-link" + type="javaee:string" + minOccurs="0" maxOccurs="1"> + <xsd:annotation> + <xsd:documentation> + + The port-component-link element links a port-component-ref + to a specific port-component required to be made available + by a service reference. + + The value of a port-component-link must be the + port-component-name of a port-component in the same module + or another module in the same application unit. The syntax + for specification follows the syntax defined for ejb-link + in the EJB 2.0 specification. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + </xsd:sequence> + <xsd:attribute name="id" type="xsd:ID"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:group name="service-refGroup"> + <xsd:sequence> + <xsd:element name="service-ref" + type="javaee:service-refType" + minOccurs="0" maxOccurs="unbounded"> + <xsd:key name="service-ref_handler-name-key"> + <xsd:annotation> + <xsd:documentation> + + Defines the name of the handler. The name must be unique + within the module. + + </xsd:documentation> + </xsd:annotation> + <xsd:selector xpath="javaee:handler"/> + <xsd:field xpath="javaee:handler-name"/> + </xsd:key> + </xsd:element> + </xsd:sequence> + </xsd:group> + +<!-- **************************************************** --> + + <xsd:complexType name="service-refType"> + <xsd:annotation> + <xsd:documentation> + + The service-ref element declares a reference to a Web + service. It contains optional description, display name and + icons, a declaration of the required Service interface, + an optional WSDL document location, an optional set + of JAX-RPC mappings, an optional QName for the service element, + an optional set of Service Endpoint Interfaces to be resolved + by the container to a WSDL port, and an optional set of handlers. + + </xsd:documentation> + </xsd:annotation> + + <xsd:sequence> + <xsd:group ref="javaee:descriptionGroup"/> + <xsd:element name="service-ref-name" + type="javaee:jndi-nameType"> + <xsd:annotation> + <xsd:documentation> + + The service-ref-name element declares logical name that the + components in the module use to look up the Web service. It + is recommended that all service reference names start with + "service/". + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + <xsd:element name="service-interface" + type="javaee:fully-qualified-classType"> + <xsd:annotation> + <xsd:documentation> + + The service-interface element declares the fully qualified class + name of the JAX-RPC Service interface the client depends on. + In most cases the value will be javax.xml.rpc.Service. A JAX-RPC + generated Service Interface class may also be specified. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + <xsd:element name="service-ref-type" + type="javaee:fully-qualified-classType" + minOccurs="0" maxOccurs="1"> + <xsd:annotation> + <xsd:documentation> + + The service-ref-type element declares the type of the service-ref + element that is injected or returned when a JNDI lookup is done. + This must be either a fully qualified name of Service class or + the fully qualified name of service endpoint interface class. + This is only used with JAX-WS runtime where the corresponding + @WebServiceRef annotation can be used to denote both a Service + or a Port. + + If this is not specified, then the type of service-ref element + that is injected or returned when a JNDI lookup is done is + always a Service interface/class. + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + <xsd:element name="wsdl-file" + type="javaee:xsdAnyURIType" + minOccurs="0" maxOccurs="1"> + <xsd:annotation> + <xsd:documentation> + + The wsdl-file element contains the URI location of a WSDL + file. The location is relative to the root of the module. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + <xsd:element name="jaxrpc-mapping-file" + type="javaee:pathType" + minOccurs="0" maxOccurs="1"> + <xsd:annotation> + <xsd:documentation> + + The jaxrpc-mapping-file element contains the name of a file that + describes the JAX-RPC mapping between the Java interaces used by + the application and the WSDL description in the wsdl-file. The + file name is a relative path within the module file. + + This is not required when JAX-WS based runtime is used. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + <xsd:element name="service-qname" + type="javaee:xsdQNameType" + minOccurs="0" maxOccurs="1"> + <xsd:annotation> + <xsd:documentation> + + The service-qname element declares the specific WSDL service + element that is being refered to. It is not specified if no + wsdl-file is declared. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + <xsd:element name="port-component-ref" + type="javaee:port-component-refType" + minOccurs="0" maxOccurs="unbounded"> + <xsd:annotation> + <xsd:documentation> + + The port-component-ref element declares a client dependency + on the container for resolving a Service Endpoint Interface + to a WSDL port. It optionally associates the Service Endpoint + Interface with a particular port-component. This is only used + by the container for a Service.getPort(Class) method call. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + <xsd:choice> + <xsd:element name="handler" + type="javaee:service-ref_handlerType" + minOccurs="0" maxOccurs="unbounded"> + <xsd:annotation> + <xsd:documentation> + + Declares the handler for a port-component. Handlers can + access the init-param name/value pairs using the + HandlerInfo interface. If port-name is not specified, the + handler is assumed to be associated with all ports of the + service. + + To be used with JAX-RPC based runtime only. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name="handler-chains" + type="javaee:service-ref_handler-chainsType" + minOccurs="0" maxOccurs="1"> + <xsd:annotation> + <xsd:documentation> + To be used with JAX-WS based runtime only. + </xsd:documentation> + </xsd:annotation> + </xsd:element> + </xsd:choice> + + <xsd:group ref="javaee:resourceGroup"/> + + </xsd:sequence> + <xsd:attribute name="id" type="xsd:ID"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="service-ref_handler-chainType"> + <xsd:annotation> + <xsd:documentation> + + The handler-chain element defines the handlerchain. + Handlerchain can be defined such that the handlers in the + handlerchain operate,all ports of a service, on a specific + port or on a list of protocol-bindings. The choice of elements + service-name-pattern, port-name-pattern and protocol-bindings + are used to specify whether the handlers in handler-chain are + for a service, port or protocol binding. If none of these + choices are specified with the handler-chain element then the + handlers specified in the handler-chain will be applied on + everything. + + </xsd:documentation> + </xsd:annotation> + + <xsd:sequence> + + <xsd:choice minOccurs="0" maxOccurs="1"> + <xsd:element name="service-name-pattern" + type="javaee:service-ref_qname-pattern" /> + <xsd:element name="port-name-pattern" + type="javaee:service-ref_qname-pattern" /> + <xsd:element name="protocol-bindings" + type="javaee:service-ref_protocol-bindingListType"/> + </xsd:choice> + + <xsd:element name="handler" + type="javaee:service-ref_handlerType" + minOccurs="1" maxOccurs="unbounded"/> + </xsd:sequence> + + <xsd:attribute name="id" type="xsd:ID"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="service-ref_handler-chainsType"> + <xsd:annotation> + <xsd:documentation> + + The handler-chains element defines the handlerchains associated with this + service or service endpoint. + + </xsd:documentation> + </xsd:annotation> + + <xsd:sequence> + <xsd:element name="handler-chain" + type="javaee:service-ref_handler-chainType" + minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + + <xsd:attribute name="id" type="xsd:ID"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:complexType name="service-ref_handlerType"> + <xsd:annotation> + <xsd:documentation> + + Declares the handler for a port-component. Handlers can access the + init-param name/value pairs using the HandlerInfo interface. If + port-name is not specified, the handler is assumed to be associated + with all ports of the service. + + Used in: service-ref + + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:group ref="javaee:descriptionGroup"/> + <xsd:element name="handler-name" + type="javaee:string"> + <xsd:annotation> + <xsd:documentation> + + Defines the name of the handler. The name must be unique + within the module. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name="handler-class" + type="javaee:fully-qualified-classType"> + <xsd:annotation> + <xsd:documentation> + + Defines a fully qualified class name for the handler + implementation. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name="init-param" + type="javaee:param-valueType" + minOccurs="0" maxOccurs="unbounded"/> + + <xsd:element name="soap-header" + type="javaee:xsdQNameType" + minOccurs="0" maxOccurs="unbounded"> + <xsd:annotation> + <xsd:documentation> + + Defines the QName of a SOAP header that will be processed + by the handler. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + <xsd:element name="soap-role" + type="javaee:string" + minOccurs="0" maxOccurs="unbounded"> + <xsd:annotation> + <xsd:documentation> + + The soap-role element contains a SOAP actor definition that + the Handler will play as a role. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + <xsd:element name="port-name" + type="javaee:string" + minOccurs="0" maxOccurs="unbounded"> + <xsd:annotation> + <xsd:documentation> + + The port-name element defines the WSDL port-name that a + handler should be associated with. + + </xsd:documentation> + </xsd:annotation> + </xsd:element> + </xsd:sequence> + <xsd:attribute name="id" type="xsd:ID"/> + </xsd:complexType> + +<!-- **************************************************** --> + + <xsd:simpleType name="service-ref_protocol-URIAliasType"> + <xsd:annotation> + <xsd:documentation> + Defines the type that is used for specifying tokens that + start with ## which are used to alias existing standard + protocol bindings and support aliases for new standard + binding URIs that are introduced in future specifications. + + The following tokens alias the standard protocol binding + URIs: + + ##SOAP11_HTTP = "http://schemas.xmlsoap.org/wsdl/soap/http" + ##SOAP11_HTTP_MTOM = + "http://schemas.xmlsoap.org/wsdl/soap/http?mtom=true" + ##SOAP12_HTTP = "http://www.w3.org/2003/05/soap/bindings/HTTP/" + ##SOAP12_HTTP_MTOM = + "http://www.w3.org/2003/05/soap/bindings/HTTP/?mtom=true" + ##XML_HTTP = "http://www.w3.org/2004/08/wsdl/http" + + </xsd:documentation> + </xsd:annotation> + <xsd:restriction base="xsd:token"> + <xsd:pattern value="##.+"/> + </xsd:restriction> + </xsd:simpleType> + +<!-- **************************************************** --> + + <xsd:simpleType name="service-ref_protocol-bindingListType"> + <xsd:annotation> + <xsd:documentation> + Defines the type used for specifying a list of + protocol-bindingType(s). For e.g. + + ##SOAP11_HTTP ##SOAP12_HTTP ##XML_HTTP + + </xsd:documentation> + </xsd:annotation> + <xsd:list itemType="javaee:service-ref_protocol-bindingType"/> + </xsd:simpleType> + +<!-- **************************************************** --> + + <xsd:simpleType name="service-ref_protocol-bindingType"> + <xsd:annotation> + <xsd:documentation> + Defines the type used for specifying the URI for the + protocol binding used by the port-component. For + portability one could use one of the following tokens that + alias the standard binding types: + + ##SOAP11_HTTP + ##SOAP11_HTTP_MTOM + ##SOAP12_HTTP + ##SOAP12_HTTP_MTOM + ##XML_HTTP + + Other specifications could define tokens that start with ## + to alias new standard binding URIs that are introduced. + + </xsd:documentation> + </xsd:annotation> + <xsd:union memberTypes="xsd:anyURI javaee:service-ref_protocol-URIAliasType"/> + </xsd:simpleType> + +<!-- **************************************************** --> + + <xsd:simpleType name="service-ref_qname-pattern"> + <xsd:annotation> + <xsd:documentation> + This is used to specify the QName pattern in the + attribute service-name-pattern and port-name-pattern in + the handler-chain element + + For example, the various forms acceptable here for + service-name-pattern attribute in handler-chain element + are : + + Exact Name: service-name-pattern="ns1:EchoService" + + In this case, handlers specified in this + handler-chain element will apply to all ports with + this exact service name. The namespace prefix must + have been declared in a namespace declaration + attribute in either the start-tag of the element + where the prefix is used or in an an ancestor + element (i.e. an element in whose content the + prefixed markup occurs) + + Pattern : service-name-pattern="ns1:EchoService*" + + In this case, handlers specified in this + handler-chain element will apply to all ports whose + Service names are like EchoService1, EchoServiceFoo + etc. The namespace prefix must have been declared in + a namespace declaration attribute in either the + start-tag of the element where the prefix is used or + in an an ancestor element (i.e. an element in whose + content the prefixed markup occurs) + + Wild Card : service-name-pattern="*" + + In this case, handlers specified in this handler-chain + element will apply to ports of all service names. + + The same can be applied to port-name attribute in + handler-chain element. + + </xsd:documentation> + </xsd:annotation> + + <xsd:restriction base="xsd:token"> + <xsd:pattern value="\*|([\i-[:]][\c-[:]]*:)?[\i-[:]][\c-[:]]*\*?"/> + </xsd:restriction> + + </xsd:simpleType> + +</xsd:schema> + Property changes on: branches/jbossws-1.0/src/main/resources/schema/javaee_web_services_client_1_2.xsd ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java 2006-10-18 19:56:42 UTC (rev 1257) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java 2006-10-18 20:20:11 UTC (rev 1258) @@ -72,7 +72,7 @@ private Hello getPort() throws Exception { - if (!isTargetServerJBoss()) + if (isTargetServerJBoss()) { InitialContext iniCtx = getInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); Deleted: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1121/WEB-INF/jboss-web.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1121/WEB-INF/jboss-web.xml 2006-10-18 19:56:42 UTC (rev 1257) +++ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1121/WEB-INF/jboss-web.xml 2006-10-18 20:20:11 UTC (rev 1258) @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd"> - -<jboss-web> - - <webservice-description> - <webservice-description-name>HelloWorldService</webservice-description-name> - <config-name>Standard WSSecurity Endpoint</config-name> - </webservice-description> - -</jboss-web> Deleted: branches/jbossws-1.0/src/test/resources/jaxrpc/samples/wssecurity/WEB-INF/jboss-web.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/samples/wssecurity/WEB-INF/jboss-web.xml 2006-10-18 19:56:42 UTC (rev 1257) +++ branches/jbossws-1.0/src/test/resources/jaxrpc/samples/wssecurity/WEB-INF/jboss-web.xml 2006-10-18 20:20:11 UTC (rev 1258) @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd"> - -<jboss-web> - - <webservice-description> - <webservice-description-name>HelloService</webservice-description-name> - <config-name>Standard WSSecurity Endpoint</config-name> - </webservice-description> - -</jboss-web> Deleted: branches/jbossws-1.0/src/test/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/WEB-INF/jboss-web.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/WEB-INF/jboss-web.xml 2006-10-18 19:56:42 UTC (rev 1257) +++ branches/jbossws-1.0/src/test/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/WEB-INF/jboss-web.xml 2006-10-18 20:20:11 UTC (rev 1258) @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd"> - -<jboss-web> - - <webservice-description> - <webservice-description-name>HelloService</webservice-description-name> - <config-name>Standard WSSecurity Endpoint</config-name> - </webservice-description> - -</jboss-web> Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/WEB-INF/web.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/WEB-INF/web.xml 2006-10-18 19:56:42 UTC (rev 1257) +++ branches/jbossws-1.0/src/test/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/WEB-INF/web.xml 2006-10-18 20:20:11 UTC (rev 1258) @@ -5,6 +5,11 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4"> + <context-param> + <param-name>jbossws-config-name</param-name>> + <param-value>Standard WSSecurity Endpoint</param-value> + </context-param> + <servlet> <servlet-name>HelloService</servlet-name> <servlet-class>org.jboss.test.ws.jaxrpc.samples.wssecurity.HelloJavaBean</servlet-class> Modified: branches/jbossws-1.0/src/test/resources/jaxws/jsr181/handlerchain/WEB-INF/jaxws-handlers.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxws/jsr181/handlerchain/WEB-INF/jaxws-handlers.xml 2006-10-18 19:56:42 UTC (rev 1257) +++ branches/jbossws-1.0/src/test/resources/jaxws/jsr181/handlerchain/WEB-INF/jaxws-handlers.xml 2006-10-18 20:20:11 UTC (rev 1258) @@ -2,7 +2,7 @@ <handler-chains xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee handler-chain.xsd"> + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd"> <handler-chain> <protocol-bindings>##SOAP11_HTTP</protocol-bindings> Modified: branches/jbossws-1.0/src/test/resources/jaxws/samples/wsaddressing/WEB-INF/jaxws-handlers.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxws/samples/wsaddressing/WEB-INF/jaxws-handlers.xml 2006-10-18 19:56:42 UTC (rev 1257) +++ branches/jbossws-1.0/src/test/resources/jaxws/samples/wsaddressing/WEB-INF/jaxws-handlers.xml 2006-10-18 20:20:11 UTC (rev 1258) @@ -2,7 +2,7 @@ <handler-chains xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee handler-chain.xsd"> + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd"> <handler-chain> <protocol-bindings>##SOAP11_HTTP</protocol-bindings> Modified: branches/jbossws-1.0/src/test/resources/tests-tomcat-excludes.txt =================================================================== --- branches/jbossws-1.0/src/test/resources/tests-tomcat-excludes.txt 2006-10-18 19:56:42 UTC (rev 1257) +++ branches/jbossws-1.0/src/test/resources/tests-tomcat-excludes.txt 2006-10-18 20:20:11 UTC (rev 1258) @@ -1,3 +1,4 @@ +org/jboss/test/ws/jaxrpc/jbws1011/** org/jboss/test/ws/jaxrpc/samples/dynamichandler/** org/jboss/test/ws/jaxrpc/samples/jmstransport/** org/jboss/test/ws/jaxrpc/samples/jsr109ejb/** @@ -3,4 +4,4 @@ org/jboss/test/ws/jaxrpc/samples/secureejb/** org/jboss/test/ws/jaxrpc/samples/wsbpel/** -org/jboss/test/ws/jaxrpc/jbws1011/** +org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.class org/jboss/test/ws/jaxws/samples/jsr181ejb/**