tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r591884 - in /openejb/trunk/openejb3: assembly/openejb-tomcat/src/main/java/org/apache/openejb/tomcat/ container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ container/openejb-core/src/main/java/org/apache/openejb/config...
Date Mon, 05 Nov 2007 05:49:03 GMT
Author: dain
Date: Sun Nov  4 21:48:59 2007
New Revision: 591884

URL: http://svn.apache.org/viewvc?rev=591884&view=rev
Log:
Added portId to webservice ref resolution logic

Modified:
    openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/java/org/apache/openejb/tomcat/NamingUtil.java
    openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/java/org/apache/openejb/tomcat/TomcatJndiBuilder.java
    openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/java/org/apache/openejb/tomcat/WsFactory.java
    openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java
    openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/PortInfo.java
    openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ServiceReferenceInfo.java
    openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/WsBuilder.java
    openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
    openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java
    openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/SunConversion.java
    openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/WsDeployer.java
    openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JaxWsServiceReference.java
    openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/PortData.java
    openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/ServiceRefData.java
    openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/WsdlRepo.java
    openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/WsdlRepoImpl.java
    openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/SunConversionTest.java
    openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/PortComponent.java
    openejb/trunk/openejb3/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/JndiRequestHandler.java
    openejb/trunk/openejb3/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsService.java

Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/java/org/apache/openejb/tomcat/NamingUtil.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/java/org/apache/openejb/tomcat/NamingUtil.java?rev=591884&r1=591883&r2=591884&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/java/org/apache/openejb/tomcat/NamingUtil.java (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/java/org/apache/openejb/tomcat/NamingUtil.java Sun Nov  4 21:48:59 2007
@@ -42,7 +42,7 @@
     public static final String WEB_SERVICE_CLASS = "webserviceclass";
     public static final String WEB_SERVICE_QNAME = "webserviceqname";
     public static final String WSDL_URL = "wsdlurl";
-    public static final String WSDL_REPO_URI = "wsdlrepouri";
+    public static final String PORT_ID = "portid";
 
     private static final AtomicInteger id = new AtomicInteger(31);
     private static final Map<String,Object> registry = new HashMap<String,Object>();

Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/java/org/apache/openejb/tomcat/TomcatJndiBuilder.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/java/org/apache/openejb/tomcat/TomcatJndiBuilder.java?rev=591884&r1=591883&r2=591884&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/java/org/apache/openejb/tomcat/TomcatJndiBuilder.java (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/java/org/apache/openejb/tomcat/TomcatJndiBuilder.java Sun Nov  4 21:48:59 2007
@@ -17,7 +17,7 @@
  */
 package org.apache.openejb.tomcat;
 
-import static org.apache.openejb.tomcat.NamingUtil.WSDL_REPO_URI;
+import static org.apache.openejb.tomcat.NamingUtil.PORT_ID;
 import org.apache.catalina.core.NamingContextListener;
 import org.apache.catalina.core.StandardContext;
 import org.apache.catalina.deploy.ContextEjb;
@@ -439,8 +439,8 @@
                 resource.setProperty(WSDL_URL, wsdlURL.toString());
             }
 
-            if (ref.wsdlRepoUri != null) {
-                resource.setProperty(WSDL_REPO_URI, ref.wsdlRepoUri);
+            if (ref.portId != null) {
+                resource.setProperty(PORT_ID, ref.portId);
             }
 
             // add port refs

Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/java/org/apache/openejb/tomcat/WsFactory.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/java/org/apache/openejb/tomcat/WsFactory.java?rev=591884&r1=591883&r2=591884&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/java/org/apache/openejb/tomcat/WsFactory.java (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/java/org/apache/openejb/tomcat/WsFactory.java Sun Nov  4 21:48:59 2007
@@ -17,7 +17,7 @@
  */
 package org.apache.openejb.tomcat;
 
-import static org.apache.openejb.tomcat.NamingUtil.WSDL_REPO_URI;
+import static org.apache.openejb.tomcat.NamingUtil.PORT_ID;
 import org.apache.naming.ResourceRef;
 import org.apache.openejb.Injection;
 import org.apache.openejb.core.ivm.naming.JaxWsServiceReference;
@@ -86,10 +86,10 @@
                 wsdlUrl = new URL(getProperty(ref, WSDL_URL));
             }
 
-            // WSDL URI
-            String wsdlRepoUri = null;
-            if (wsdlRepoUri == null) {
-                wsdlRepoUri = getProperty(ref, WSDL_REPO_URI);
+            // PORT ID
+            String portId = null;
+            if (portId == null) {
+                portId = getProperty(ref, PORT_ID);
             }
 
             // port refs
@@ -102,7 +102,7 @@
             List<Injection> injections = getStaticValue(ref, "injections");
             if (injections == null) injections = Collections.emptyList();
 
-            JaxWsServiceReference serviceReference = new JaxWsServiceReference(serviceClass, referenceClass, wsdlUrl, serviceQName, wsdlRepoUri, portRefs, handlerChains, injections);
+            JaxWsServiceReference serviceReference = new JaxWsServiceReference(portId, serviceClass, referenceClass, wsdlUrl, serviceQName, portRefs, handlerChains, injections);
             value = serviceReference.getObject();
         }
 

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java?rev=591884&r1=591883&r2=591884&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java Sun Nov  4 21:48:59 2007
@@ -413,10 +413,10 @@
             }
 
             if (!client) {
-                Reference reference = new JaxWsServiceReference(serviceClass, referenceClass, wsdlUrl, referenceInfo.serviceQName, referenceInfo.wsdlRepoUri, portRefs, handlerChains, injections);
+                Reference reference = new JaxWsServiceReference(referenceInfo.portId, serviceClass, referenceClass, wsdlUrl, referenceInfo.serviceQName, portRefs, handlerChains, injections);
                 bindings.put(normalize(referenceInfo.referenceName), reference);
             } else {
-                ServiceRefData serviceRefData = new ServiceRefData(serviceClass, referenceClass, wsdlUrl, referenceInfo.serviceQName, referenceInfo.wsdlRepoUri, handlerChains, portRefs);
+                ServiceRefData serviceRefData = new ServiceRefData(referenceInfo.portId, serviceClass, referenceClass, wsdlUrl, referenceInfo.serviceQName, handlerChains, portRefs);
                 bindings.put(normalize(referenceInfo.referenceName), serviceRefData);
             }
         }

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/PortInfo.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/PortInfo.java?rev=591884&r1=591883&r2=591884&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/PortInfo.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/PortInfo.java Sun Nov  4 21:48:59 2007
@@ -22,6 +22,7 @@
 import java.util.ArrayList;
 
 public class PortInfo extends InfoObject {
+    public String portId;
     public String serviceName;
     public String portName;
     public String seiInterfaceName;
@@ -33,5 +34,4 @@
     public QName wsdlPort;
     public QName wsdlService;
     public String location;
-    public String wsdlPublishLocation;
 }

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ServiceReferenceInfo.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ServiceReferenceInfo.java?rev=591884&r1=591883&r2=591884&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ServiceReferenceInfo.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ServiceReferenceInfo.java Sun Nov  4 21:48:59 2007
@@ -27,12 +27,12 @@
 
     public String referenceName;
 
