Author: thomas.diesler(a)jboss.com Date: 2006-11-23 04:58:33 -0500 (Thu, 23 Nov 2006) New Revision: 1517 Modified: trunk/.classpath trunk/src/ant/build-thirdparty.xml trunk/src/main/java/org/jboss/ws/metadata/ClientEndpointMetaData.java trunk/src/main/java/org/jboss/ws/metadata/EndpointMetaData.java trunk/src/main/java/org/jboss/ws/metadata/ServerEndpointMetaData.java trunk/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java trunk/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java Log: [JBWS-1190] WSDL generated for JSR-181 POJO does not take 'transport-guarantee' in web.xml into account Modified: trunk/.classpath =================================================================== --- trunk/.classpath 2006-11-23 07:29:30 UTC (rev 1516) +++ trunk/.classpath 2006-11-23 09:58:33 UTC (rev 1517) @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry excluding="org/jboss/ws/integration/jboss50/ServiceRefHandler.java" kind="src" path="src/main/java"/> + <classpathentry kind="src" path="output/tests/wstools/java"/> <classpathentry excluding="org/jboss/test/ws/interop/" kind="src" path="src/test/java"/> <classpathentry kind="lib" path="thirdparty/activation.jar"/> <classpathentry kind="lib" path="thirdparty/mailapi.jar"/> Modified: trunk/src/ant/build-thirdparty.xml =================================================================== --- trunk/src/ant/build-thirdparty.xml 2006-11-23 07:29:30 UTC (rev 1516) +++ trunk/src/ant/build-thirdparty.xml 2006-11-23 09:58:33 UTC (rev 1517) @@ -109,7 +109,7 @@ <pathelement location="${jboss.lib}/jboss-mbeans.jar"/> <pathelement location="${jboss.lib}/jboss-system.jar"/> <pathelement location="${jboss.server.lib}/jboss.jar"/> - <pathelement location="${jboss.client}/jbosssx-client.jar"/> + <pathelement location="${jboss.server.lib}/jboss-security-spi.jar"/> <pathelement location="${jboss.server.deployers}/jboss-aop-jboss5.deployer/jboss-aop-jdk50.jar"/> <pathelement location="${jboss.server.deployers}/jboss-aop-jboss5.deployer/jboss-aspect-library-jdk50.jar"/> </path> Modified: trunk/src/main/java/org/jboss/ws/metadata/ClientEndpointMetaData.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/ClientEndpointMetaData.java 2006-11-23 07:29:30 UTC (rev 1516) +++ trunk/src/main/java/org/jboss/ws/metadata/ClientEndpointMetaData.java 2006-11-23 09:58:33 UTC (rev 1517) @@ -161,7 +161,6 @@ buffer.append("\n configFile=" + getConfigFile()); buffer.append("\n configName=" + getConfigName()); buffer.append("\n authMethod=" + getAuthMethod()); - buffer.append("\n transportGuarantee=" + getTransportGuarantee()); buffer.append("\n properties=" + getProperties()); for (OperationMetaData opMetaData : getOperations()) Modified: trunk/src/main/java/org/jboss/ws/metadata/EndpointMetaData.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/EndpointMetaData.java 2006-11-23 07:29:30 UTC (rev 1516) +++ trunk/src/main/java/org/jboss/ws/metadata/EndpointMetaData.java 2006-11-23 09:58:33 UTC (rev 1517) @@ -93,8 +93,6 @@ private Class seiClass; // The optional authentication method private String authMethod; - // The optional transport guarantee - private String transportGuarantee; // Arbitrary properties given by <call-property> private Properties properties; // The SOAPBinding style @@ -325,16 +323,6 @@ this.authMethod = authMethod; } - public String getTransportGuarantee() - { - return transportGuarantee; - } - - public void setTransportGuarantee(String transportGuarantee) - { - this.transportGuarantee = transportGuarantee; - } - public Properties getProperties() { return properties; Modified: trunk/src/main/java/org/jboss/ws/metadata/ServerEndpointMetaData.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/ServerEndpointMetaData.java 2006-11-23 07:29:30 UTC (rev 1516) +++ trunk/src/main/java/org/jboss/ws/metadata/ServerEndpointMetaData.java 2006-11-23 09:58:33 UTC (rev 1517) @@ -68,6 +68,8 @@ private String[] virtualHosts; // The HTTP url parttern private String urlPattern; + // The optional transport guarantee + private String transportGuarantee; // The bean that registers with the ServiceEndpointManager private String managedEndpointBean = ServiceEndpoint.class.getName(); @@ -164,6 +166,16 @@ this.urlPattern = urlPattern; } + public String getTransportGuarantee() + { + return transportGuarantee; + } + + public void setTransportGuarantee(String transportGuarantee) + { + this.transportGuarantee = transportGuarantee; + } + public String getManagedEndpointBean() { return managedEndpointBean; Modified: trunk/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2006-11-23 07:29:30 UTC (rev 1516) +++ trunk/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2006-11-23 09:58:33 UTC (rev 1517) @@ -294,10 +294,10 @@ /** Replace the address locations for a given port component. */ - public static void replaceAddressLocation(ServerEndpointMetaData epMetaData) + public static void replaceAddressLocation(ServerEndpointMetaData sepMetaData) { - WSDLDefinitions wsdlDefinitions = epMetaData.getServiceMetaData().getWsdlDefinitions(); - QName portName = epMetaData.getQName(); + WSDLDefinitions wsdlDefinitions = sepMetaData.getServiceMetaData().getWsdlDefinitions(); + QName portName = sepMetaData.getQName(); boolean endpointFound = false; for (WSDLService wsdlService : wsdlDefinitions.getServices()) @@ -312,11 +312,11 @@ String orgAddress = wsdlEndpoint.getAddress(); String uriScheme = getUriScheme(orgAddress); - String transportGuarantee = epMetaData.getTransportGuarantee(); + String transportGuarantee = sepMetaData.getTransportGuarantee(); if ("CONFIDENTIAL".equals(transportGuarantee)) uriScheme = "https"; - String servicePath = epMetaData.getContextRoot() + epMetaData.getURLPattern(); + String servicePath = sepMetaData.getContextRoot() + sepMetaData.getURLPattern(); String serviceEndpointURL = getServiceEndpointAddress(uriScheme, servicePath); ServiceEndpointManagerFactory factory = ServiceEndpointManagerFactory.getInstance(); @@ -327,7 +327,7 @@ { log.debug("Replace service endpoint address '" + orgAddress + "' with '" + serviceEndpointURL + "'"); wsdlEndpoint.setAddress(serviceEndpointURL); - epMetaData.setEndpointAddress(serviceEndpointURL); + sepMetaData.setEndpointAddress(serviceEndpointURL); // modify the wsdl-1.1 definition if (wsdlDefinitions.getWsdlOneOneDefinition() != null) @@ -338,7 +338,7 @@ log.debug("Don't replace service endpoint address '" + orgAddress + "'"); try { - epMetaData.setEndpointAddress(new URL(orgAddress).toExternalForm()); + sepMetaData.setEndpointAddress(new URL(orgAddress).toExternalForm()); } catch (MalformedURLException e) { Modified: trunk/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2006-11-23 07:29:30 UTC (rev 1516) +++ trunk/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2006-11-23 09:58:33 UTC (rev 1517) @@ -271,10 +271,10 @@ /** * Read the transport guarantee from web.xml */ - protected void initTransportGuaranteeJSE(UnifiedDeploymentInfo udi, EndpointMetaData epMetaData, String servletLink) throws IOException + protected void initTransportGuaranteeJSE(UnifiedDeploymentInfo udi, ServerEndpointMetaData sepMetaData, String servletLink) throws IOException { UnifiedWebMetaData webMetaData = (UnifiedWebMetaData)udi.metaData; - epMetaData.setTransportGuarantee(getTransportGuarantee(webMetaData, servletLink)); + sepMetaData.setTransportGuarantee(getTransportGuarantee(webMetaData, servletLink)); }