[jbossws-commits] JBossWS SVN: r11694 - stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws.
Author: darran.lofthouse(a)jboss.com
Date: 2010-02-26 09:59:58 -0500 (Fri, 26 Feb 2010)
New Revision: 11694
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java
Log:
[JBPAPP-3803] Inconsistent / Incomplete handling of CONFIDENTIAL transport-guarantee
defined in jboss.xml compared to @WebContext annotation.
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java
===================================================================
---
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java 2010-02-26
14:46:53 UTC (rev 11693)
+++
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java 2010-02-26
14:59:58 UTC (rev 11694)
@@ -33,6 +33,8 @@
import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData;
import org.jboss.wsf.spi.metadata.j2ee.JSEArchiveMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.EJBSecurityMetaData;
/**
* Builds ServiceEndpointMetaData for a JAX-WS endpoint.
@@ -87,6 +89,14 @@
configName = ejbMetaData.getConfigName();
if (ejbMetaData.getConfigFile() != null)
configFile = ejbMetaData.getConfigFile();
+
+ EJBMetaData ejbMD = ejbMetaData.getBeanByEjbName(linkName);
+ EJBSecurityMetaData ejbSecurityMD = ejbMD != null ? ejbMD.getSecurityMetaData()
: null;
+
+ if (ejbSecurityMD != null)
+ {
+ sepMetaData.setTransportGuarantee(ejbSecurityMD.getTransportGuarantee());
+ }
}
if (configName != null || configFile != null)
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java
===================================================================
---
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2010-02-26
14:46:53 UTC (rev 11693)
+++
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2010-02-26
14:59:58 UTC (rev 11694)
@@ -56,6 +56,7 @@
import org.jboss.wsf.common.IOUtils;
import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainsMetaData;
@@ -144,8 +145,9 @@
// Process web methods
processWebMethods(sepMetaData, seiClass);
- // Init the transport guarantee
- initTransportGuaranteeJSE(dep, sepMetaData, linkName);
+ // Init the transport guarantee for JSE deployments.
+ if (dep.getType() == DeploymentType.JAXWS_JSE)
+ initTransportGuaranteeJSE(dep, sepMetaData, linkName);
// Initialize types
createJAXBContext(sepMetaData);