+    public String portId;
     public QName serviceQName;
     public String wsdlFile;
     public String jaxrpcMappingFile;
     public String referenceType;
     public String serviceType;
-    public String wsdlRepoUri;
     public final List<HandlerChainInfo> handlerChains = new ArrayList<HandlerChainInfo>();
     public final List<PortRefInfo> portRefs =new ArrayList<PortRefInfo>();
     

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/WsBuilder.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/WsBuilder.java?rev=591884&r1=591883&r2=591884&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/WsBuilder.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/WsBuilder.java Sun Nov  4 21:48:59 2007
@@ -33,6 +33,7 @@
 public class WsBuilder {
     public static PortData toPortData(PortInfo port, Collection<Injection> injections, URL baseUrl, ClassLoader classLoader) throws OpenEJBException {
         PortData portData = new PortData();
+        portData.setPortId(port.portId);
         if (port.serviceName != null && port.serviceName.length() != 0) {
             portData.setServiceName(QName.valueOf(port.serviceName));
         }
@@ -47,7 +48,6 @@
         portData.setWsdlPort(port.wsdlPort);
         portData.setWsdlService(port.wsdlService);
         portData.setLocation(port.location);
-        portData.setWsdlPublishLocation(port.wsdlPublishLocation);
         return portData;
     }
 

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java?rev=591884&r1=591883&r2=591884&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java Sun Nov  4 21:48:59 2007
@@ -640,6 +640,7 @@
                 PortInfo portInfo = new PortInfo();
 
                 ServiceImplBean serviceImplBean = port.getServiceImplBean();
+                portInfo.portId = port.getId();
                 portInfo.serviceLink = serviceImplBean.getEjbLink();
                 if (portInfo.serviceLink == null) {
                     portInfo.serviceLink = serviceImplBean.getServletLink();
@@ -654,7 +655,6 @@
                 portInfo.wsdlPort = port.getWsdlPort();
                 portInfo.wsdlService = port.getWsdlService();
                 portInfo.location = port.getLocation();
-                portInfo.wsdlPublishLocation = port.getWsdlPublishLocation();
 
                 List<HandlerChainInfo> handlerChains = toHandlerChainInfo(port.getHandlerChains());
                 portInfo.handlerChains.addAll(handlerChains);

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java?rev=591884&r1=591883&r2=591884&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java Sun Nov  4 21:48:59 2007
@@ -240,10 +240,7 @@
             info.jaxrpcMappingFile = ref.getJaxrpcMappingFile();
             info.referenceType = ref.getServiceRefType();
             info.serviceType = ref.getServiceInterface();
-            String mappedName = ref.getMappedName();
-            if (mappedName != null && mappedName.startsWith("wsdlrepo:")) {
-                info.wsdlRepoUri = mappedName.substring("wsdlrepo:".length());
-            }
+            info.portId = ref.getMappedName();
             info.handlerChains.addAll(ConfigurationFactory.toHandlerChainInfo(ref.getHandlerChains()));
             for (PortComponentRef portComponentRef : ref.getPortComponentRef()) {
                 PortRefInfo portRefInfo = new PortRefInfo();

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/SunConversion.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/SunConversion.java?rev=591884&r1=591883&r2=591884&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/SunConversion.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/SunConversion.java Sun Nov  4 21:48:59 2007
@@ -283,8 +283,8 @@
 
                 String wsdlOverride = ref.getWsdlOverride();
                 if (wsdlOverride != null && wsdlOverride.length() > 0) {
-                    String wsdlRepoUri = processWsdlPublishLocation(wsdlOverride);
-                    serviceRef.setMappedName("wsdlrepo:" + wsdlRepoUri);
+                    String portId = extractPortId(wsdlOverride);
+                    serviceRef.setMappedName(portId);
                 }
             }
         }
@@ -381,8 +381,8 @@
 
                 String wsdlOverride = ref.getWsdlOverride();
                 if (wsdlOverride != null && wsdlOverride.length() > 0) {
-                    String wsdlRepoUri = processWsdlPublishLocation(wsdlOverride);
-                    serviceRef.setMappedName("wsdlrepo:" + wsdlRepoUri);
+                    String portId = extractPortId(wsdlOverride);
+                    serviceRef.setMappedName(portId);
                 }
             }
         }
