Author: richard.opalka(a)jboss.com Date: 2011-10-31 11:26:08 -0400 (Mon, 31 Oct 2011) New Revision: 15174 Added: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebservicesDescriptorParser.java spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebservicesFactory.java spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebservicesMetaData.java Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/ParserConstants.java spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/PortComponentMetaData.java spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebserviceDescriptionMetaData.java spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebservicesFactory.java Log: [JBWS-3376] implemented jboss-webservices.xml parser Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/ParserConstants.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/ParserConstants.java 2011-10-28 19:49:55 UTC (rev 15173) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/ParserConstants.java 2011-10-31 15:26:08 UTC (rev 15174) @@ -30,10 +30,15 @@ */ public abstract class ParserConstants { + public static final String JAVAEE_NS = "http://java.sun.com/xml/ns/javaee"; + public static final String JBOSSEE_NS = "http://www.jboss.com/xml/ns/javaee"; + public static final String J2EE_NS = "http://java.sun.com/xml/ns/j2ee"; + public static final String AUTH_METHOD = "auth-method"; + public static final String CHAIN_PORT_PATTERN = "port-name-pattern"; public static final String CHAIN_PROTOCOL_BINDING = "protocol-bindings"; @@ -70,10 +75,14 @@ public static final String WSDL_FILE = "wsdl-file"; + public static final String WSDL_PUBLISH_LOCATION = "wsdl-publish-location"; + public static final String PORT_COMPONENT = "port-component"; public static final String PORT_COMPONENT_NAME = "port-component-name"; + public static final String PORT_COMPONENT_URI = "port-component-uri"; + public static final String WSDL_SERVICE = "wsdl-service"; public static final String WSDL_PORT = "wsdl-port"; @@ -112,19 +121,28 @@ public static final String CONFIG_NAME = "config-name"; + public static final String CONFIG_FILE = "config-file"; + + public static final String CONTEXT_ROOT = "context-root"; + public static final String PRE_HANDLER_CHAINS = "pre-handler-chains"; public static final String POST_HANDLER_CHAINS = "post-handler-chains"; public static final String FEATURE = "feature"; + public static final String FEATURE_DATA = "feature-data"; + + public static final String FEATURE_NAME = "feature-name"; + public static final String PROPERTY = "property"; public static final String PROPERTY_NAME = "property-name"; public static final String PROPERTY_VALUE = "property-value"; + + public static final String SECURE_WSDL_ACCESS = "secure-wsdl-access"; - public static final String FEATURE_NAME = "feature-name"; + public static final String TRANSPORT_GUARANTEE = "transport-guarantee"; - public static final String FEATURE_DATA = "feature-data"; } Added: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebservicesDescriptorParser.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebservicesDescriptorParser.java (rev 0) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebservicesDescriptorParser.java 2011-10-31 15:26:08 UTC (rev 15174) @@ -0,0 +1,33 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file 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.wsf.spi.metadata.webservices; + +import org.jboss.wsf.spi.metadata.DescriptorParser; + +/** + * Parser for WS UMDM. + * + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + */ +public interface JBossWebservicesDescriptorParser extends DescriptorParser<JBossWebservicesMetaData> +{ +} Added: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebservicesFactory.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebservicesFactory.java (rev 0) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebservicesFactory.java 2011-10-31 15:26:08 UTC (rev 15174) @@ -0,0 +1,228 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file 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.wsf.spi.metadata.webservices; + +import static javax.xml.stream.XMLStreamConstants.END_ELEMENT; +import static javax.xml.stream.XMLStreamConstants.START_ELEMENT; +import static org.jboss.wsf.spi.metadata.ParserConstants.CONFIG_FILE; +import static org.jboss.wsf.spi.metadata.ParserConstants.CONFIG_NAME; +import static org.jboss.wsf.spi.metadata.ParserConstants.CONTEXT_ROOT; +import static org.jboss.wsf.spi.metadata.ParserConstants.JBOSSEE_NS; +import static org.jboss.wsf.spi.metadata.ParserConstants.WEBSERVICES; +import static org.jboss.wsf.spi.metadata.ParserConstants.WEBSERVICE_DESCRIPTION; +import static org.jboss.wsf.spi.util.StAXUtils.elementAsString; +import static org.jboss.wsf.spi.util.StAXUtils.match; + +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; +import java.util.ResourceBundle; + +import javax.xml.stream.XMLStreamConstants; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamReader; +import javax.xml.ws.WebServiceException; + +import org.jboss.ws.api.util.BundleUtils; +import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; +import org.jboss.wsf.spi.util.StAXUtils; + +/** + * A JBossXB factory for {@link JBossWebservicesMetaData} + * + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + */ +public class JBossWebservicesFactory extends WebservicesFactory +{ + private static final ResourceBundle bundle = BundleUtils.getBundle(JBossWebservicesFactory.class); + + public JBossWebservicesFactory(URL descriptorURL) + { + super(descriptorURL); + } + + /** + * Load jboss-webservices.xml from <code>META-INF/jboss-webservices.xml</code> + * or <code>WEB-INF/jboss-webservices.xml</code>. + * + * @param root virtual file root + * @return JBossWebservicesMetaData or <code>null</code> if it cannot be found + */ + public static WebservicesMetaData loadFromVFSRoot(UnifiedVirtualFile root) + { + WebservicesMetaData webservices = null; + + UnifiedVirtualFile wsdd = null; + try + { + wsdd = root.findChild("META-INF/jboss-webservices.xml"); + } + catch (IOException e) + { + // + } + + // Maybe a web application deployment? + if (null == wsdd) + { + try + { + wsdd = root.findChild("WEB-INF/jboss-webservices.xml"); + } + catch (IOException e) + { + // + } + } + + // the descriptor is optional + if (wsdd != null) + { + return load(wsdd.toURL()); + } + + return webservices; + } + + public static JBossWebservicesMetaData load(URL wsddUrl) + { + InputStream is = null; + try + { + is = wsddUrl.openStream(); + XMLStreamReader xmlr = StAXUtils.createXMLStreamReader(is); + return parse(xmlr, wsddUrl); + } + catch (Exception e) + { + throw new WebServiceException(BundleUtils.getMessage(bundle, "FAILED_TO_UNMARSHALL", wsddUrl), e); + } + finally + { + try + { + if (is != null) is.close(); + } + catch (IOException e) {} //ignore + } + } + + public static JBossWebservicesMetaData parse(InputStream is) + { + return parse(is, null); + } + + public static JBossWebservicesMetaData parse(InputStream is, URL descriptorURL) + { + try + { + XMLStreamReader xmlr = StAXUtils.createXMLStreamReader(is); + return parse(xmlr, descriptorURL); + } + catch (Exception e) + { + throw new WebServiceException(e); + } + } + + public static JBossWebservicesMetaData parse(XMLStreamReader reader) throws XMLStreamException + { + return parse(reader, null); + } + + private static JBossWebservicesMetaData parse(XMLStreamReader reader, URL descriptorURL) throws XMLStreamException + { + int iterate; + try + { + iterate = reader.nextTag(); + } + catch (XMLStreamException e) + { + // skip non-tag elements + iterate = reader.nextTag(); + } + JBossWebservicesMetaData metadata = null; + switch (iterate) + { + case END_ELEMENT : { + // we're done + break; + } + case START_ELEMENT : { + + if (match(reader, JBOSSEE_NS, WEBSERVICES)) + { + String nsUri = reader.getNamespaceURI(); + JBossWebservicesFactory factory = new JBossWebservicesFactory(descriptorURL); + metadata = factory.parseWebservices(reader, nsUri, descriptorURL); + } + else + { + throw new IllegalStateException(BundleUtils.getMessage(bundle, "UNEXPECTED_ELEMENT", reader.getLocalName())); + } + } + } + return metadata; + } + + private JBossWebservicesMetaData parseWebservices(XMLStreamReader reader, String nsUri, URL descriptorURL) throws XMLStreamException + { + JBossWebservicesMetaData metadata = new JBossWebservicesMetaData(descriptorURL); + while (reader.hasNext()) + { + switch (reader.nextTag()) + { + case XMLStreamConstants.END_ELEMENT : { + if (match(reader, nsUri, WEBSERVICES)) + { + return metadata; + } + else + { + throw new IllegalStateException(BundleUtils.getMessage(bundle, "UNEXPECTED_END_TAG", reader.getLocalName())); + } + } + case XMLStreamConstants.START_ELEMENT : { + if (match(reader, nsUri, CONTEXT_ROOT)) { + metadata.setContextRoot(elementAsString(reader)); + } + else if (match(reader, nsUri, CONFIG_NAME)) { + metadata.setConfigName(elementAsString(reader)); + } + else if (match(reader, nsUri, CONFIG_FILE)) { + metadata.setConfigFile(elementAsString(reader)); + } + else if (match(reader, nsUri, WEBSERVICE_DESCRIPTION)) { + metadata.addWebserviceDescription(super.parseWebserviceDescription(reader, nsUri, metadata)); + } + else + { + throw new IllegalStateException(BundleUtils.getMessage(bundle, "UNEXPECTED_ELEMENT", reader.getLocalName())); + } + } + } + } + throw new IllegalStateException(BundleUtils.getMessage(bundle, "REACHED_END_OF_XML_DOCUMENT_UNEXPECTEDLY")); + } + +} Added: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebservicesMetaData.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebservicesMetaData.java (rev 0) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebservicesMetaData.java 2011-10-31 15:26:08 UTC (rev 15174) @@ -0,0 +1,81 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2011, Red Hat, Inc., and individual contributors + * as indicated by the @author tags. See the copyright.txt file 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.wsf.spi.metadata.webservices; + +import java.net.URL; + +/** + * XML Binding root element for <code>jboss-webservices.xml</code> + * + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + */ +public class JBossWebservicesMetaData extends WebservicesMetaData +{ + + private String contextRoot; + + private String configName; + + private String configFile; + + public JBossWebservicesMetaData() + { + super(); + } + + public JBossWebservicesMetaData(final URL descriptorURL) + { + super(descriptorURL); + } + + public String getContextRoot() + { + return contextRoot; + } + + public void setContextRoot(String contextRoot) + { + this.contextRoot = contextRoot; + } + + public String getConfigName() + { + return configName; + } + + public void setConfigName(String configName) + { + this.configName = configName; + } + + public String getConfigFile() + { + return configFile; + } + + public void setConfigFile(String configFile) + { + this.configFile = configFile; + } + +} Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/PortComponentMetaData.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/PortComponentMetaData.java 2011-10-28 19:49:55 UTC (rev 15173) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/PortComponentMetaData.java 2011-10-31 15:26:08 UTC (rev 15174) @@ -62,6 +62,12 @@ * This name must be unique amongst all port component names in a module. */ private String portComponentName; + // The optional <port-component-uri> + private String portComponentURI; + // The optional <auth-method> + private String authMethod; + // The optional <transport-guarantee> + private String transportGuarantee; // The required <wsdl-port> element private QName wsdlPort; // The required <service-endpoint-interface> element @@ -117,6 +123,36 @@ this.portComponentName = portComponentName; } + public String getPortComponentURI() + { + return portComponentURI; + } + + public void setPortComponentURI(String portComponentURI) + { + this.portComponentURI = portComponentURI; + } + + public String getAuthMethod() + { + return authMethod; + } + + public void setAuthMethod(String authMethod) + { + this.authMethod = authMethod; + } + + public String getTransportGuarantee() + { + return transportGuarantee; + } + + public void setTransportGuarantee(String transportGuarantee) + { + this.transportGuarantee = transportGuarantee; + } + public QName getWsdlPort() { return wsdlPort; Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebserviceDescriptionMetaData.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebserviceDescriptionMetaData.java 2011-10-28 19:49:55 UTC (rev 15173) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebserviceDescriptionMetaData.java 2011-10-31 15:26:08 UTC (rev 15174) @@ -55,7 +55,19 @@ private String jaxrpcMappingFile; // The required <port-component> elements private ArrayList<PortComponentMetaData> portComponents = new ArrayList<PortComponentMetaData>(); + // The optional <wsdl-publish-location> element + private String wsdlPublishLocation; + public String getWsdlPublishLocation() + { + return wsdlPublishLocation; + } + + public void setWsdlPublishLocation(String wsdlPublishLocation) + { + this.wsdlPublishLocation = wsdlPublishLocation; + } + public WebserviceDescriptionMetaData(WebservicesMetaData webservices) { this.webservices = webservices; @@ -120,6 +132,16 @@ return null; } + public PortComponentMetaData getPortComponentByEjbLinkName(String ejbName) + { + for (PortComponentMetaData pc : portComponents) + { + if (ejbName.equals(pc.getEjbLink())) return pc; + } + + return null; + } + public String getWebserviceDescriptionName() { return webserviceDescriptionName; Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebservicesFactory.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebservicesFactory.java 2011-10-28 19:49:55 UTC (rev 15173) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebservicesFactory.java 2011-10-31 15:26:08 UTC (rev 15174) @@ -25,6 +25,7 @@ import static javax.xml.stream.XMLStreamConstants.START_ELEMENT; import static org.jboss.wsf.spi.metadata.ParserConstants.ADDRESSING; import static org.jboss.wsf.spi.metadata.ParserConstants.ADDRESSING_RESPONSES; +import static org.jboss.wsf.spi.metadata.ParserConstants.AUTH_METHOD; import static org.jboss.wsf.spi.metadata.ParserConstants.EJB_LINK; import static org.jboss.wsf.spi.metadata.ParserConstants.ENABLED; import static org.jboss.wsf.spi.metadata.ParserConstants.ENABLE_MTOM; @@ -36,16 +37,20 @@ import static org.jboss.wsf.spi.metadata.ParserConstants.MTOM_THRESHOLD; import static org.jboss.wsf.spi.metadata.ParserConstants.PORT_COMPONENT; import static org.jboss.wsf.spi.metadata.ParserConstants.PORT_COMPONENT_NAME; +import static org.jboss.wsf.spi.metadata.ParserConstants.PORT_COMPONENT_URI; import static org.jboss.wsf.spi.metadata.ParserConstants.PROTOCOL_BINDING; import static org.jboss.wsf.spi.metadata.ParserConstants.REQUIRED; import static org.jboss.wsf.spi.metadata.ParserConstants.RESPECT_BINDING; +import static org.jboss.wsf.spi.metadata.ParserConstants.SECURE_WSDL_ACCESS; import static org.jboss.wsf.spi.metadata.ParserConstants.SERVICE_ENDPOINT_INTERFACE; import static org.jboss.wsf.spi.metadata.ParserConstants.SERVICE_IMPL_BEAN; import static org.jboss.wsf.spi.metadata.ParserConstants.SERVLET_LINK; +import static org.jboss.wsf.spi.metadata.ParserConstants.TRANSPORT_GUARANTEE; import static org.jboss.wsf.spi.metadata.ParserConstants.WEBSERVICES; import static org.jboss.wsf.spi.metadata.ParserConstants.WEBSERVICE_DESCRIPTION; import static org.jboss.wsf.spi.metadata.ParserConstants.WEBSERVICE_DESCRIPTION_NAME; import static org.jboss.wsf.spi.metadata.ParserConstants.WSDL_FILE; +import static org.jboss.wsf.spi.metadata.ParserConstants.WSDL_PUBLISH_LOCATION; import static org.jboss.wsf.spi.metadata.ParserConstants.WSDL_PORT; import static org.jboss.wsf.spi.metadata.ParserConstants.WSDL_SERVICE; import static org.jboss.wsf.spi.util.StAXUtils.elementAsBoolean; @@ -242,7 +247,7 @@ throw new IllegalStateException(BundleUtils.getMessage(bundle, "REACHED_END_OF_XML_DOCUMENT_UNEXPECTEDLY")); } - private WebserviceDescriptionMetaData parseWebserviceDescription(XMLStreamReader reader, String nsUri, WebservicesMetaData wsMetaData) throws XMLStreamException + WebserviceDescriptionMetaData parseWebserviceDescription(XMLStreamReader reader, String nsUri, WebservicesMetaData wsMetaData) throws XMLStreamException { WebserviceDescriptionMetaData description = new WebserviceDescriptionMetaData(wsMetaData); while (reader.hasNext()) @@ -266,9 +271,12 @@ else if (match(reader, nsUri, WSDL_FILE)) { description.setWsdlFile(elementAsString(reader)); } + else if (match(reader, nsUri, WSDL_PUBLISH_LOCATION)) { + description.setWsdlPublishLocation(elementAsString(reader)); + } else if (match(reader, nsUri, JAXRPC_MAPPING_FILE)) { - description.setJaxrpcMappingFile(elementAsString(reader)); - } + description.setJaxrpcMappingFile(elementAsString(reader)); + } else if (match(reader, nsUri, PORT_COMPONENT)) { description.addPortComponent(parsePortComponent(reader, nsUri, description)); } @@ -303,12 +311,24 @@ if (match(reader, nsUri, PORT_COMPONENT_NAME)) { pc.setPortComponentName(elementAsString(reader)); } + else if (match(reader, nsUri, PORT_COMPONENT_URI)) { + pc.setPortComponentURI(elementAsString(reader)); + } + else if (match(reader, nsUri, AUTH_METHOD)) { + pc.setAuthMethod(elementAsString(reader)); + } + else if (match(reader, nsUri, TRANSPORT_GUARANTEE)) { + pc.setTransportGuarantee(elementAsString(reader)); + } else if (match(reader, nsUri, WSDL_SERVICE)) { pc.setWsdlService(elementAsQName(reader)); } else if (match(reader, nsUri, WSDL_PORT)) { pc.setWsdlPort(elementAsQName(reader)); } + else if (match(reader, nsUri, SECURE_WSDL_ACCESS)) { + pc.setSecureWSDLAccess(elementAsBoolean(reader)); + } else if (match(reader, nsUri, ENABLE_MTOM)) { pc.setMtomEnabled(elementAsBoolean(reader)); }