Author: thomas.diesler(a)jboss.com Date: 2007-01-29 12:09:11 -0500 (Mon, 29 Jan 2007) New Revision: 2181 Modified: branches/jbossws-1.2.0/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB21.java branches/jbossws-1.2.0/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorJSE.java branches/jbossws-1.2.0/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceRefHandler.java branches/jbossws-1.2.0/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebServiceRefHandler.java Log: Fix vfsRoot in jboss42 Modified: branches/jbossws-1.2.0/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB21.java =================================================================== --- branches/jbossws-1.2.0/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB21.java 2007-01-29 16:47:46 UTC (rev 2180) +++ branches/jbossws-1.2.0/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB21.java 2007-01-29 17:09:11 UTC (rev 2181) @@ -95,10 +95,17 @@ return isWebserviceDeployment; } - protected UnifiedVirtualFile getWebservicesFile(DeploymentInfo di) + private UnifiedVirtualFile getWebservicesFile(DeploymentInfo di) { - URL url = di.localCl.findResource("META-INF/webservices.xml"); - return url != null ? new ResourceLoaderAdapter(di.localCl) : null; + UnifiedVirtualFile vfsRoot = new ResourceLoaderAdapter(di.localCl); + try + { + return vfsRoot.findChild("META-INF/webservices.xml"); + } + catch (IOException e) + { + return null; + } } protected URL generateWebDeployment(DeploymentInfo di, UnifiedMetaData wsMetaData) throws IOException Modified: branches/jbossws-1.2.0/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorJSE.java =================================================================== --- branches/jbossws-1.2.0/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorJSE.java 2007-01-29 16:47:46 UTC (rev 2180) +++ branches/jbossws-1.2.0/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorJSE.java 2007-01-29 17:09:11 UTC (rev 2181) @@ -23,6 +23,7 @@ // $Id$ +import java.io.IOException; import java.net.URL; import java.util.Iterator; import java.util.Map; @@ -155,9 +156,16 @@ } } - protected UnifiedVirtualFile getWebservicesFile(DeploymentInfo di) + private UnifiedVirtualFile getWebservicesFile(DeploymentInfo di) { - URL url = di.localCl.findResource("WEB-INF/webservices.xml"); - return url != null ? new ResourceLoaderAdapter(di.localCl) : null; + UnifiedVirtualFile vfsRoot = new ResourceLoaderAdapter(di.localCl); + try + { + return vfsRoot.findChild("WEB-INF/webservices.xml"); + } + catch (IOException e) + { + return null; + } } } Modified: branches/jbossws-1.2.0/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceRefHandler.java =================================================================== --- branches/jbossws-1.2.0/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceRefHandler.java 2007-01-29 16:47:46 UTC (rev 2180) +++ branches/jbossws-1.2.0/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceRefHandler.java 2007-01-29 17:09:11 UTC (rev 2181) @@ -94,11 +94,17 @@ wsServiceRef.setWsdlDefinition(wsdlDefinition); ServiceReferenceable ref = new ServiceReferenceable(wsServiceRef, udi); + + // Do not use rebind, the binding should be unique Util.bind(envCtx, serviceRefName, ref); log.debug("<service-ref> bound to: java:comp/env/" + serviceRefName); } } + catch (RuntimeException rte) + { + throw rte; + } catch (Exception ex) { throw new WSException("Cannot bind webservice to client environment", ex); Modified: branches/jbossws-1.2.0/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebServiceRefHandler.java =================================================================== --- branches/jbossws-1.2.0/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebServiceRefHandler.java 2007-01-29 16:47:46 UTC (rev 2180) +++ branches/jbossws-1.2.0/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/WebServiceRefHandler.java 2007-01-29 17:09:11 UTC (rev 2181) @@ -172,7 +172,10 @@ usRef.setHandlerChain(handlerChain); } - Util.rebind(encCtx, encName, new ServiceReferenceable(serviceClassName, targetClassName, usRef)); + // Do not use rebind, the binding should be unique + Util.bind(encCtx, encName, new ServiceReferenceable(serviceClassName, targetClassName, usRef)); + + log.debug("<service-ref> bound to: java:comp/env/" + encName); } catch (RuntimeException rte) {