12:10 p.m.
Author: jim.ma
Date: 2013-08-30 06:10:53 -0400 (Fri, 30 Aug 2013)
New Revision: 17899
Added:
container/jboss71/branches/jbossws-jboss713/server-integration/src/main/java/org/jboss/as/webservices/deployers/UnifiedServiceRefDeploymentAspect.java
Modified:
container/jboss71/branches/jbossws-jboss713/server-integration/src/main/java/org/jboss/as/webservices/webserviceref/WSReferences.java
container/jboss71/branches/jbossws-jboss713/server-integration/src/main/resources/META-INF/stack-agnostic-deployment-aspects.xml
Log:
[JBWS-3679]:Back port fix to AS713
Added:
container/jboss71/branches/jbossws-jboss713/server-integration/src/main/java/org/jboss/as/webservices/deployers/UnifiedServiceRefDeploymentAspect.java
===================================================================
---
container/jboss71/branches/jbossws-jboss713/server-integration/src/main/java/org/jboss/as/webservices/deployers/UnifiedServiceRefDeploymentAspect.java
(rev 0)
+++
container/jboss71/branches/jbossws-jboss713/server-integration/src/main/java/org/jboss/as/webservices/deployers/UnifiedServiceRefDeploymentAspect.java 2013-08-30
10:10:53 UTC (rev 17899)
@@ -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.getRequiredAttachment;
+
+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.UnifiedServiceRefMetaData;
+
+/**
+ * DeploymentAspect to set deployed ServiceName and address map in
unifiedServiceRefMetaData
+ * @author <a href="mailto:ema@redhat.com">Jim Ma</a>
+ */
+public class UnifiedServiceRefDeploymentAspect extends AbstractDeploymentAspect {
+ @Override
+ public void start(final Deployment dep) {
+ final DeploymentUnit unit = getRequiredAttachment(dep, DeploymentUnit.class);
+ WSReferences wsRefRegistry = ASHelper.getWSRefRegistry(unit);
+ Object obj = dep.getProperty("ServiceAddressMap");
+ if(obj != null) {
+ @SuppressWarnings("unchecked")
+ Map<QName, String> deployedPortsAddress = (Map<QName,
String>)obj;
+ for (UnifiedServiceRefMetaData metaData :
wsRefRegistry.getUnifiedServiceRefMetaDatas()) {
+ metaData.addDeployedServiceAddresses(deployedPortsAddress);
+ }
+ }
+ }
+}
Property changes on:
container/jboss71/branches/jbossws-jboss713/server-integration/src/main/java/org/jboss/as/webservices/deployers/UnifiedServiceRefDeploymentAspect.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Modified:
container/jboss71/branches/jbossws-jboss713/server-integration/src/main/java/org/jboss/as/webservices/webserviceref/WSReferences.java
===================================================================
---
container/jboss71/branches/jbossws-jboss713/server-integration/src/main/java/org/jboss/as/webservices/webserviceref/WSReferences.java 2013-08-30
10:10:38 UTC (rev 17898)
+++
container/jboss71/branches/jbossws-jboss713/server-integration/src/main/java/org/jboss/as/webservices/webserviceref/WSReferences.java 2013-08-30
10:10:53 UTC (rev 17899)
@@ -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> getUnifiedServiceRefMetaDatas() {
+ return Collections.unmodifiableCollection(references.values());
+ }
public void clear() {
references.clear();
Modified:
container/jboss71/branches/jbossws-jboss713/server-integration/src/main/resources/META-INF/stack-agnostic-deployment-aspects.xml
===================================================================
---
container/jboss71/branches/jbossws-jboss713/server-integration/src/main/resources/META-INF/stack-agnostic-deployment-aspects.xml 2013-08-30
10:10:38 UTC (rev 17898)
+++
container/jboss71/branches/jbossws-jboss713/server-integration/src/main/resources/META-INF/stack-agnostic-deployment-aspects.xml 2013-08-30
10:10:53 UTC (rev 17899)
@@ -37,7 +37,12 @@
<property name="requires"
class="java.lang.String">URLPattern</property>
<property name="provides"
class="java.lang.String">EndpointAddress</property>
</deploymentAspect>
-
+
+ <deploymentAspect
class="org.jboss.as.webservices.deployers.UnifiedServiceRefDeploymentAspect">
+ <property name="requires"
class="java.lang.String">StackDescriptor</property>
+ <property name="provides"
class="java.lang.String">UnifiedServiceRefMetaData</property>
+ </deploymentAspect>
+
<deploymentAspect
class="org.jboss.as.webservices.deployers.EndpointServiceDeploymentAspect">
<property name="provides"
class="java.lang.String">LifecycleHandler</property>
<property name="last"
class="boolean">true</property>