Index: webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WebServicesDeployer.java
===================================================================
--- webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WebServicesDeployer.java (revision 43108)
+++ webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WebServicesDeployer.java Mon Dec 06 13:18:34 PST 2010
@@ -184,7 +184,8 @@
Thread.currentThread().setContextClassLoader(oldCl);
WebServicesContainer container = habitat.getComponent(WebServicesContainer.class);
WebServicesDeploymentMBean bean = container.getDeploymentBean();
- bean.deploy(app);
+ WebServiceDeploymentNotifier notifier = getDeploymentNotifier();
+ bean.deploy(app,notifier);
return true;
} catch (Exception ex) {
// re-throw all the exceptions as runtime exceptions
@@ -670,7 +671,7 @@
* Combining code from com.sun.enterprise.deployment.backend.WebServiceDeployer
* in v2
*/
- final WebServiceDeploymentNotifier notifier = getDeploymentNotifier();
+
Collection endpoints =
webBunDesc.getWebServices().getEndpoints();
ClassLoader cl = webBunDesc.getClassLoader();
@@ -705,9 +706,7 @@
"org.glassfish.webservices.JAXRPCServlet";
}
webComp.setWebComponentImplementation(containerServlet);
- if (notifier != null) {
- notifier.notifyDeployed(nextEndpoint);
- }
+
} catch(ClassNotFoundException cex) {
throw new DeploymentException( format(rb.getString(
"enterprise.deployment.backend.cannot_find_servlet"),
Index: webservices/jsr109-impl/src/main/java/org/glassfish/webservices/deployment/WebServicesDeploymentMBean.java
===================================================================
--- webservices/jsr109-impl/src/main/java/org/glassfish/webservices/deployment/WebServicesDeploymentMBean.java (revision 42875)
+++ webservices/jsr109-impl/src/main/java/org/glassfish/webservices/deployment/WebServicesDeploymentMBean.java Mon Dec 06 13:18:34 PST 2010
@@ -44,6 +44,7 @@
import com.sun.enterprise.deployment.WebServiceEndpoint;
import org.glassfish.external.probe.provider.annotations.ProbeParam;
import org.glassfish.gmbal.*;
+import org.glassfish.webservices.WebServiceDeploymentNotifier;
import java.util.*;
@@ -293,10 +294,11 @@
}
}
- public synchronized void deploy(com.sun.enterprise.deployment.Application app) {
+ public synchronized void deploy(com.sun.enterprise.deployment.Application app, WebServiceDeploymentNotifier notifier) {
for(WebService svc : app.getWebServiceDescriptors()) {
for(WebServiceEndpoint endpoint : svc.getEndpoints()) {
deploy(endpoint);
+ notifier.notifyDeployed(endpoint);
}
}
}