From jbossws-commits at lists.jboss.org Fri Aug 30 06:11:10 2013
Content-Type: multipart/mixed; boundary="===============8301773702721816780=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r17900 - in
 container/jboss72/branches/jbossws-jboss720/server-integration/src/main:
 java/org/jboss/as/webservices/webserviceref and 1 other directories.
Date: Fri, 30 Aug 2013 06:11:09 -0400
Message-ID: <201308301011.r7UAB96W021277@svn01.web.mwc.hst.phx2.redhat.com>

--===============8301773702721816780==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: jim.ma
Date: 2013-08-30 06:11:09 -0400 (Fri, 30 Aug 2013)
New Revision: 17900

Added:
   container/jboss72/branches/jbossws-jboss720/server-integration/src/main/=
java/org/jboss/as/webservices/deployers/UnifiedServiceRefDeploymentAspect.j=
ava
Modified:
   container/jboss72/branches/jbossws-jboss720/server-integration/src/main/=
java/org/jboss/as/webservices/webserviceref/WSReferences.java
   container/jboss72/branches/jbossws-jboss720/server-integration/src/main/=
resources/META-INF/stack-agnostic-deployment-aspects.xml
Log:
[JBWS-3679]:Back port fix to AS720

Added: container/jboss72/branches/jbossws-jboss720/server-integration/src/m=
ain/java/org/jboss/as/webservices/deployers/UnifiedServiceRefDeploymentAspe=
ct.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- container/jboss72/branches/jbossws-jboss720/server-integration/src/main=
/java/org/jboss/as/webservices/deployers/UnifiedServiceRefDeploymentAspect.=
java	                        (rev 0)
+++ container/jboss72/branches/jbossws-jboss720/server-integration/src/main=
/java/org/jboss/as/webservices/deployers/UnifiedServiceRefDeploymentAspect.=
java	2013-08-30 10:11:09 UTC (rev 17900)
@@ -0,0 +1,55 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2011, Red Hat 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.as.webservices.deployers;
+
+import static org.jboss.ws.common.integration.WSHelper.getRequiredAttachme=
nt;
+
+import java.util.Map;
+
+import javax.xml.namespace.QName;
+
+import org.jboss.as.server.deployment.DeploymentUnit;
+import org.jboss.as.webservices.util.ASHelper;
+import org.jboss.as.webservices.webserviceref.WSReferences;
+import org.jboss.ws.common.integration.AbstractDeploymentAspect;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaDat=
a;
+
+/**
+ * DeploymentAspect to set deployed ServiceName and address map in unified=
ServiceRefMetaData =

+ * @author <a href=3D"mailto:ema(a)redhat.com">Jim Ma</a>
+ */
+public class UnifiedServiceRefDeploymentAspect extends AbstractDeploymentA=
spect {
+    @Override
+    public void start(final Deployment dep) {
+        final DeploymentUnit unit =3D getRequiredAttachment(dep, Deploymen=
tUnit.class);
+        WSReferences wsRefRegistry =3D ASHelper.getWSRefRegistry(unit);
+        Object obj =3D dep.getProperty("ServiceAddressMap");
+        if(obj !=3D null) {
+            @SuppressWarnings("unchecked")
+            Map<QName, String> deployedPortsAddress =3D (Map<QName, String=
>)obj;
+            for (UnifiedServiceRefMetaData metaData : wsRefRegistry.getUni=
fiedServiceRefMetaDatas()) {
+                 metaData.addDeployedServiceAddresses(deployedPortsAddress=
);
+            }
+        }
+    }
+}


Property changes on: container/jboss72/branches/jbossws-jboss720/server-int=
egration/src/main/java/org/jboss/as/webservices/deployers/UnifiedServiceRef=
DeploymentAspect.java
___________________________________________________________________
Added: svn:keywords
   + Rev Date
Added: svn:eol-style
   + native

Modified: container/jboss72/branches/jbossws-jboss720/server-integration/sr=
c/main/java/org/jboss/as/webservices/webserviceref/WSReferences.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- container/jboss72/branches/jbossws-jboss720/server-integration/src/main=
/java/org/jboss/as/webservices/webserviceref/WSReferences.java	2013-08-30 1=
0:10:53 UTC (rev 17899)
+++ container/jboss72/branches/jbossws-jboss720/server-integration/src/main=
/java/org/jboss/as/webservices/webserviceref/WSReferences.java	2013-08-30 1=
0:11:09 UTC (rev 17900)
@@ -22,6 +22,8 @@
 =

 package org.jboss.as.webservices.webserviceref;
 =

+import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 =

@@ -52,6 +54,10 @@
     public UnifiedServiceRefMetaData get(final String refName) {
         return references.get(refName);
     }
+    =

+    public Collection<UnifiedServiceRefMetaData> getUnifiedServiceRefMetaD=
atas() {
+       return Collections.unmodifiableCollection(references.values());
+    }
 =

     public void clear() {
         references.clear();

Modified: container/jboss72/branches/jbossws-jboss720/server-integration/sr=
c/main/resources/META-INF/stack-agnostic-deployment-aspects.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- container/jboss72/branches/jbossws-jboss720/server-integration/src/main=
/resources/META-INF/stack-agnostic-deployment-aspects.xml	2013-08-30 10:10:=
53 UTC (rev 17899)
+++ container/jboss72/branches/jbossws-jboss720/server-integration/src/main=
/resources/META-INF/stack-agnostic-deployment-aspects.xml	2013-08-30 10:11:=
09 UTC (rev 17900)
@@ -37,6 +37,11 @@
     <property name=3D"requires" class=3D"java.lang.String">URLPattern</pro=
perty>
     <property name=3D"provides" class=3D"java.lang.String">EndpointAddress=
</property>
   </deploymentAspect>
+  =

+  <deploymentAspect class=3D"org.jboss.as.webservices.deployers.UnifiedSer=
viceRefDeploymentAspect">
+    <property name=3D"requires" class=3D"java.lang.String">StackDescriptor=
</property>
+    <property name=3D"provides" class=3D"java.lang.String">UnifiedServiceR=
efMetaData</property>
+  </deploymentAspect> =

 =

   <deploymentAspect class=3D"org.jboss.as.webservices.deployers.EndpointSe=
rviceDeploymentAspect">
     <property name=3D"provides" class=3D"java.lang.String">LifecycleHandle=
r</property>


--===============8301773702721816780==--