[jboss-cvs] JBossAS SVN: r112049 - in trunk: webservices/src/main/java/org/jboss/webservices/integration/injection and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: richard.opalka at jboss.com
Date: 2011-08-13 20:27:16 -0400 (Sat, 13 Aug 2011)
New Revision: 112049

Modified:
   trunk/component-matrix/pom.xml
   trunk/webservices/src/main/java/org/jboss/webservices/integration/injection/ServiceRefResourceProvider.java
Log:
[JBWS-3337][JBWS-3338] fixing singleton de/serialization & @Addressing annotation propagation

Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2011-08-13 23:40:53 UTC (rev 112048)
+++ trunk/component-matrix/pom.xml	2011-08-14 00:27:16 UTC (rev 112049)
@@ -55,9 +55,9 @@
     <version.jboss.jbossts>4.14.0.Final</version.jboss.jbossts>
     <version.jboss.jbossws-native>3.4.1.GA</version.jboss.jbossws-native>
     <version.jboss.jbossws-cxf>3.4.1.GA</version.jboss.jbossws-cxf>
-    <version.jboss.jbossws-common>1.4.1.GA</version.jboss.jbossws-common>
+    <version.jboss.jbossws-common>1.4.1.SP1</version.jboss.jbossws-common>
     <version.jboss.jbossws-framework>3.4.1.GA</version.jboss.jbossws-framework>
-    <version.jboss.jbossws-spi>1.4.1.GA</version.jboss.jbossws-spi>
+    <version.jboss.jbossws-spi>1.4.1.SP1</version.jboss.jbossws-spi>
     <version.jboss.jms-integration-tests>1.0.1.GA</version.jboss.jms-integration-tests>
     <version.jboss.jsf-deployer>1.0.3</version.jboss.jsf-deployer>
     <version.jboss.web>3.0.0-CR2</version.jboss.web>
@@ -115,7 +115,7 @@
     <version.org.jboss.mc-int>2.2.0.GA</version.org.jboss.mc-int>
     <version.org.jboss.mdr>2.2.0.SP1</version.org.jboss.mdr>
     <version.org.jboss.metadata.client>2.0.0.Alpha2</version.org.jboss.metadata.client>
-    <version.org.jboss.metadata.common>2.0.0.Alpha24</version.org.jboss.metadata.common>
+    <version.org.jboss.metadata.common>2.0.0.Alpha25</version.org.jboss.metadata.common>
     <version.org.jboss.metadata.ear>2.0.0.Alpha4</version.org.jboss.metadata.ear>
     <version.org.jboss.metadata.ejb>2.0.0-alpha-30</version.org.jboss.metadata.ejb>
     <version.org.jboss.metadata.rar>2.0.0.Alpha</version.org.jboss.metadata.rar>

Modified: trunk/webservices/src/main/java/org/jboss/webservices/integration/injection/ServiceRefResourceProvider.java
===================================================================
--- trunk/webservices/src/main/java/org/jboss/webservices/integration/injection/ServiceRefResourceProvider.java	2011-08-13 23:40:53 UTC (rev 112048)
+++ trunk/webservices/src/main/java/org/jboss/webservices/integration/injection/ServiceRefResourceProvider.java	2011-08-14 00:27:16 UTC (rev 112049)
@@ -384,13 +384,18 @@
       final Addressing addressingSBMD = portComponentSBMD.getAddressing();
       if (addressingSBMD != null)
       {
+    	 portComponentUMDM.setAddressingAnnotationSpecified(true);
          portComponentUMDM.setAddressingEnabled(addressingSBMD.isEnabled());
          portComponentUMDM.setAddressingRequired(addressingSBMD.isRequired());
          portComponentUMDM.setAddressingResponses(addressingSBMD.getResponses());
       }
 
       // propagate respect binding properties
-      portComponentUMDM.setRespectBindingEnabled(portComponentSBMD.isRespectBindingEnabled());
+      if (portComponentSBMD.isRespectBindingEnabled())
+      {
+    	 portComponentUMDM.setRespectBindingAnnotationSpecified(true);
+         portComponentUMDM.setRespectBindingEnabled(true);
+      }
 
       // propagate link
       portComponentUMDM.setPortComponentLink(portComponentSBMD.getLink());