@@ -394,10 +394,10 @@
                 WebserviceDescription description = descriptions.get(sunDescription.getWebserviceDescriptionName());
                 if (description == null) continue;
 
-                String location = processWsdlPublishLocation(sunDescription.getWsdlPublishLocation(), description.getWsdlFile());
-                if (location != null) {
+                String portId = extractPortId(sunDescription.getWsdlPublishLocation(), description.getWsdlFile());
+                if (portId != null) {
                     for (PortComponent portComponent : description.getPortComponent()) {
-                        portComponent.setWsdlPublishLocation(location);
+                        portComponent.setId(portId);
                     }
                 }
             }
@@ -405,11 +405,11 @@
     }
 
 
-    public static String processWsdlPublishLocation(String location) {
-        return processWsdlPublishLocation(location, null);
+    public static String extractPortId(String location) {
+        return extractPortId(location, null);
     }
 
-    public static String processWsdlPublishLocation(String location, String wsdlFile) {
+    public static String extractPortId(String location, String wsdlFile) {
         if (location == null) return null;
 
         if (location.startsWith("file:")) {
@@ -557,8 +557,8 @@
 
                         String wsdlOverride = ref.getWsdlOverride();
                         if (wsdlOverride != null && wsdlOverride.length() > 0) {
-                            String wsdlRepoUri = processWsdlPublishLocation(wsdlOverride);
-                            serviceRef.setMappedName("wsdlrepo:" + wsdlRepoUri);
+                            String portId = extractPortId(wsdlOverride);
+                            serviceRef.setMappedName(portId);
                         }
                     }
                 }
@@ -578,11 +578,11 @@
                     WebserviceDescription description = descriptions.get(sunDescription.getWebserviceDescriptionName());
                     if (description == null) continue;
 
-                    String location = processWsdlPublishLocation(sunDescription.getWsdlPublishLocation(), description.getWsdlFile());
-                    if (location != null) {
+                    String portId = extractPortId(sunDescription.getWsdlPublishLocation(), description.getWsdlFile());
+                    if (portId != null) {
                         for (PortComponent portComponent : description.getPortComponent()) {
                             // this could be a problem multiple port components used at runtime
-                            portComponent.setWsdlPublishLocation(location);
+                            portComponent.setId(portId);
                         }
                     }
                 }

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/WsDeployer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/WsDeployer.java?rev=591884&r1=591883&r2=591884&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/WsDeployer.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/WsDeployer.java Sun Nov  4 21:48:59 2007
@@ -31,6 +31,7 @@
 import org.apache.openejb.jee.WebApp;
 import org.apache.openejb.jee.WebserviceDescription;
 import org.apache.openejb.jee.Webservices;
+import org.apache.openejb.jee.oejb3.EjbDeployment;
 import org.apache.openejb.util.LogCategory;
 import org.apache.openejb.util.Logger;
 
@@ -181,6 +182,11 @@
                         webserviceDescription.getPortComponent().add(portComponent);
                     }
 
+                    // default portId == moduleId.servletName
+                    if (portComponent.getId() == null) {
+                        portComponent.setId(webModule.getModuleId() + "." + servlet.getServletName());
+                    }
+
                     // set port values from annotations if not already set
                     if (portComponent.getServiceEndpointInterface() == null) {
                         portComponent.setServiceEndpointInterface(JaxWsUtils.getServiceInterface(clazz));
@@ -219,6 +225,8 @@
             }
         }
 
