Author: rmannibucau Date: Fri Jun 14 11:56:37 2013 New Revision: 1493045 URL: http://svn.apache.org/r1493045 Log: TOMEE-978 soap ws doesn't work in ear when deploy in webapp and through runtime deployment and not at startup
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/event/AssemblerAfterApplicationCreated.java tomee/tomee/trunk/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java tomee/tomee/trunk/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsService.java Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java?rev=1493045&r1=1493044&r2=1493045&view=diff ============================================================================== --- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java (original) +++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java Fri Jun 14 11:56:37 2013 @@ -877,7 +877,7 @@ public class Assembler extends Assembler } deployedApplications.put(appInfo.path, appInfo); - systemInstance.fireEvent(new AssemblerAfterApplicationCreated(appInfo)); + systemInstance.fireEvent(new AssemblerAfterApplicationCreated(appInfo, allDeployments)); logger.info("createApplication.success", appInfo.path); Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/event/AssemblerAfterApplicationCreated.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/event/AssemblerAfterApplicationCreated.java?rev=1493045&r1=1493044&r2=1493045&view=diff ============================================================================== --- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/event/AssemblerAfterApplicationCreated.java (original) +++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/event/AssemblerAfterApplicationCreated.java Fri Jun 14 11:56:37 2013 @@ -16,21 +16,30 @@ */ package org.apache.openejb.assembler.classic.event; +import org.apache.openejb.BeanContext; import org.apache.openejb.assembler.classic.AppInfo; import org.apache.openejb.observer.Event; +import java.util.Collection; + @Event public class AssemblerAfterApplicationCreated { private final AppInfo app; + private final Collection<BeanContext> deployedEjbs; - public AssemblerAfterApplicationCreated(final AppInfo appInfo) { + public AssemblerAfterApplicationCreated(final AppInfo appInfo, final Collection<BeanContext> ejbs) { app = appInfo; + deployedEjbs = ejbs; } public AppInfo getApp() { return app; } + public Collection<BeanContext> getDeployedEjbs() { + return deployedEjbs; + } + @Override public String toString() { return "AssemblerAfterApplicationCreated{" + Modified: tomee/tomee/trunk/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java?rev=1493045&r1=1493044&r2=1493045&view=diff ============================================================================== --- tomee/tomee/trunk/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java (original) +++ tomee/tomee/trunk/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java Fri Jun 14 11:56:37 2013 @@ -891,7 +891,7 @@ public abstract class RESTService implem if (assembler != null) { SystemInstance.get().addObserver(this); for (final AppInfo appInfo : assembler.getDeployedApplications()) { - afterApplicationCreated(new AssemblerAfterApplicationCreated(appInfo)); + afterApplicationCreated(new AssemblerAfterApplicationCreated(appInfo, null)); } } } Modified: tomee/tomee/trunk/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsService.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsService.java?rev=1493045&r1=1493044&r2=1493045&view=diff ============================================================================== --- tomee/tomee/trunk/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsService.java (original) +++ tomee/tomee/trunk/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsService.java Fri Jun 14 11:56:37 2013 @@ -185,7 +185,7 @@ public abstract class WsService implemen if (assembler != null) { SystemInstance.get().addObserver(this); for (final AppInfo appInfo : assembler.getDeployedApplications()) { - afterApplicationCreated(new AssemblerAfterApplicationCreated(appInfo)); + afterApplicationCreated(new AssemblerAfterApplicationCreated(appInfo, null)); } } } @@ -214,7 +214,7 @@ public abstract class WsService implemen protected abstract void destroyPojoWsContainer(String serviceId); - // handle webapp ejbs of ears + // handle webapp ejbs of ears - called before afterApplicationCreated for ear so dont add app to deployedApplications here public void newEjbToDeploy(final @Observes NewEjbAvailableAfterApplicationCreated event) { deployApp(event.getApp(), event.getBeanContexts()); } @@ -222,7 +222,7 @@ public abstract class WsService implemen public void afterApplicationCreated(final @Observes AssemblerAfterApplicationCreated event) { final AppInfo appInfo = event.getApp(); if (deployedApplications.add(appInfo)) { - deployApp(appInfo, null); + deployApp(appInfo, event.getDeployedEjbs()); } }