Author: dblevins
Date: Sat Mar 22 04:48:36 2014
New Revision: 1580166
URL: http://svn.apache.org/r1580166
Log:
Clean observer method names
Modified:
tomee/tomee/trunk/server/openejb-hessian/src/main/java/org/apache/openejb/server/hessian/HessianService.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/server/openejb-hessian/src/main/java/org/apache/openejb/server/hessian/HessianService.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-hessian/src/main/java/org/apache/openejb/server/hessian/HessianService.java?rev=1580166&r1=1580165&r2=1580166&view=diff
==============================================================================
---
tomee/tomee/trunk/server/openejb-hessian/src/main/java/org/apache/openejb/server/hessian/HessianService.java
(original)
+++
tomee/tomee/trunk/server/openejb-hessian/src/main/java/org/apache/openejb/server/hessian/HessianService.java
Sat Mar 22 04:48:36 2014
@@ -114,7 +114,7 @@ public class HessianService implements S
final Assembler assembler =
SystemInstance.get().getComponent(Assembler.class);
if (assembler != null) {
for (final AppInfo appInfo : assembler.getDeployedApplications()) {
- afterApplicationCreated(new StartApplicationContext(appInfo,
SystemInstance.get().getComponent(ContainerSystem.class).getAppContext(appInfo.appId)));
+ deploy(new StartApplicationContext(appInfo,
SystemInstance.get().getComponent(ContainerSystem.class).getAppContext(appInfo.appId)));
}
}
}
@@ -160,12 +160,12 @@ public class HessianService implements S
deploy(event.getApp(), event.getBeanContexts());
}
- public void afterApplicationCreated(final @Observes
StartApplicationContext event) {
+ public void deploy(final @Observes StartApplicationContext event) {
final AppInfo appInfo = event.getApplicationInfo();
deploy(appInfo, event.getApplicationContext().getBeanContexts());
}
- public void beforeApplicationDestroyed(@Observes final
StopApplicationContext event) {
+ public void undeploy(@Observes final StopApplicationContext event) {
if (disabled) {
return;
}
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=1580166&r1=1580165&r2=1580166&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
Sat Mar 22 04:48:36 2014
@@ -885,7 +885,7 @@ public abstract class RESTService implem
return cl;
}
- public void beforeApplicationDestroyed(@Observes final
StopApplicationContext event) {
+ public void deploy(@Observes final StopApplicationContext event) {
final AppInfo app = event.getApplicationInfo();
if (deployedApplications.contains(app)) {
for (final WebAppInfo webApp : app.webApps) {
@@ -931,7 +931,7 @@ public abstract class RESTService implem
if (assembler != null) {
SystemInstance.get().removeObserver(this);
for (final AppInfo appInfo : new
ArrayList<AppInfo>(deployedApplications)) {
- beforeApplicationDestroyed(new StopApplicationContext(appInfo,
null));
+ deploy(new StopApplicationContext(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=1580166&r1=1580165&r2=1580166&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
Sat Mar 22 04:48:36 2014
@@ -187,7 +187,7 @@ public abstract class WsService implemen
SystemInstance.get().addObserver(this);
for (final AppInfo appInfo : assembler.getDeployedApplications()) {
final AppContext appContext =
containerSystem.getAppContext(appInfo.appId);
- afterApplicationCreated(new StartApplicationContext(appInfo,
appContext));
+ deploy(new StartApplicationContext(appInfo, appContext));
}
}
}
@@ -197,7 +197,7 @@ public abstract class WsService implemen
if (assembler != null) {
SystemInstance.get().removeObserver(this);
for (final AppInfo appInfo : new
ArrayList<AppInfo>(deployedApplications)) {
- beforeApplicationDestroyed(new StopApplicationContext(appInfo,
null));
+ undeploy(new StopApplicationContext(appInfo, null));
}
assembler = null;
if (SystemInstance.get().getComponent(WsService.class) == this) {
@@ -221,7 +221,7 @@ public abstract class WsService implemen
deployApp(event.getApp(), event.getBeanContexts());
}
- public void afterApplicationCreated(final @Observes
StartApplicationContext event) {
+ public void deploy(final @Observes StartApplicationContext event) {
final AppInfo appInfo = event.getApplicationInfo();
if (deployedApplications.add(appInfo)) {
deployApp(appInfo,
event.getApplicationContext().getBeanContexts());
@@ -426,7 +426,7 @@ public abstract class WsService implemen
}
}
- public void beforeApplicationDestroyed(@Observes final
StopApplicationContext event) {
+ public void undeploy(@Observes final StopApplicationContext event) {
final AppInfo appInfo = event.getApplicationInfo();
if (deployedApplications.remove(appInfo)) {
for (final EjbJarInfo ejbJar : appInfo.ejbJars) {