+        Map<String, EjbDeployment> deploymentsByEjbName = ejbModule.getOpenejbJar().getDeploymentsByEjbName();
+
         WebserviceDescription webserviceDescription = null;
         for (EnterpriseBean enterpriseBean : ejbModule.getEjbJar().getEnterpriseBeans()) {
             // skip if this is not a webservices endpoint
@@ -227,6 +235,9 @@
             if (sessionBean.getSessionType() != SessionType.STATELESS) continue;
             if (sessionBean.getServiceEndpoint() == null) continue;
 
+            EjbDeployment deployment = deploymentsByEjbName.get(sessionBean.getEjbName());
+            if (deployment == null) continue;
+
             Class<?> ejbClass = null;
             try {
                 ejbClass = ejbModule.getClassLoader().loadClass(sessionBean.getEjbClass());
@@ -258,6 +269,11 @@
                 ServiceImplBean serviceImplBean = new ServiceImplBean();
                 serviceImplBean.setEjbLink(sessionBean.getEjbName());
                 portComponent.setServiceImplBean(serviceImplBean);
+            }
+
+            // default portId == deploymentId
+            if (portComponent.getId() == null) {
+                portComponent.setId(deployment.getDeploymentId());
             }
 
             // set service endpoint interface

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JaxWsServiceReference.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JaxWsServiceReference.java?rev=591884&r1=591883&r2=591884&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JaxWsServiceReference.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/JaxWsServiceReference.java Sun Nov  4 21:48:59 2007
@@ -37,6 +37,7 @@
 import java.util.ArrayList;
 
 public class JaxWsServiceReference extends Reference {
+    private String portId;
     private final Class<? extends Service> serviceClass;
     private final Class<?> referenceClass;
     private final URL wsdlUrl;
@@ -45,9 +46,9 @@
     private final List<Injection> injections;
     private WsdlRepo wsdlRepo;
     private final List<PortRefData> portRefs = new ArrayList<PortRefData>();
-    private String wsdlRepoUri;
 
-    public JaxWsServiceReference(Class<? extends Service> serviceClass, Class<?> referenceClass, URL wsdlUrl, QName serviceQName, String wsdlRepoUri, List<PortRefData> portRefs, List<HandlerChainData> handlerChains, List<Injection> injections) {
+    public JaxWsServiceReference(String portId, Class<? extends Service> serviceClass, Class<?> referenceClass, URL wsdlUrl, QName serviceQName, List<PortRefData> portRefs, List<HandlerChainData> handlerChains, List<Injection> injections) {
+        this.portId = portId;
         if (portRefs != null) {
             this.portRefs.addAll(portRefs);
         }
@@ -55,7 +56,6 @@
         this.referenceClass = referenceClass;
         this.wsdlUrl = wsdlUrl;
         this.serviceQName = serviceQName;
-        this.wsdlRepoUri = wsdlRepoUri;
         if (handlerChains != null) {
             this.handlerChains.addAll(handlerChains);
         }
@@ -97,7 +97,7 @@
         }
 
         // register the service data so it can be fetched when the service is passed over the EJBd protocol
-        ServiceRefData serviceRefData = new ServiceRefData(serviceClass, referenceClass, wsdlUrl, serviceQName, null, handlerChains, portRefs);
+        ServiceRefData serviceRefData = new ServiceRefData(portId, serviceClass, referenceClass, wsdlUrl, serviceQName, handlerChains, portRefs);
         ServiceRefData.putServiceRefData(port, serviceRefData);
 
         return port;
@@ -106,7 +106,7 @@
     private URL getWsdlUrl() {
         WsdlRepo wsdlRepo = getWsdlRepo();
         if (wsdlRepo != null) {
-            String wsdlLocation = wsdlRepo.getWsdl(wsdlRepoUri, serviceQName, referenceClass.getName());
+            String wsdlLocation = wsdlRepo.getWsdl(portId, serviceQName, referenceClass.getName());
             if (wsdlLocation != null) {
                 try {
                     URL wsdlUrl = new URL(wsdlLocation);

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/PortData.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/PortData.java?rev=591884&r1=591883&r2=591884&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/PortData.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/PortData.java Sun Nov  4 21:48:59 2007
@@ -26,6 +26,7 @@
 import java.net.URL;
 
 public class PortData implements PortInfo {
+    private String portId;
     private QName serviceName;
     private QName portName;
     private String bindingId;
@@ -37,8 +38,14 @@
     private QName wsdlPort;
     private QName wsdlService;
     private String location;
-    private String wsdlPublishLocation;
 
+    public String getPortId() {
+        return portId;
+    }
+
+    public void setPortId(String portId) {
+        this.portId = portId;
+    }
 
     public QName getServiceName() {
         return serviceName;
@@ -110,13 +117,5 @@
 
     public void setLocation(String location) {
         this.location = location;
-    }
-
-    public String getWsdlPublishLocation() {
-        return wsdlPublishLocation;
-    }
-
-    public void setWsdlPublishLocation(String wsdlPublishLocation) {
-        this.wsdlPublishLocation = wsdlPublishLocation;
     }
 }

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/ServiceRefData.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/ServiceRefData.java?rev=591884&r1=591883&r2=591884&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/ServiceRefData.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/ServiceRefData.java Sun Nov  4 21:48:59 2007
@@ -39,12 +39,12 @@
     private final Class<?> referenceClass;
     private final URL wsdlURL;
     private final QName serviceQName;
-    private final String wsdlRepoUri;
+    private final String portId;
     private final List<HandlerChainData> handlerChains = new ArrayList<HandlerChainData>();
     private final List<PortRefData> portRefs = new ArrayList<PortRefData>();
 
-    public ServiceRefData(Class<? extends Service> serviceClass, Class<?> referenceClass, URL wsdlURL, QName serviceQName, String wsdlRepoUri, List<HandlerChainData> handlerChains, List<PortRefData> portRefs) {
-        this.wsdlRepoUri = wsdlRepoUri;
+    public ServiceRefData(String portId, Class<? extends Service> serviceClass, Class<?> referenceClass, URL wsdlURL, QName serviceQName, List<HandlerChainData> handlerChains, List<PortRefData> portRefs) {
+        this.portId = portId;
         this.serviceClass = serviceClass;
         this.referenceClass = referenceClass;
         this.serviceQName = serviceQName;
@@ -57,6 +57,10 @@
         }
     }
 
+    public String getPortId() {
+        return portId;
+    }
+
     public Class<? extends Service> getServiceClass() {
         return serviceClass;
     }
@@ -71,10 +75,6 @@
 
     public QName getServiceQName() {
         return serviceQName;
-    }
-
-    public String getWsdlRepoUri() {
-        return wsdlRepoUri;
     }
 
     public List<HandlerChainData> getHandlerChains() {

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/WsdlRepo.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/WsdlRepo.java?rev=591884&r1=591883&r2=591884&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/WsdlRepo.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/WsdlRepo.java Sun Nov  4 21:48:59 2007
@@ -20,7 +20,7 @@
 import javax.xml.namespace.QName;
 
 public interface WsdlRepo {
-    void addWsdl(String wsdlRepoUri, QName serviceQname, String serviceInterface, String address);
-    void removeWsdl(String wsdlRepoUri, QName serviceQname, String serviceInterface, String address);
-    String getWsdl(String wsdlRepoUri, QName serviceQname, String serviceInterface);
+    void addWsdl(String portId, QName serviceQname, String serviceInterface, String address);
+    void removeWsdl(String portId, QName serviceQname, String serviceInterface, String address);
+    String getWsdl(String portId, QName serviceQname, String serviceInterface);
 }

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/WsdlRepoImpl.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/WsdlRepoImpl.java?rev=591884&r1=591883&r2=591884&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/WsdlRepoImpl.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/WsdlRepoImpl.java Sun Nov  4 21:48:59 2007
@@ -26,12 +26,12 @@
 import java.util.TreeSet;
 
 public class WsdlRepoImpl implements WsdlRepo {
-    private Map<String, Set<String>> addressesByWsdlUri = new TreeMap<String, Set<String>>();
+    private Map<String, Set<String>> addressesByPortId = new TreeMap<String, Set<String>>();
     private Map<QName, Set<String>> addressesByQNames = new HashMap<QName, Set<String>>();
     private Map<String, Set<String>> addressesByInterface = new TreeMap<String, Set<String>>();
 
-    public synchronized void addWsdl(String wsdlRepoUri, QName qname, String intf, String address) {
-        addAddress(addressesByWsdlUri, wsdlRepoUri, address);
+    public synchronized void addWsdl(String portId, QName qname, String intf, String address) {
+        addAddress(addressesByPortId, portId, address);
         addAddress(addressesByQNames, qname, address);
         addAddress(addressesByInterface, intf, address);
     }
@@ -47,8 +47,8 @@
         strings.add(address);
     }
 
-    public synchronized void removeWsdl(String wsdlRepoUri, QName qname, String intf, String address) {
-        removeAddress(addressesByWsdlUri, wsdlRepoUri, address);
+    public synchronized void removeWsdl(String portId, QName qname, String intf, String address) {
+        removeAddress(addressesByPortId, portId, address);
         removeAddress(addressesByQNames, qname, address);
         removeAddress(addressesByInterface, intf, address);
     }
@@ -65,48 +65,59 @@
         }
     }
 
-    public synchronized String getWsdl(String wsdlRepoUri, QName qname, String intf) {
-        // ServiceInterface
-        Set<String> intfAddresses = addressesByInterface.get(intf);
-        String address = getSingleAddress(intfAddresses);
-        if (address != null) {
-            return address;
+    public synchronized String getWsdl(String portId, QName qname, String intf) {
+        String address = null;
+
+        // PortId
+        Set<String> portIdAddresses = null;
+        if (portId != null) {
+            portIdAddresses = addressesByPortId.get(portId);
+            address = getSingleAddress(portIdAddresses);
+            if (address != null) {
+                return address;
+            }
         }
 
-        // ServiceQName
-        Set<String> qnameAddresses = addressesByQNames.get(qname);
-        address = getSingleAddress(qnameAddresses);
-        if (address != null) {
-            return address;
+        // ServiceInterface
+        Set<String> intfAddresses = null;
+        if (intf != null) {
+            intfAddresses = addressesByInterface.get(intf);
+            address = getSingleAddress(intfAddresses);
+            if (address != null) {
+                return address;
+            }
         }
 
-        // WsdlUri
-        Set<String> wsdlUriAddresses = addressesByWsdlUri.get(wsdlRepoUri);
-        address = getSingleAddress(wsdlUriAddresses);
-        if (address != null) {
-            return address;
+        // ServiceQName
+        Set<String> qnameAddresses = null;
+        if (qname != null) {
+            qnameAddresses = addressesByQNames.get(qname);
+            address = getSingleAddress(qnameAddresses);
+            if (address != null) {
+                return address;
+            }
         }
 
-        // ServiceInterface + ServiceQName
-        address = getUniqueAddress(intfAddresses, qnameAddresses);
+        // PortId + ServiceInterface
+        address = getUniqueAddress(portIdAddresses, intfAddresses);
         if (address != null) {
             return address;
         }
 
-        // WsdlUri + ServiceInterface
-        address = getUniqueAddress(wsdlUriAddresses, intfAddresses);
+        // PortId + ServiceQName
+        address = getUniqueAddress(portIdAddresses, qnameAddresses);
         if (address != null) {
             return address;
         }
 
-        // WsdlUri + ServiceQName
-        address = getUniqueAddress(wsdlUriAddresses, qnameAddresses);
+        // ServiceInterface + ServiceQName
+        address = getUniqueAddress(intfAddresses, qnameAddresses);
         if (address != null) {
             return address;
         }
 
-        // WsdlUri + ServiceInterface + ServiceQName
-        address = getUniqueAddress(wsdlUriAddresses, intfAddresses, qnameAddresses);
+        // PortId + ServiceInterface + ServiceQName
+        address = getUniqueAddress(portIdAddresses, intfAddresses, qnameAddresses);
         if (address != null) {
             return address;
         }

Modified: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/SunConversionTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/SunConversionTest.java?rev=591884&r1=591883&r2=591884&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/SunConversionTest.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/SunConversionTest.java Sun Nov  4 21:48:59 2007
@@ -17,58 +17,58 @@
  */
 package org.apache.openejb.config;
 
-import static org.apache.openejb.config.SunConversion.processWsdlPublishLocation;
+import static org.apache.openejb.config.SunConversion.extractPortId;
 import junit.framework.TestCase;
 
 public class SunConversionTest extends TestCase {
-    public void testProcessWsdlPublishLocation() throws Exception {
-        assertEquals("dir/file", processWsdlPublishLocation("file:repo1/dir", "META-INF/wsdl/file.wsdl"));
-        assertEquals("dir/file", processWsdlPublishLocation("file:repo1/dir", "WEB-INF/wsdl/file.wsdl"));
-        assertEquals("dir/META-INF/file", processWsdlPublishLocation("file:repo1/dir", "META-INF/file.wsdl"));
-        assertEquals("dir/WEB-INF/file", processWsdlPublishLocation("file:repo1/dir", "WEB-INF/file.wsdl"));
-        assertEquals("dir/file", processWsdlPublishLocation("file:repo1/dir", "file.wsdl"));
-        assertEquals("dir/file.xml", processWsdlPublishLocation("file:repo1/dir", "META-INF/wsdl/file.xml"));
-        assertEquals("dir/file.xml", processWsdlPublishLocation("file:repo1/dir", "WEB-INF/wsdl/file.xml"));
+    public void testExtractPortId() throws Exception {
+        assertEquals("dir/file", extractPortId("file:repo1/dir", "META-INF/wsdl/file.wsdl"));
+        assertEquals("dir/file", extractPortId("file:repo1/dir", "WEB-INF/wsdl/file.wsdl"));
+        assertEquals("dir/META-INF/file", extractPortId("file:repo1/dir", "META-INF/file.wsdl"));
+        assertEquals("dir/WEB-INF/file", extractPortId("file:repo1/dir", "WEB-INF/file.wsdl"));
+        assertEquals("dir/file", extractPortId("file:repo1/dir", "file.wsdl"));
+        assertEquals("dir/file.xml", extractPortId("file:repo1/dir", "META-INF/wsdl/file.xml"));
+        assertEquals("dir/file.xml", extractPortId("file:repo1/dir", "WEB-INF/wsdl/file.xml"));
 
         String x = "file:repo1/dir";
-        assertEquals("dir", processWsdlPublishLocation(x));
-        assertEquals("dir/file", processWsdlPublishLocation("file:repo1/dir/file.wsdl"));
-        assertEquals("dir/file.xml", processWsdlPublishLocation("file:repo1/dir/file.xml"));
-        assertEquals(null, processWsdlPublishLocation("file:repo1/"));
+        assertEquals("dir", SunConversion.extractPortId(x));
+        assertEquals("dir/file", SunConversion.extractPortId("file:repo1/dir/file.wsdl"));
+        assertEquals("dir/file.xml", SunConversion.extractPortId("file:repo1/dir/file.xml"));
+        assertEquals(null, SunConversion.extractPortId("file:repo1/"));
 
-        assertEquals("dir/file", processWsdlPublishLocation("http://server.com:port/dir/file?WSDL"));
-        assertEquals("dir/file", processWsdlPublishLocation("http://server.com:port/dir/file?wsdl"));
-        assertEquals("dir/file", processWsdlPublishLocation("http://server.com:port/dir/file?cheese"));
-        assertEquals("dir/file", processWsdlPublishLocation("http://server.com:port/dir/file"));
-        assertEquals("file", processWsdlPublishLocation("http://server.com:port/file?WSDL"));
-        assertEquals("file", processWsdlPublishLocation("http://server.com:port/file?wsdl"));
-        assertEquals("file", processWsdlPublishLocation("http://server.com:port/file?cheese"));
-        assertEquals("file", processWsdlPublishLocation("http://server.com:port/file"));
-        assertEquals(null, processWsdlPublishLocation("http://server.com:port/?WSDL"));
-        assertEquals(null, processWsdlPublishLocation("http://server.com:port/?wsdl"));
-        assertEquals(null, processWsdlPublishLocation("http://server.com:port/?cheese"));
-        assertEquals(null, processWsdlPublishLocation("http://server.com:port/"));
-        assertEquals("dir/file/", processWsdlPublishLocation("http://server.com:port/dir/file/?WSDL"));
-        assertEquals("dir/file/", processWsdlPublishLocation("http://server.com:port/dir/file/?wsdl"));
-        assertEquals("dir/file/", processWsdlPublishLocation("http://server.com:port/dir/file/?cheese"));
-        assertEquals("dir/file/", processWsdlPublishLocation("http://server.com:port/dir/file/"));
-        assertEquals("dir/file", processWsdlPublishLocation("https://server.com:port/dir/file?WSDL"));
-        assertEquals("dir/file", processWsdlPublishLocation("https://server.com:port/dir/file?wsdl"));
-        assertEquals("dir/file", processWsdlPublishLocation("https://server.com:port/dir/file?cheese"));
-        assertEquals("dir/file", processWsdlPublishLocation("https://server.com:port/dir/file"));
-        assertEquals("file", processWsdlPublishLocation("https://server.com:port/file?WSDL"));
-        assertEquals("file", processWsdlPublishLocation("https://server.com:port/file?wsdl"));
-        assertEquals("file", processWsdlPublishLocation("https://server.com:port/file?cheese"));
-        assertEquals("file", processWsdlPublishLocation("https://server.com:port/file"));
-        assertEquals(null, processWsdlPublishLocation("https://server.com:port/?WSDL"));
-        assertEquals(null, processWsdlPublishLocation("https://server.com:port/?wsdl"));
-        assertEquals(null, processWsdlPublishLocation("https://server.com:port/?cheese"));
-        assertEquals(null, processWsdlPublishLocation("https://server.com:port/"));
-        assertEquals("dir/file/", processWsdlPublishLocation("https://server.com:port/dir/file/?WSDL"));
-        assertEquals("dir/file/", processWsdlPublishLocation("https://server.com:port/dir/file/?wsdl"));
-        assertEquals("dir/file/", processWsdlPublishLocation("https://server.com:port/dir/file/?cheese"));
-        assertEquals("dir/file/", processWsdlPublishLocation("https://server.com:port/dir/file/"));
+        assertEquals("dir/file", SunConversion.extractPortId("http://server.com:port/dir/file?WSDL"));
+        assertEquals("dir/file", SunConversion.extractPortId("http://server.com:port/dir/file?wsdl"));
+        assertEquals("dir/file", SunConversion.extractPortId("http://server.com:port/dir/file?cheese"));
+        assertEquals("dir/file", SunConversion.extractPortId("http://server.com:port/dir/file"));
+        assertEquals("file", SunConversion.extractPortId("http://server.com:port/file?WSDL"));
+        assertEquals("file", SunConversion.extractPortId("http://server.com:port/file?wsdl"));
+        assertEquals("file", SunConversion.extractPortId("http://server.com:port/file?cheese"));
+        assertEquals("file", SunConversion.extractPortId("http://server.com:port/file"));
+        assertEquals(null, SunConversion.extractPortId("http://server.com:port/?WSDL"));
+        assertEquals(null, SunConversion.extractPortId("http://server.com:port/?wsdl"));
+        assertEquals(null, SunConversion.extractPortId("http://server.com:port/?cheese"));
+        assertEquals(null, SunConversion.extractPortId("http://server.com:port/"));
+        assertEquals("dir/file/", SunConversion.extractPortId("http://server.com:port/dir/file/?WSDL"));
+        assertEquals("dir/file/", SunConversion.extractPortId("http://server.com:port/dir/file/?wsdl"));
+        assertEquals("dir/file/", SunConversion.extractPortId("http://server.com:port/dir/file/?cheese"));
+        assertEquals("dir/file/", SunConversion.extractPortId("http://server.com:port/dir/file/"));
+        assertEquals("dir/file", SunConversion.extractPortId("https://server.com:port/dir/file?WSDL"));
+        assertEquals("dir/file", SunConversion.extractPortId("https://server.com:port/dir/file?wsdl"));
+        assertEquals("dir/file", SunConversion.extractPortId("https://server.com:port/dir/file?cheese"));
+        assertEquals("dir/file", SunConversion.extractPortId("https://server.com:port/dir/file"));
+        assertEquals("file", SunConversion.extractPortId("https://server.com:port/file?WSDL"));
+        assertEquals("file", SunConversion.extractPortId("https://server.com:port/file?wsdl"));
+        assertEquals("file", SunConversion.extractPortId("https://server.com:port/file?cheese"));
+        assertEquals("file", SunConversion.extractPortId("https://server.com:port/file"));
+        assertEquals(null, SunConversion.extractPortId("https://server.com:port/?WSDL"));
+        assertEquals(null, SunConversion.extractPortId("https://server.com:port/?wsdl"));
+        assertEquals(null, SunConversion.extractPortId("https://server.com:port/?cheese"));
+        assertEquals(null, SunConversion.extractPortId("https://server.com:port/"));
+        assertEquals("dir/file/", SunConversion.extractPortId("https://server.com:port/dir/file/?WSDL"));
+        assertEquals("dir/file/", SunConversion.extractPortId("https://server.com:port/dir/file/?wsdl"));
+        assertEquals("dir/file/", SunConversion.extractPortId("https://server.com:port/dir/file/?cheese"));
+        assertEquals("dir/file/", SunConversion.extractPortId("https://server.com:port/dir/file/"));
 
-        assertEquals(null, processWsdlPublishLocation(null));
+        assertEquals(null, SunConversion.extractPortId(null));
     }
 }

Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/PortComponent.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/PortComponent.java?rev=591884&r1=591883&r2=591884&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/PortComponent.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/PortComponent.java Sun Nov  4 21:48:59 2007
@@ -77,8 +77,6 @@
     protected HandlerChains handlerChains;
     @XmlTransient
     protected String location;
-    @XmlTransient
-    protected String wsdlPublishLocation;
     @XmlAttribute
     @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
     @XmlID
@@ -188,14 +186,6 @@
 
     public void setLocation(String location) {
         this.location = location;
-    }
-
-    public String getWsdlPublishLocation() {
-        return wsdlPublishLocation;
-    }
-
-    public void setWsdlPublishLocation(String wsdlPublishLocation) {
-        this.wsdlPublishLocation = wsdlPublishLocation;
     }
 
     public String getId() {

Modified: openejb/trunk/openejb3/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/JndiRequestHandler.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/JndiRequestHandler.java?rev=591884&r1=591883&r2=591884&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/JndiRequestHandler.java (original)
+++ openejb/trunk/openejb3/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/JndiRequestHandler.java Sun Nov  4 21:48:59 2007
@@ -191,7 +191,7 @@
                     }
                     WsdlRepo wsdlRepo = SystemInstance.get().getComponent(WsdlRepo.class);
                     if (wsdlRepo != null) {
-                        String wsdlLocation = wsdlRepo.getWsdl(serviceRef.getWsdlRepoUri(), serviceRef.getServiceQName(), referenceClassName);
+                        String wsdlLocation = wsdlRepo.getWsdl(serviceRef.getPortId(), serviceRef.getServiceQName(), referenceClassName);
                         if (wsdlLocation != null) {
                             try {
                                 wsdlUrl = new URL(wsdlLocation).toExternalForm();

Modified: openejb/trunk/openejb3/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsService.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsService.java?rev=591884&r1=591883&r2=591884&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsService.java (original)
+++ openejb/trunk/openejb3/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsService.java Sun Nov  4 21:48:59 2007
@@ -239,8 +239,8 @@
                                 String address = selectSingleAddress(addresses);
 
                                 // register wsdl location
-                                wsdlRepo.addWsdl(portInfo.wsdlPublishLocation, portInfo.wsdlService, portInfo.seiInterfaceName, address.toString());
-                                logger.info("Webservice(wsdl=" + address + ", qname=" + port.getWsdlService() + ") --> Ejb(deployment-id=" + bean.ejbDeploymentId + ")");
+                                wsdlRepo.addWsdl(portInfo.portId, portInfo.wsdlService, portInfo.seiInterfaceName, address.toString());
+                                logger.info("Webservice(wsdl=" + address + ", qname=" + port.getWsdlService() + ") --> Ejb(id=" + portInfo.portId + ")");
                                 ejbAddresses.put(bean.ejbDeploymentId, address);
                             }
                         } catch (Throwable e) {
@@ -287,8 +287,8 @@
                             String address = selectSingleAddress(addresses);
 
                             // add address to global registry
-                            wsdlRepo.addWsdl(portInfo.wsdlPublishLocation, portInfo.wsdlService, portInfo.seiInterfaceName, address.toString());
-                            logger.info("Webservice(wsdl=" + address + ", qname=" + port.getWsdlService() + ")");
+                            wsdlRepo.addWsdl(portInfo.portId, portInfo.wsdlService, portInfo.seiInterfaceName, address.toString());
+                            logger.info("Webservice(wsdl=" + address + ", qname=" + port.getWsdlService() + ") --> Pojo(id=" + portInfo.portId + ")");
                             servletAddresses.put(webApp.moduleId + "." + servlet.servletName, address);
                         }
                     } catch (Throwable e) {
@@ -317,7 +317,7 @@
                         // remove wsdl addresses from global registry
                         String address = ejbAddresses.remove(enterpriseBean.ejbDeploymentId);
                         if (address != null) {
-                            wsdlRepo.removeWsdl(portInfo.wsdlPublishLocation, portInfo.wsdlService, portInfo.seiInterfaceName, address);
+                            wsdlRepo.removeWsdl(portInfo.portId, portInfo.wsdlService, portInfo.seiInterfaceName, address);
                         }
 
                         // remove container from web server
@@ -344,7 +344,7 @@
                     // remove wsdl addresses from global registry
                     String address = servletAddresses.remove(webApp.moduleId + "." + servlet.servletName);
                     if (address != null) {
-                        wsdlRepo.removeWsdl(portInfo.wsdlPublishLocation, portInfo.wsdlService, portInfo.seiInterfaceName, address);
+                        wsdlRepo.removeWsdl(portInfo.portId, portInfo.wsdlService, portInfo.seiInterfaceName, address);
                     }
 
                     // clear servlet's reference to the webservice container



Mime
View raw message