Author: darran.lofthouse(a)jboss.com Date: 2006-10-22 14:57:24 -0400 (Sun, 22 Oct 2006) New Revision: 1281 Added: branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedWebSecurityMetaData.java branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/ConfidentialEndpoint.java branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/ConfidentialEndpointImpl.java branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190Exception.java branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190TestCase.java branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpoint.java branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/ConfidentialEndpoint.java branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190Exception.java branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpoint.java branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl.java branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/META-INF/ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/META-INF/application-client.xml branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/META-INF/jboss-client.xml branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/confidential-mapping.xml branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/test-mapping.xml branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/web.xml branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/webservices.xml branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/wsdl/ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/wsdl/ConfidentialService.wsdl branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/wsdl/TestService.wsdl branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/confidential-config.xml branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/test-config.xml branches/jbossws-1.0/src/test/resources/jaxws/jbws1190/ branches/jbossws-1.0/src/test/resources/jaxws/jbws1190/WEB-INF/ branches/jbossws-1.0/src/test/resources/jaxws/jbws1190/WEB-INF/web.xml Removed: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/ConfidentialEndpoint.java branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190Exception.java branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpoint.java branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl.java branches/jbossws-1.0/src/test/resources/jaxws/jbws1190/WEB-INF/ branches/jbossws-1.0/src/test/resources/jaxws/jbws1190/WEB-INF/web.xml Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/AnnotationsMetaDataBuilder.java branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/JSR109MetaDataBuilder.java branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/JSR109ServerMetaDataBuilder.java branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/MetaDataBuilder.java branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/jboss/WebMetaDataAdaptor.java branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/tomcat/DeploymentInfoAdaptor.java branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedWebMetaData.java branches/jbossws-1.0/src/test/ant/build-jars-jaxrpc.xml branches/jbossws-1.0/src/test/ant/build-jars-jaxws.xml Log: JBWS-1190 - Respect transport-guarantee as specified in web.xml for POJO deployments. Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/AnnotationsMetaDataBuilder.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/AnnotationsMetaDataBuilder.java 2006-10-22 13:22:00 UTC (rev 1280) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/AnnotationsMetaDataBuilder.java 2006-10-22 18:57:24 UTC (rev 1281) @@ -27,7 +27,6 @@ import java.io.IOException; import java.io.Writer; -import javax.xml.namespace.QName; import javax.xml.ws.BindingType; import org.jboss.logging.Logger; @@ -104,10 +103,10 @@ Writer writer = IOUtils.getCharsetFileWriter(wsdlTmpFile, Constants.DEFAULT_XML_CHARSET); wsdlDefinitions.write(writer, Constants.DEFAULT_XML_CHARSET); writer.close(); - + wsdlLocation = wsdlTmpFile.toURL().toExternalForm(); serviceMetaData.setWsdlFile(wsdlLocation); - + JavaWsdlMapping jaxrpcMapping = javaToWSDL.getJavaWsdlMapping(); File mappingTmpFile = File.createTempFile(serviceName, ".xml", tmpdir); mappingTmpFile.deleteOnExit(); @@ -115,7 +114,7 @@ writer = IOUtils.getCharsetFileWriter(mappingTmpFile, Constants.DEFAULT_XML_CHARSET); writer.write(jaxrpcMapping.serialize()); writer.close(); - + String mappingLocation = mappingTmpFile.toURL().toExternalForm(); serviceMetaData.setJaxrpcMappingFile(mappingLocation); } @@ -146,6 +145,8 @@ UnifiedWebMetaData webMetaData = (UnifiedWebMetaData)udi.metaData; contextRoot = webMetaData.getContextRoot(); urlPattern = webMetaData.getServletMappings().get(linkName); + + epMetaData.setTransportGuarantee(getTransportGuarantee(webMetaData, linkName)); } // Process @PortComponent @@ -177,10 +178,15 @@ if (authMethod.length() > 0) epMetaData.setAuthMethod(authMethod); - // setup transport guarantee - String transportGuarantee = anPortComponent.transportGuarantee(); - if (transportGuarantee.length() > 0) - epMetaData.setTransportGuarantee(transportGuarantee); + if (epMetaData.getTransportGuarantee() == null || epMetaData.getTransportGuarantee().length() == 0) + { + // setup transport guarantee + String transportGuarantee = anPortComponent.transportGuarantee(); + if (transportGuarantee.length() > 0) + { + epMetaData.setTransportGuarantee(transportGuarantee); + } + } } epMetaData.setContextRoot(contextRoot); Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/JSR109MetaDataBuilder.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/JSR109MetaDataBuilder.java 2006-10-22 13:22:00 UTC (rev 1280) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/JSR109MetaDataBuilder.java 2006-10-22 18:57:24 UTC (rev 1281) @@ -29,13 +29,11 @@ import javax.xml.namespace.QName; import javax.xml.rpc.ParameterMode; import javax.xml.rpc.encoding.TypeMappingRegistry; -import javax.xml.ws.addressing.AddressingConstants; import org.apache.xerces.xs.XSTypeDefinition; import org.jboss.logging.Logger; import org.jboss.ws.Constants; import org.jboss.ws.WSException; -import org.jboss.ws.addressing.AddressingConstantsImpl; import org.jboss.ws.jaxrpc.LiteralTypeMapping; import org.jboss.ws.jaxrpc.Style; import org.jboss.ws.jaxrpc.TypeMappingImpl; @@ -81,10 +79,8 @@ public abstract class JSR109MetaDataBuilder extends MetaDataBuilder { // provide logging - final Logger log = Logger.getLogger(JSR109MetaDataBuilder.class); + final Logger log = Logger.getLogger(JSR109MetaDataBuilder.class); - private AddressingConstants ADDR = new AddressingConstantsImpl(); - protected void setupTypesMetaData(ServiceMetaData serviceMetaData) { WSDLDefinitions wsdlDefinitions = serviceMetaData.getWsdlDefinitions(); @@ -345,7 +341,6 @@ private void setupAttachmentParameter(WSDLInterfaceOperationPart wsdlOperationPart, ParameterMetaData paramMetaData) { QName xmlType = paramMetaData.getXmlType(); - QName xmlName = paramMetaData.getXmlName(); WSDLProperty mimeTypeProp = wsdlOperationPart.getProperty(Constants.WSDL_PROPERTY_WSDL11_MIME_TYPE); if (mimeTypeProp != null) @@ -617,35 +612,4 @@ } } - /** - * Build default action according to the pattern described in - * http://www.w3.org/Submission/2004/SUBM-ws-addressing-20040810/ - * Section 3.3.2 'Default Action Pattern'<br> - * [target namespace]/[port type name]/[input|output name] - * - * @param wsdlOperation - * @return action value - */ - private String buildWsaActionValue(WSDLInterfaceOperation wsdlOperation) - { - WSDLProperty wsaAction = wsdlOperation.getProperty(Constants.WSDL_ATTRIBUTE_WSA_ACTION.toString()); - String actionValue = null; - - if (null == wsaAction) - { - - String tns = wsdlOperation.getQName().getNamespaceURI(); - String portTypeName = wsdlOperation.getQName().getLocalPart(); - WSDLProperty messageName = wsdlOperation.getProperty("http://www.jboss.org/jbossws/messagename/...; - - actionValue = new String(tns + "/" + portTypeName + "/" + messageName.getValue()); - } - else - { - actionValue = wsaAction.getValue(); - } - - return actionValue; - } - } Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/JSR109ServerMetaDataBuilder.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/JSR109ServerMetaDataBuilder.java 2006-10-22 13:22:00 UTC (rev 1280) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/JSR109ServerMetaDataBuilder.java 2006-10-22 18:57:24 UTC (rev 1281) @@ -22,12 +22,7 @@ // $Id: JSR109ServerMetaDataBuilder.java 906 2006-09-06 18:57:40Z thomas.diesler(a)jboss.com $ package org.jboss.ws.deployment; -import java.io.File; -import java.io.FileInputStream; import java.io.IOException; -import java.net.URL; -import java.util.Arrays; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; @@ -49,6 +44,8 @@ import org.jboss.ws.metadata.j2ee.UnifiedEjbPortComponentMetaData; import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData; import org.jboss.ws.metadata.j2ee.UnifiedWebMetaData; +import org.jboss.ws.metadata.j2ee.UnifiedWebSecurityMetaData; +import org.jboss.ws.metadata.j2ee.UnifiedWebSecurityMetaData.UnifiedWebResourceCollection; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.metadata.jaxrpcmapping.ServiceEndpointInterfaceMapping; import org.jboss.ws.metadata.jsr109.PortComponentMetaData; @@ -57,9 +54,6 @@ import org.jboss.ws.metadata.wsdl.WSDLEndpoint; import org.jboss.ws.metadata.wsdl.WSDLService; import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; -import org.jboss.ws.metadata.wsse.WSSecurityConfigurationFactory; -import org.jboss.ws.utils.DOMUtils; -import org.w3c.dom.Element; /** * A server side meta data builder that is based on webservices.xml. @@ -100,8 +94,8 @@ JavaWsdlMapping javaWsdlMapping = serviceMetaData.getJavaWsdlMapping(); // JBWS-1114: Check for missing javaWsdlMapping - if (javaWsdlMapping==null) - throw new WSException("jaxrpc-mapping-file not configured from webservices.xml"); + if (javaWsdlMapping == null) + throw new WSException("jaxrpc-mapping-file not configured from webservices.xml"); // Build type mapping meta data setupTypesMetaData(serviceMetaData); @@ -191,7 +185,7 @@ String targetBean = webMetaData.getServletClassMap().get(servletLink); sepMetaData.setServiceEndpointImplName(targetBean); - + // Copy the wsdl publish location from jboss-web.xml String wsdName = serviceMetaData.getWebserviceDescriptionName(); String wsdlPublishLocation = webMetaData.getWsdlPublishLocationByName(wsdName); @@ -212,7 +206,7 @@ // init service endpoint id ObjectName sepID = getServiceEndpointID(udi, sepMetaData); sepMetaData.setServiceEndpointID(sepID); - + replaceAddressLocation(sepMetaData); String seiName = pcMetaData.getServiceEndpointInterface(); @@ -231,7 +225,7 @@ // Add pre handlers WSEndpointConfigJAXRPC jaxrpcConfig = (WSEndpointConfigJAXRPC)sepMetaData.getEndpointConfig(); sepMetaData.addHandlers(jaxrpcConfig.getHandlers(sepMetaData, HandlerType.PRE)); - + // Setup the endpoint handlers for (UnifiedHandlerMetaData uhmd : pcMetaData.getHandlers()) { @@ -241,7 +235,7 @@ sepMetaData.addHandler(uhmd.getHandlerMetaDataJAXRPC(sepMetaData, HandlerType.ENDPOINT)); } } - + // Add post handlers sepMetaData.addHandlers(jaxrpcConfig.getHandlers(sepMetaData, HandlerType.POST)); } @@ -334,56 +328,13 @@ epMetaData.setURLPattern(urlPattern); } - /** Read the transport guarantee from web.xml + /** + * Check the transport guarantee using the UnifiedWebMetaData. */ protected void initTransportGuaranteeJSE(UnifiedDeploymentInfo udi, EndpointMetaData epMetaData, String servletLink) throws IOException { - File warFile = new File(udi.localUrl.getFile()); - if (warFile.isDirectory() == false) - throw new WSException("Expected a war directory: " + udi.localUrl); + UnifiedWebMetaData webMetaData = (UnifiedWebMetaData)udi.metaData; - File webXML = new File(udi.localUrl.getFile() + "/WEB-INF/web.xml"); - if (webXML.isFile() == false) - throw new WSException("Cannot find web.xml: " + webXML); - - Element rootElement = DOMUtils.parse(new FileInputStream(webXML)); - - Element elServletMapping = null; - Iterator itServlet = DOMUtils.getChildElements(rootElement, "servlet-mapping"); - while (itServlet.hasNext() && elServletMapping == null) - { - Element elAux = (Element)itServlet.next(); - String servletName = DOMUtils.getTextContent(DOMUtils.getFirstChildElement(elAux, "servlet-name")); - if (servletLink.equals(servletName)) - elServletMapping = elAux; - } - if (elServletMapping != null) - { - // find servlet-mapping/url-pattern - String urlPattern = DOMUtils.getTextContent(DOMUtils.getFirstChildElement(elServletMapping, "url-pattern")); - if (urlPattern == null) - throw new WSException("Cannot find <url-pattern> for servlet-name: " + servletLink); - - Iterator itSecConstraint = DOMUtils.getChildElements(rootElement, "security-constraint"); - while (itSecConstraint.hasNext()) - { - Element elSecurityConstraint = (Element)itSecConstraint.next(); - Iterator itWebResourceCollection = DOMUtils.getChildElements(elSecurityConstraint, "web-resource-collection"); - while (itWebResourceCollection.hasNext()) - { - Element elWebResourceCollection = (Element)itWebResourceCollection.next(); - String wrcurlPattern = DOMUtils.getTextContent(DOMUtils.getFirstChildElement(elWebResourceCollection, "url-pattern")); - if (urlPattern.equals(wrcurlPattern)) - { - Element elUserDataConstraint = DOMUtils.getFirstChildElement(elSecurityConstraint, "user-data-constraint"); - if (elUserDataConstraint != null) - { - String transportGuarantee = DOMUtils.getTextContent(DOMUtils.getFirstChildElement(elUserDataConstraint, "transport-guarantee")); - epMetaData.setTransportGuarantee(transportGuarantee); - } - } - } - } - } + epMetaData.setTransportGuarantee(getTransportGuarantee(webMetaData, servletLink)); } } Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/MetaDataBuilder.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/MetaDataBuilder.java 2006-10-22 13:22:00 UTC (rev 1280) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/deployment/MetaDataBuilder.java 2006-10-22 18:57:24 UTC (rev 1281) @@ -65,6 +65,8 @@ import org.jboss.ws.metadata.j2ee.UnifiedBeanMetaData; import org.jboss.ws.metadata.j2ee.UnifiedMessageDrivenMetaData; import org.jboss.ws.metadata.j2ee.UnifiedWebMetaData; +import org.jboss.ws.metadata.j2ee.UnifiedWebSecurityMetaData; +import org.jboss.ws.metadata.j2ee.UnifiedWebSecurityMetaData.UnifiedWebResourceCollection; import org.jboss.ws.metadata.wsdl.NCName; import org.jboss.ws.metadata.wsdl.WSDLBinding; import org.jboss.ws.metadata.wsdl.WSDLBindingOperation; @@ -259,7 +261,7 @@ log.warn("Cannot obtain fault type for element: " + xmlName); xmlType = xmlName; } - + if (typesMetaData.getTypeMappingByXMLType(xmlType) != null) javaTypeName = typesMetaData.getTypeMappingByXMLType(xmlType).getJavaTypeName(); @@ -342,6 +344,37 @@ } } + protected String getTransportGuarantee(final UnifiedWebMetaData webMetaData, final String servletLink) + { + String transportGuarantee = ""; + + Map<String, String> servletMappings = webMetaData.getServletMappings(); + String urlPattern = servletMappings.get(servletLink); + + if (urlPattern == null) + throw new WSException("Cannot find <url-pattern> for servlet-name: " + servletLink); + + List<UnifiedWebSecurityMetaData> securityList = webMetaData.getSecurityMetaData(); + for (UnifiedWebSecurityMetaData currentSecurity : securityList) + { + if (currentSecurity.getTransportGuarantee() != null && currentSecurity.getTransportGuarantee().length() > 0) + { + for (UnifiedWebResourceCollection currentCollection : currentSecurity.getWebResources()) + { + for (String currentUrlPattern : currentCollection.getUrlPatterns()) + { + if (urlPattern.equals(currentUrlPattern)) + { + transportGuarantee = currentSecurity.getTransportGuarantee(); + } + } + } + } + } + + return transportGuarantee; + } + /** Replace the address locations for a given port component. */ protected void replaceAddressLocation(ServerEndpointMetaData epMetaData) Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/jboss/WebMetaDataAdaptor.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/jboss/WebMetaDataAdaptor.java 2006-10-22 13:22:00 UTC (rev 1280) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/jboss/WebMetaDataAdaptor.java 2006-10-22 18:57:24 UTC (rev 1281) @@ -23,8 +23,18 @@ // $Id: WebMetaDataAdaptor.java 354 2006-05-16 13:46:47Z thomas.diesler(a)jboss.com $ +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; + import org.jboss.metadata.WebMetaData; +import org.jboss.metadata.WebSecurityMetaData; +import org.jboss.metadata.WebSecurityMetaData.WebResourceCollection; +import org.jboss.ws.metadata.j2ee.UnifiedServiceRefMetaData; import org.jboss.ws.metadata.j2ee.UnifiedWebMetaData; +import org.jboss.ws.metadata.j2ee.UnifiedWebSecurityMetaData; +import org.jboss.ws.metadata.j2ee.UnifiedWebSecurityMetaData.UnifiedWebResourceCollection; /** * Build container independent web meta data @@ -45,6 +55,38 @@ umd.setContextLoader(wmd.getContextLoader()); umd.setSecurityDomain(wmd.getSecurityDomain()); //umd.setWsdlPublishLocationMap(wmd.getWsdlPublishLocationMap()); + umd.setSecurityMetaData(buildUnifiedWebSecurityMetaData(wmd.getSecurityContraints())); + return umd; } + + protected static List<UnifiedWebSecurityMetaData> buildUnifiedWebSecurityMetaData(final Iterator securityConstraints) + { + ArrayList<UnifiedWebSecurityMetaData> unifiedsecurityMetaData = new ArrayList<UnifiedWebSecurityMetaData>(); + + while (securityConstraints.hasNext()) + { + WebSecurityMetaData securityMetaData = (WebSecurityMetaData)securityConstraints.next(); + + UnifiedWebSecurityMetaData current = new UnifiedWebSecurityMetaData(); + unifiedsecurityMetaData.add(current); + + current.setTransportGuarantee(securityMetaData.getTransportGuarantee()); + + HashMap resources = securityMetaData.getWebResources(); + for (Object webResourceObj : resources.values()) + { + WebResourceCollection webResource = (WebResourceCollection)webResourceObj; + UnifiedWebResourceCollection currentResource = current.addWebResource(webResource.getName()); + for (String currentPattern : webResource.getUrlPatterns()) + { + currentResource.addPattern(currentPattern); + } + } + + } + + return unifiedsecurityMetaData; + } + } Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/tomcat/DeploymentInfoAdaptor.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/tomcat/DeploymentInfoAdaptor.java 2006-10-22 13:22:00 UTC (rev 1280) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/tomcat/DeploymentInfoAdaptor.java 2006-10-22 18:57:24 UTC (rev 1281) @@ -28,8 +28,10 @@ import java.net.MalformedURLException; import java.net.URL; import java.net.URLClassLoader; +import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; +import java.util.List; import java.util.Map; import javax.servlet.ServletContext; @@ -39,6 +41,8 @@ import org.jboss.ws.deployment.UnifiedDeploymentInfo; import org.jboss.ws.deployment.ServiceEndpointPublisher; import org.jboss.ws.metadata.j2ee.UnifiedWebMetaData; +import org.jboss.ws.metadata.j2ee.UnifiedWebSecurityMetaData; +import org.jboss.ws.metadata.j2ee.UnifiedWebSecurityMetaData.UnifiedWebResourceCollection; import org.w3c.dom.Element; /** @@ -87,6 +91,7 @@ wmd.setConfigName(ctx.getInitParameter("jbossws-config-name")); wmd.setConfigFile(ctx.getInitParameter("jbossws-config-file")); wmd.setContextLoader(udi.ucl); + wmd.setSecurityMetaData(getSecurityMetaData(webXML)); return wmd; } @@ -148,6 +153,45 @@ return servletClassMap; } + private static List<UnifiedWebSecurityMetaData> getSecurityMetaData(final Element root) + { + ArrayList<UnifiedWebSecurityMetaData> securityMetaData = new ArrayList<UnifiedWebSecurityMetaData>(); + + Iterator itSecurityConstraint = DOMUtils.getChildElements(root, "security-constraint"); + while (itSecurityConstraint.hasNext()) + { + UnifiedWebSecurityMetaData uwsmd = new UnifiedWebSecurityMetaData(); + securityMetaData.add(uwsmd); + + Element securityConstraint = (Element)itSecurityConstraint.next(); + + Iterator itWebResCol = DOMUtils.getChildElements(securityConstraint, "web-resource-collection"); + while (itWebResCol.hasNext()) + { + Element webResCol = (Element)itWebResCol.next(); + String webResName = DOMUtils.getTextContent(DOMUtils.getFirstChildElement(webResCol, "web-resource-name")); + UnifiedWebResourceCollection uwrc = uwsmd.addWebResource(webResName); + + Iterator itUrlPatters = DOMUtils.getChildElements(webResCol, "url-pattern"); + while (itUrlPatters.hasNext()) + { + Element urlPattern = (Element)itUrlPatters.next(); + uwrc.addPattern(DOMUtils.getTextContent(urlPattern)); + } + } + + Element userData = DOMUtils.getFirstChildElement(securityConstraint, "user-data-constraint"); + if (userData != null) + { + String transportGuarantee = DOMUtils.getTextContent(DOMUtils.getFirstChildElement(userData, "transport-guarantee")); + uwsmd.setTransportGuarantee(transportGuarantee); + } + + } + + return securityMetaData; + } + private static Element getWebXMLDocument(ServletContext ctx) { URL webXML = null; Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedWebMetaData.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedWebMetaData.java 2006-10-22 13:22:00 UTC (rev 1280) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedWebMetaData.java 2006-10-22 18:57:24 UTC (rev 1281) @@ -24,6 +24,7 @@ //$Id: UnifiedWebMetaData.java 316 2006-05-12 17:09:42Z thomas.diesler(a)jboss.com $ import java.util.HashMap; +import java.util.List; import java.util.Map; /** @@ -50,7 +51,9 @@ private String securityDomain; /** A HashMap<String, String> for webservice description publish locations */ private Map<String, String> wsdlPublishLocationMap = new HashMap<String, String>(); - + /** web.xml security-constraints */ + private List<UnifiedWebSecurityMetaData> securityMetaData; + public String getContextRoot() { return contextRoot; @@ -121,6 +124,16 @@ this.securityDomain = securityDomain; } + public List<UnifiedWebSecurityMetaData> getSecurityMetaData() + { + return securityMetaData; + } + + public void setSecurityMetaData(List<UnifiedWebSecurityMetaData> securityMetaData) + { + this.securityMetaData = securityMetaData; + } + public void setWsdlPublishLocationMap(Map<String, String> wsdlPublishLocationMap) { this.wsdlPublishLocationMap = wsdlPublishLocationMap; @@ -130,5 +143,6 @@ { // if not found, the we will use default return wsdlPublishLocationMap.get(name); - } + } + } Added: branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedWebSecurityMetaData.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedWebSecurityMetaData.java 2006-10-22 13:22:00 UTC (rev 1280) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedWebSecurityMetaData.java 2006-10-22 18:57:24 UTC (rev 1281) @@ -0,0 +1,95 @@ +/* + * 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.metadata.j2ee; + +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; + +/** + * + * @author darran.lofthouse(a)jboss.com + * @since Oct 22, 2006 + */ +public class UnifiedWebSecurityMetaData +{ + + /** The optional security-constraint/user-data-constraint/transport-guarantee */ + private String transportGuarantee; + + /** + * The HashMap for the security-constraint/web-resource-collection + * elements. + */ + private HashMap<String, UnifiedWebResourceCollection> webResources = new HashMap<String, UnifiedWebResourceCollection>(); + + public UnifiedWebResourceCollection addWebResource(final String name) + { + UnifiedWebResourceCollection wrc = new UnifiedWebResourceCollection(name); + webResources.put(name, wrc); + + return wrc; + } + + public Collection<UnifiedWebResourceCollection> getWebResources() + { + return webResources.values(); + } + + public String getTransportGuarantee() + { + return transportGuarantee; + } + + public void setTransportGuarantee(String transportGuarantee) + { + this.transportGuarantee = transportGuarantee; + } + + public static class UnifiedWebResourceCollection + { + private String name; + /** The required url-pattern element(s) */ + private HashSet<String> urlPatterns = new HashSet<String>(); + + public UnifiedWebResourceCollection(final String name) + { + this.name = name; + } + + public String getName() + { + return name; + } + + public void addPattern(String pattern) + { + urlPatterns.add(pattern); + } + + public HashSet<String> getUrlPatterns() + { + return urlPatterns; + } + } + +} Property changes on: branches/jbossws-1.0/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedWebSecurityMetaData.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/jbossws-1.0/src/test/ant/build-jars-jaxrpc.xml =================================================================== --- branches/jbossws-1.0/src/test/ant/build-jars-jaxrpc.xml 2006-10-22 13:22:00 UTC (rev 1280) +++ branches/jbossws-1.0/src/test/ant/build-jars-jaxrpc.xml 2006-10-22 18:57:24 UTC (rev 1281) @@ -783,6 +783,36 @@ <include name="wsdl/**"/> </webinf> </war> + + <!-- jaxrpc-jbws1190 --> + <war warfile="${build.test.dir}/libs/jaxrpc-jbws1190.war" webxml="${build.test.dir}/resources/jaxrpc/jbws1190/WEB-INF/web.xml"> + <classes dir="${build.test.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1190/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl$1.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1190/ConfidentialEndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1190/ConfidentialEndpoint.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190Exception.class"/> + </classes> + <webinf dir="${build.test.dir}/resources/jaxrpc/jbws1190/WEB-INF"> + <include name="webservices.xml"/> + <include name="test-mapping.xml"/> + <include name="confidential-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar jarfile="${build.test.dir}/libs/jaxrpc-jbws1190-client.jar"> + <fileset dir="${build.test.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws1190/TestEndpoint.class"/> + </fileset> + <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1190/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1190/WEB-INF"> + <include name="test-mapping.xml"/> + </metainf> + </jar> <!-- jaxrpcws-jbws1205 --> <war warfile="${build.test.dir}/libs/jaxrpc-jbws1205-simple.war" webxml="${build.test.dir}/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF/web.xml"> Modified: branches/jbossws-1.0/src/test/ant/build-jars-jaxws.xml =================================================================== --- branches/jbossws-1.0/src/test/ant/build-jars-jaxws.xml 2006-10-22 13:22:00 UTC (rev 1280) +++ branches/jbossws-1.0/src/test/ant/build-jars-jaxws.xml 2006-10-22 18:57:24 UTC (rev 1281) @@ -82,6 +82,16 @@ </classes> </war> + <!-- jaxws-jbws1190 --> + <war destfile="${build.test.dir}/libs/jaxws-jbws1190.war" webxml="${build.test.dir}/resources/jaxws/jbws1190/WEB-INF/web.xml"> + <classes dir="${build.test.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws1190/ConfidentialEndpoint.class"/> + <include name="org/jboss/test/ws/jaxws/jbws1190/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl*.class"/> + <include name="org/jboss/test/ws/jaxws/jbws1190/JBWS1190Exception.class"/> + </classes> + </war> + <!-- jaxws-jsr181-complex --> <war warfile="${build.test.dir}/libs/jaxws-jsr181-complex.war" webxml="${build.test.dir}/resources/jaxws/jsr181/complex/WEB-INF/web.xml"> <classes dir="${build.test.dir}/classes"> Added: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/ConfidentialEndpoint.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/ConfidentialEndpoint.java 2006-10-22 13:22:00 UTC (rev 1280) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/ConfidentialEndpoint.java 2006-10-22 18:57:24 UTC (rev 1281) @@ -0,0 +1,37 @@ +/* + * 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.test.ws.jaxrpc.jbws1190; + +import java.rmi.Remote; +import java.rmi.RemoteException; + +/** + * + * @author darran.lofthouse(a)jboss.com + * @since 19-October-2006 + */ +public interface ConfidentialEndpoint extends Remote +{ + + public String helloWorld(final String message) throws RemoteException; + +} Property changes on: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/ConfidentialEndpoint.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/ConfidentialEndpointImpl.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/ConfidentialEndpointImpl.java 2006-10-22 13:22:00 UTC (rev 1280) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/ConfidentialEndpointImpl.java 2006-10-22 18:57:24 UTC (rev 1281) @@ -0,0 +1,42 @@ +/* + * 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.test.ws.jaxrpc.jbws1190; + +import java.rmi.RemoteException; + +/** + * + * @author darran.lofthouse(a)jboss.com + * @since Oct 22, 2006 + */ +public class ConfidentialEndpointImpl implements ConfidentialEndpoint +{ + + /** + * @see org.jboss.test.ws.jaxrpc.jbws1190.ConfidentialEndpoint#helloWorld(java.lang.String) + */ + public String helloWorld(final String message) throws RemoteException + { + return message; + } + +} Property changes on: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/ConfidentialEndpointImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190Exception.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190Exception.java 2006-10-22 13:22:00 UTC (rev 1280) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190Exception.java 2006-10-22 18:57:24 UTC (rev 1281) @@ -0,0 +1,55 @@ +/* + * 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.test.ws.jaxrpc.jbws1190; + +/** + * + * @author darran.lofthouse(a)jboss.com + * @since 19-October-2006 + */ +public class JBWS1190Exception extends RuntimeException +{ + + /** */ + private static final long serialVersionUID = 5957186382787505270L; + + public JBWS1190Exception() + { + super(); + } + + public JBWS1190Exception(final String message, final Throwable cause) + { + super(message, cause); + } + + public JBWS1190Exception(final String message) + { + super(message); + } + + public JBWS1190Exception(final Throwable cause) + { + super(cause); + } + +} Property changes on: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190Exception.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190TestCase.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190TestCase.java 2006-10-22 13:22:00 UTC (rev 1280) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190TestCase.java 2006-10-22 18:57:24 UTC (rev 1281) @@ -0,0 +1,67 @@ +/* + * 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.test.ws.jaxrpc.jbws1190; + +import javax.naming.InitialContext; +import javax.xml.rpc.Service; + +import junit.framework.Test; + +import org.jboss.test.ws.JBossWSTest; +import org.jboss.test.ws.JBossWSTestSetup; + +/** + * + * @author darran.lofthouse(a)jboss.com + * @since Oct 22, 2006 + */ +public class JBWS1190TestCase extends JBossWSTest +{ + private static final String ARCHIVE_NAME = "jaxrpc-jbws1190.war"; + + private static TestEndpoint port; + + public static Test suite() + { + return JBossWSTestSetup.newTestSetup(JBWS1190TestCase.class, ARCHIVE_NAME+", jaxrpc-jbws1190-client.jar"); + } + + protected void setUp() throws Exception + { + if (port == null) + { + InitialContext iniCtx = getInitialContext(); + Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); + port = (TestEndpoint)service.getPort(TestEndpoint.class); + } + } + + public void testTestEndpoint() throws Exception + { + port.testAddress(ARCHIVE_NAME, "TestService", "http", "8080"); + } + + public void testConfidentialEndpoint() throws Exception + { + port.testAddress(ARCHIVE_NAME, "ConfidentialService", "https", "8443"); + } +} Property changes on: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190TestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpoint.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpoint.java 2006-10-22 13:22:00 UTC (rev 1280) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpoint.java 2006-10-22 18:57:24 UTC (rev 1281) @@ -0,0 +1,37 @@ +/* + * 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.test.ws.jaxrpc.jbws1190; + +import java.rmi.Remote; +import java.rmi.RemoteException; + +/** + * + * @author darran.lofthouse(a)jboss.com + * @since 19-October-2006 + */ +public interface TestEndpoint extends Remote +{ + + public void testAddress(final String archive, final String service, final String scheme, final String port) throws RemoteException; + +} Property changes on: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpoint.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java 2006-10-22 13:22:00 UTC (rev 1280) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java 2006-10-22 18:57:24 UTC (rev 1281) @@ -0,0 +1,102 @@ +/* + * 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.test.ws.jaxrpc.jbws1190; + +import java.io.File; +import java.io.FilenameFilter; +import java.net.MalformedURLException; + +import org.jboss.ws.metadata.wsdl.WSDLDefinitions; +import org.jboss.ws.metadata.wsdl.WSDLDefinitionsFactory; +import org.jboss.ws.metadata.wsdl.WSDLEndpoint; +import org.jboss.ws.metadata.wsdl.WSDLService; +import org.jboss.ws.server.ServerConfig; +import org.jboss.ws.server.ServerConfigFactory; + +/** + * + * @author darran.lofthouse(a)jboss.com + * @since 19-October-2006 + */ +public class TestEndpointImpl implements TestEndpoint +{ + + public void testAddress(final String archive, final String service, final String scheme, final String port) + { + ServerConfigFactory serverConfigFactory = ServerConfigFactory.getInstance(); + ServerConfig serverConfig = serverConfigFactory.getServerConfig(); + + File dataDir = serverConfig.getServerDataDir(); + File wsdlDir = new File(dataDir.getAbsolutePath() + File.separator + "wsdl" + File.separator + archive); + + if (wsdlDir.exists() == false) + { + throw new JBWS1190Exception(wsdlDir.getAbsolutePath() + " does not exist."); + } + + File[] wsdls = wsdlDir.listFiles(new FilenameFilter() { + public boolean accept(File dir, String name) + { + return name.startsWith(service); + } + }); + + assertEquals("WSDL files found", 1, wsdls.length); + + WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); + WSDLDefinitions wsdl; + try + { + wsdl = factory.parse(wsdls[0].toURL()); + } + catch (MalformedURLException e) + { + throw new JBWS1190Exception("Error readin WSDL", e); + } + + WSDLService[] services = wsdl.getServices(); + assertEquals("No of services", 1, services.length); + + WSDLEndpoint[] endpoints = services[0].getEndpoints(); + assertEquals("No of endpoints", 1, endpoints.length); + + String address = endpoints[0].getAddress(); + assertTrue("Expected Scheme '" + scheme + "'", address.startsWith(scheme + "://")); + assertTrue("Expected Port '" + port + "'", address.contains(":" + port + "/")); + } + + private void assertEquals(final String message, final int expected, final int actual) + { + if (expected != actual) + { + throw new JBWS1190Exception(message + " expected=" + expected + " actual=" + actual); + } + } + + private void assertTrue(final String message, final boolean value) + { + if (value == false) + { + throw new JBWS1190Exception(message); + } + } +} Property changes on: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190 (from rev 1273, branches/dlofthouse/JBWS-1190/src/test/java/org/jboss/test/ws/jaxws/jbws1190) Deleted: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/ConfidentialEndpoint.java =================================================================== --- branches/dlofthouse/JBWS-1190/src/test/java/org/jboss/test/ws/jaxws/jbws1190/ConfidentialEndpoint.java 2006-10-19 15:10:32 UTC (rev 1273) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/ConfidentialEndpoint.java 2006-10-22 18:57:24 UTC (rev 1281) @@ -1,42 +0,0 @@ -/* - * 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.test.ws.jaxws.jbws1190; - -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since 19-October-2006 - */ -@WebService(targetNamespace = "http://org.jboss/test/ws/jbws1190") -@SOAPBinding(style = SOAPBinding.Style.RPC) -public class ConfidentialEndpoint -{ - - public String helloWorld(final String message) - { - return message; - } - -} Copied: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/ConfidentialEndpoint.java (from rev 1273, branches/dlofthouse/JBWS-1190/src/test/java/org/jboss/test/ws/jaxws/jbws1190/ConfidentialEndpoint.java) Deleted: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190Exception.java =================================================================== --- branches/dlofthouse/JBWS-1190/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190Exception.java 2006-10-19 15:10:32 UTC (rev 1273) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190Exception.java 2006-10-22 18:57:24 UTC (rev 1281) @@ -1,52 +0,0 @@ -/* - * 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.test.ws.jaxws.jbws1190; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since 19-October-2006 - */ -public class JBWS1190Exception extends RuntimeException -{ - - public JBWS1190Exception() - { - super(); - } - - public JBWS1190Exception(final String message, final Throwable cause) - { - super(message, cause); - } - - public JBWS1190Exception(final String message) - { - super(message); - } - - public JBWS1190Exception(final Throwable cause) - { - super(cause); - } - -} Copied: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190Exception.java (from rev 1273, branches/dlofthouse/JBWS-1190/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190Exception.java) Deleted: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java =================================================================== --- branches/dlofthouse/JBWS-1190/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java 2006-10-19 15:10:32 UTC (rev 1273) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java 2006-10-22 18:57:24 UTC (rev 1281) @@ -1,85 +0,0 @@ -/* - * 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.test.ws.jaxws.jbws1190; - -import java.net.URL; - -import javax.xml.namespace.QName; -import javax.xml.rpc.Call; -import javax.xml.rpc.Service; - -import junit.framework.Test; - -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.ws.jaxrpc.ServiceFactoryImpl; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since 19-October-2006 - */ -public class JBWS1190TestCase extends JBossWSTest -{ - - private static final String ARCHIVE_NAME = "jaxws-jbws1190.war"; - - private static Service service; - - public static Test suite() - { - return JBossWSTestSetup.newTestSetup(JBWS1190TestCase.class, ARCHIVE_NAME); - } - - protected void setUp() throws Exception - { - if (service == null) - { - ServiceFactoryImpl factory = new ServiceFactoryImpl(); - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1190/TestEndpoint?wsdl"); - - QName qname = new QName("http://org.jboss/test/ws/jbws1190", "TestEndpointService"); - service = factory.createService(wsdlURL, qname); - } - } - - public void testTestEndpoint() throws Exception - { - QName portName = new QName("http://org.jboss/test/ws/jbws1190", "TestEndpointPort"); - QName methodName = new QName("http://org.jboss/test/ws/jbws1190", "testAddress"); - - Call call = service.createCall(portName); - call.setOperationName(methodName); - call.invoke(new Object[] { ARCHIVE_NAME, "TestEndpointService", "http", "8080" }); - } - - public void testConfidentialEndpoint() throws Exception - { - QName portName = new QName("http://org.jboss/test/ws/jbws1190", "TestEndpointPort"); - QName methodName = new QName("http://org.jboss/test/ws/jbws1190", "testAddress"); - - Call call = service.createCall(portName); - call.setOperationName(methodName); - call.invoke(new Object[] { ARCHIVE_NAME, "TestEndpointService", "https", "8484" }); - } - -} Copied: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java (from rev 1273, branches/dlofthouse/JBWS-1190/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java) =================================================================== --- branches/dlofthouse/JBWS-1190/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java 2006-10-19 15:10:32 UTC (rev 1273) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java 2006-10-22 18:57:24 UTC (rev 1281) @@ -0,0 +1,85 @@ +/* + * 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.test.ws.jaxws.jbws1190; + +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.rpc.Call; +import javax.xml.rpc.Service; + +import junit.framework.Test; + +import org.jboss.test.ws.JBossWSTest; +import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.ws.jaxrpc.ServiceFactoryImpl; + +/** + * + * @author darran.lofthouse(a)jboss.com + * @since 19-October-2006 + */ +public class JBWS1190TestCase extends JBossWSTest +{ + + private static final String ARCHIVE_NAME = "jaxws-jbws1190.war"; + + private static Service service; + + public static Test suite() + { + return JBossWSTestSetup.newTestSetup(JBWS1190TestCase.class, ARCHIVE_NAME); + } + + protected void setUp() throws Exception + { + if (service == null) + { + ServiceFactoryImpl factory = new ServiceFactoryImpl(); + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1190/TestEndpoint?wsdl"); + + QName qname = new QName("http://org.jboss/test/ws/jbws1190", "TestEndpointService"); + service = factory.createService(wsdlURL, qname); + } + } + + public void testTestEndpoint() throws Exception + { + QName portName = new QName("http://org.jboss/test/ws/jbws1190", "TestEndpointPort"); + QName methodName = new QName("http://org.jboss/test/ws/jbws1190", "testAddress"); + + Call call = service.createCall(portName); + call.setOperationName(methodName); + call.invoke(new Object[] { ARCHIVE_NAME, "TestEndpointService", "http", "8080" }); + } + + public void testConfidentialEndpoint() throws Exception + { + QName portName = new QName("http://org.jboss/test/ws/jbws1190", "TestEndpointPort"); + QName methodName = new QName("http://org.jboss/test/ws/jbws1190", "testAddress"); + + Call call = service.createCall(portName); + call.setOperationName(methodName); + call.invoke(new Object[] { ARCHIVE_NAME, "ConfidentialEndpointService", "https", "8443" }); + } + +} Deleted: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpoint.java =================================================================== --- branches/dlofthouse/JBWS-1190/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpoint.java 2006-10-19 15:10:32 UTC (rev 1273) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpoint.java 2006-10-22 18:57:24 UTC (rev 1281) @@ -1,43 +0,0 @@ -/* - * 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.test.ws.jaxws.jbws1190; - -import java.rmi.Remote; - -import javax.jws.WebMethod; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since 19-October-2006 - */ -@WebService(targetNamespace = "http://org.jboss/test/ws/jbws1190") -@SOAPBinding(style = SOAPBinding.Style.RPC) -public interface TestEndpoint extends Remote -{ - - @WebMethod - public void testAddress(final String archive, final String service, final String scheme, final String port); - -} Copied: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpoint.java (from rev 1273, branches/dlofthouse/JBWS-1190/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpoint.java) Deleted: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl.java =================================================================== --- branches/dlofthouse/JBWS-1190/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl.java 2006-10-19 15:10:32 UTC (rev 1273) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl.java 2006-10-22 18:57:24 UTC (rev 1281) @@ -1,105 +0,0 @@ -/* - * 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.test.ws.jaxws.jbws1190; - -import java.io.File; -import java.io.FilenameFilter; -import java.net.MalformedURLException; - -import javax.jws.WebService; - -import org.jboss.ws.metadata.wsdl.WSDLDefinitions; -import org.jboss.ws.metadata.wsdl.WSDLDefinitionsFactory; -import org.jboss.ws.metadata.wsdl.WSDLEndpoint; -import org.jboss.ws.metadata.wsdl.WSDLService; -import org.jboss.ws.server.ServerConfig; -import org.jboss.ws.server.ServerConfigFactory; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since 19-October-2006 - */ -@WebService(name = "TestEndpoint", endpointInterface = "org.jboss.test.ws.jaxws.jbws1190.TestEndpoint") -public class TestEndpointImpl implements TestEndpoint -{ - - public void testAddress(final String archive, final String service, final String scheme, final String port) - { - ServerConfigFactory serverConfigFactory = ServerConfigFactory.getInstance(); - ServerConfig serverConfig = serverConfigFactory.getServerConfig(); - - File dataDir = serverConfig.getServerDataDir(); - File wsdlDir = new File(dataDir.getAbsolutePath() + File.separator + "wsdl" + File.separator + archive); - - if (wsdlDir.exists() == false) - { - throw new JBWS1190Exception(wsdlDir.getAbsolutePath() + " does not exist."); - } - - File[] wsdls = wsdlDir.listFiles(new FilenameFilter() { - public boolean accept(File dir, String name) - { - return name.startsWith(service); - } - }); - - assertEquals("WSDL files found", 1, wsdls.length); - - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - WSDLDefinitions wsdl; - try - { - wsdl = factory.parse(wsdls[0].toURL()); - } - catch (MalformedURLException e) - { - throw new JBWS1190Exception("Error readin WSDL", e); - } - - WSDLService[] services = wsdl.getServices(); - assertEquals("No of services", 1, services.length); - - WSDLEndpoint[] endpoints = services[0].getEndpoints(); - assertEquals("No of endpoints", 1, endpoints.length); - - String address = endpoints[0].getAddress(); - assertTrue("Expected Scheme '" + scheme + "'", address.startsWith(scheme + "://")); - assertTrue("Expected Port '" + port + "'", address.contains(":" + port + "/")); - } - - private void assertEquals(final String message, final int expected, final int actual) - { - if (expected != actual) - { - throw new JBWS1190Exception(message + " expected=" + expected + " actual=" + actual); - } - } - - private void assertTrue(final String message, final boolean value) - { - if (value == false) - { - throw new JBWS1190Exception(message); - } - } -} Copied: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl.java (from rev 1273, branches/dlofthouse/JBWS-1190/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl.java) Added: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/META-INF/application-client.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/META-INF/application-client.xml 2006-10-22 13:22:00 UTC (rev 1280) +++ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/META-INF/application-client.xml 2006-10-22 18:57:24 UTC (rev 1281) @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<application-client xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd" + version="1.4"> + + <display-name>TestService</display-name> + + <service-ref> + <service-ref-name>service/TestService</service-ref-name> + <service-interface>javax.xml.rpc.Service</service-interface> + <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file> + <jaxrpc-mapping-file>META-INF/test-mapping.xml</jaxrpc-mapping-file> + <port-component-ref> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1190.TestEndpoint</service-endpoint-interface> + </port-component-ref> + </service-ref> + +</application-client> + Property changes on: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/META-INF/application-client.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/META-INF/jboss-client.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/META-INF/jboss-client.xml 2006-10-22 13:22:00 UTC (rev 1280) +++ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/META-INF/jboss-client.xml 2006-10-22 18:57:24 UTC (rev 1281) @@ -0,0 +1,15 @@ +<?xml version='1.0' encoding='UTF-8' ?> + +<!DOCTYPE jboss-client PUBLIC + "-//JBoss//DTD Application Client 4.0//EN" + "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> + +<jboss-client> + <jndi-name>jbossws-client</jndi-name> + + <service-ref> + <service-ref-name>service/TestService</service-ref-name> + <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-jbws1190/TestEndpoint?wsdl</wsdl-override> + </service-ref> + +</jboss-client> Property changes on: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/META-INF/jboss-client.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/confidential-mapping.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/confidential-mapping.xml 2006-10-22 13:22:00 UTC (rev 1280) +++ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/confidential-mapping.xml 2006-10-22 18:57:24 UTC (rev 1281) @@ -0,0 +1,37 @@ +<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'> + <package-mapping> + <package-type>org.jboss.test.ws.jaxrpc.jbws1190</package-type> + <namespaceURI>http://org.jboss.test.ws/jbws1190/types</namespaceURI> + </package-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jaxrpc.jbws1190.ConfidentialService</service-interface> + <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1190'>serviceNS:ConfidentialService</wsdl-service-name> + <port-mapping> + <port-name>ConfidentialEndpointPort</port-name> + <java-port-name>ConfidentialEndpointPort</java-port-name> + </port-mapping> + </service-interface-mapping> + <service-endpoint-interface-mapping> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1190.ConfidentialEndpoint</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1190'>portTypeNS:ConfidentialEndpoint</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1190'>bindingNS:ConfidentialEndpointBinding</wsdl-binding> + <service-endpoint-method-mapping> + <java-method-name>helloWorld</java-method-name> + <wsdl-operation>helloWorld</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>java.lang.String</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1190'>wsdlMsgNS:ConfidentialEndpoint_helloWorld</wsdl-message> + <wsdl-message-part-name>String_1</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>java.lang.String</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1190'>wsdlMsgNS:ConfidentialEndpoint_helloWorldResponse</wsdl-message> + <wsdl-message-part-name>result</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> + </service-endpoint-interface-mapping> +</java-wsdl-mapping> \ No newline at end of file Property changes on: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/confidential-mapping.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/test-mapping.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/test-mapping.xml 2006-10-22 13:22:00 UTC (rev 1280) +++ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/test-mapping.xml 2006-10-22 18:57:24 UTC (rev 1281) @@ -0,0 +1,59 @@ +<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'> + <package-mapping> + <package-type>org.jboss.test.ws.jaxrpc.jbws1190</package-type> + <namespaceURI>http://org.jboss.test.ws/jbws1190/types</namespaceURI> + </package-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jaxrpc.jbws1190.TestService</service-interface> + <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1190'>serviceNS:TestService</wsdl-service-name> + <port-mapping> + <port-name>TestEndpointPort</port-name> + <java-port-name>TestEndpointPort</java-port-name> + </port-mapping> + </service-interface-mapping> + <service-endpoint-interface-mapping> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1190.TestEndpoint</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1190'>portTypeNS:TestEndpoint</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1190'>bindingNS:TestEndpointBinding</wsdl-binding> + <service-endpoint-method-mapping> + <java-method-name>testAddress</java-method-name> + <wsdl-operation>testAddress</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>java.lang.String</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1190'>wsdlMsgNS:TestEndpoint_testAddress</wsdl-message> + <wsdl-message-part-name>String_1</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <method-param-parts-mapping> + <param-position>1</param-position> + <param-type>java.lang.String</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1190'>wsdlMsgNS:TestEndpoint_testAddress</wsdl-message> + <wsdl-message-part-name>String_2</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <method-param-parts-mapping> + <param-position>2</param-position> + <param-type>java.lang.String</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1190'>wsdlMsgNS:TestEndpoint_testAddress</wsdl-message> + <wsdl-message-part-name>String_3</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <method-param-parts-mapping> + <param-position>3</param-position> + <param-type>java.lang.String</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1190'>wsdlMsgNS:TestEndpoint_testAddress</wsdl-message> + <wsdl-message-part-name>String_4</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + </service-endpoint-method-mapping> + </service-endpoint-interface-mapping> +</java-wsdl-mapping> \ No newline at end of file Property changes on: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/test-mapping.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/web.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/web.xml 2006-10-22 13:22:00 UTC (rev 1280) +++ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/web.xml 2006-10-22 18:57:24 UTC (rev 1281) @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> + + <servlet> + <servlet-name>ConfidentialEndpoint</servlet-name> + <servlet-class>org.jboss.test.ws.jaxrpc.jbws1190.ConfidentialEndpoint</servlet-class> + </servlet> + + <servlet> + <servlet-name>TestEndpoint</servlet-name> + <servlet-class>org.jboss.test.ws.jaxrpc.jbws1190.TestEndpointImpl</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>ConfidentialEndpoint</servlet-name> + <url-pattern>/ConfidentialEndpoint</url-pattern> + </servlet-mapping> + + <servlet-mapping> + <servlet-name>TestEndpoint</servlet-name> + <url-pattern>/TestEndpoint</url-pattern> + </servlet-mapping> + + <security-constraint> + <web-resource-collection> + <web-resource-name>ConfidentialEndpoint</web-resource-name> + <url-pattern>/ConfidentialEndpoint</url-pattern> + </web-resource-collection> + <user-data-constraint> + <transport-guarantee>CONFIDENTIAL</transport-guarantee> + </user-data-constraint> + </security-constraint> +</web-app> \ No newline at end of file Property changes on: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/web.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/webservices.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/webservices.xml 2006-10-22 13:22:00 UTC (rev 1280) +++ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/webservices.xml 2006-10-22 18:57:24 UTC (rev 1281) @@ -0,0 +1,28 @@ +<webservices version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:impl='http://org.jboss.test.ws/jbws1190' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd'> + <webservice-description> + <webservice-description-name>TestService</webservice-description-name> + <wsdl-file>WEB-INF/wsdl/TestService.wsdl</wsdl-file> + <jaxrpc-mapping-file>WEB-INF/test-mapping.xml</jaxrpc-mapping-file> + <port-component> + <port-component-name>TestEndpointPort</port-component-name> + <wsdl-port>impl:TestEndpointPort</wsdl-port> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1190.TestEndpoint</service-endpoint-interface> + <service-impl-bean> + <servlet-link>TestEndpoint</servlet-link> + </service-impl-bean> + </port-component> + </webservice-description> + <webservice-description> + <webservice-description-name>ConfidentialService</webservice-description-name> + <wsdl-file>WEB-INF/wsdl/ConfidentialService.wsdl</wsdl-file> + <jaxrpc-mapping-file>WEB-INF/confidential-mapping.xml</jaxrpc-mapping-file> + <port-component> + <port-component-name>ConfidentialEndpointPort</port-component-name> + <wsdl-port>impl:ConfidentialEndpointPort</wsdl-port> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1190.ConfidentialEndpoint</service-endpoint-interface> + <service-impl-bean> + <servlet-link>ConfidentialEndpoint</servlet-link> + </service-impl-bean> + </port-component> + </webservice-description> +</webservices> \ No newline at end of file Property changes on: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/webservices.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/wsdl/ConfidentialService.wsdl =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/wsdl/ConfidentialService.wsdl 2006-10-22 13:22:00 UTC (rev 1280) +++ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/wsdl/ConfidentialService.wsdl 2006-10-22 18:57:24 UTC (rev 1281) @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='ConfidentialService' targetNamespace='http://org.jboss.test.ws/jbws1190' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1190' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types/> + <message name='ConfidentialEndpoint_helloWorld'> + <part name='String_1' type='xsd:string'/> + </message> + <message name='ConfidentialEndpoint_helloWorldResponse'> + <part name='result' type='xsd:string'/> + </message> + <portType name='ConfidentialEndpoint'> + <operation name='helloWorld' parameterOrder='String_1'> + <input message='tns:ConfidentialEndpoint_helloWorld'/> + <output message='tns:ConfidentialEndpoint_helloWorldResponse'/> + </operation> + </portType> + <binding name='ConfidentialEndpointBinding' type='tns:ConfidentialEndpoint'> + <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='helloWorld'> + <soap:operation soapAction=''/> + <input> + <soap:body namespace='http://org.jboss.test.ws/jbws1190' use='literal'/> + </input> + <output> + <soap:body namespace='http://org.jboss.test.ws/jbws1190' use='literal'/> + </output> + </operation> + </binding> + <service name='ConfidentialService'> + <port binding='tns:ConfidentialEndpointBinding' name='ConfidentialEndpointPort'> + <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> +</definitions> \ No newline at end of file Property changes on: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/wsdl/ConfidentialService.wsdl ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/wsdl/TestService.wsdl =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/wsdl/TestService.wsdl 2006-10-22 13:22:00 UTC (rev 1280) +++ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/wsdl/TestService.wsdl 2006-10-22 18:57:24 UTC (rev 1281) @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws1190' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1190' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types/> + <message name='TestEndpoint_testAddress'> + <part name='String_1' type='xsd:string'/> + <part name='String_2' type='xsd:string'/> + <part name='String_3' type='xsd:string'/> + <part name='String_4' type='xsd:string'/> + </message> + <message name='TestEndpoint_testAddressResponse'/> + <portType name='TestEndpoint'> + <operation name='testAddress' parameterOrder='String_1 String_2 String_3 String_4'> + <input message='tns:TestEndpoint_testAddress'/> + <output message='tns:TestEndpoint_testAddressResponse'/> + </operation> + </portType> + <binding name='TestEndpointBinding' type='tns:TestEndpoint'> + <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='testAddress'> + <soap:operation soapAction=''/> + <input> + <soap:body namespace='http://org.jboss.test.ws/jbws1190' use='literal'/> + </input> + <output> + <soap:body namespace='http://org.jboss.test.ws/jbws1190' use='literal'/> + </output> + </operation> + </binding> + <service name='TestService'> + <port binding='tns:TestEndpointBinding' name='TestEndpointPort'> + <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> +</definitions> \ No newline at end of file Property changes on: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/wsdl/TestService.wsdl ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/confidential-config.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/confidential-config.xml 2006-10-22 13:22:00 UTC (rev 1280) +++ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/confidential-config.xml 2006-10-22 18:57:24 UTC (rev 1281) @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + wstools -cp ../../../../../output/tests/classes -dest ./WEB-INF -config confidential-config.xml +--> + +<!-- Run wstools for test config first, then follow with confidential-config --> + +<configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> + <java-wsdl> + <service name="ConfidentialService" endpoint="org.jboss.test.ws.jaxrpc.jbws1190.ConfidentialEndpoint" style="rpc"> + </service> + <namespaces target-namespace="http://org.jboss.test.ws/jbws1190" type-namespace="http://org.jboss.test.ws/jbws1190/types"/> + <mapping file="confidential-mapping.xml"/> + <webservices servlet-link="ConfidentialEndpoint" append="true"/> + </java-wsdl> +</configuration> Property changes on: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/confidential-config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/test-config.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/test-config.xml 2006-10-22 13:22:00 UTC (rev 1280) +++ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/test-config.xml 2006-10-22 18:57:24 UTC (rev 1281) @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + wstools -cp ../../../../../output/tests/classes -dest ./WEB-INF -config test-config.xml +--> + +<!-- Run wstools for test config first, then follow with confidential-config --> + +<configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> + <java-wsdl> + <service name="TestService" endpoint="org.jboss.test.ws.jaxrpc.jbws1190.TestEndpoint" style="rpc"> + </service> + <namespaces target-namespace="http://org.jboss.test.ws/jbws1190" type-namespace="http://org.jboss.test.ws/jbws1190/types"/> + <mapping file="test-mapping.xml"/> + <webservices servlet-link="TestEndpoint"/> + </java-wsdl> +</configuration> Property changes on: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/test-config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: branches/jbossws-1.0/src/test/resources/jaxws/jbws1190 (from rev 1273, branches/dlofthouse/JBWS-1190/src/test/resources/jaxws/jbws1190) Copied: branches/jbossws-1.0/src/test/resources/jaxws/jbws1190/WEB-INF (from rev 1273, branches/dlofthouse/JBWS-1190/src/test/resources/jaxws/jbws1190/WEB-INF) Deleted: branches/jbossws-1.0/src/test/resources/jaxws/jbws1190/WEB-INF/web.xml =================================================================== --- branches/dlofthouse/JBWS-1190/src/test/resources/jaxws/jbws1190/WEB-INF/web.xml 2006-10-19 15:10:32 UTC (rev 1273) +++ branches/jbossws-1.0/src/test/resources/jaxws/jbws1190/WEB-INF/web.xml 2006-10-22 18:57:24 UTC (rev 1281) @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> - - <servlet> - <servlet-name>ConfidentialEndpoint</servlet-name> - <servlet-class>org.jboss.test.ws.jaxws.jbws1190.ConfidentialEndpoint</servlet-class> - </servlet> - - <servlet> - <servlet-name>TestEndpoint</servlet-name> - <servlet-class>org.jboss.test.ws.jaxws.jbws1190.TestEndpointImpl</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>ConfidentialEndpoint</servlet-name> - <url-pattern>/ConfidentialEndpoint</url-pattern> - </servlet-mapping> - - <servlet-mapping> - <servlet-name>TestEndpoint</servlet-name> - <url-pattern>/TestEndpoint</url-pattern> - </servlet-mapping> - - <security-constraint> - <web-resource-collection> - <web-resource-name>ConfidentialEndpoint</web-resource-name> - <url-pattern>/ConfidentialEndpoint</url-pattern> - </web-resource-collection> - <user-data-constraint> - <transport-guarantee>CONFIDENTIAL</transport-guarantee> - </user-data-constraint> - </security-constraint> -</web-app> \ No newline at end of file Copied: branches/jbossws-1.0/src/test/resources/jaxws/jbws1190/WEB-INF/web.xml (from rev 1273, branches/dlofthouse/JBWS-1190/src/test/resources/jaxws/jbws1190/WEB-INF/web.xml)