[teiid-commits] teiid SVN: r4373 - in trunk/jboss-integration/src/main/java/org/teiid/jboss: rest and 1 other directory.
Author: rareddy
Date: 2012-08-27 19:07:08 -0400 (Mon, 27 Aug 2012)
New Revision: 4373
Modified:
trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java
trunk/jboss-integration/src/main/java/org/teiid/jboss/rest/ResteasyEnabler.java
Log:
TEIID-2158: Fixing the issue with undeploy of VDB not correctly doing the un-deployment of
the dependent war file.
Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java
===================================================================
--- trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java 2012-08-27
22:38:00 UTC (rev 4372)
+++ trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java 2012-08-27
23:07:08 UTC (rev 4373)
@@ -103,6 +103,7 @@
protected final InjectedValue<ModelController> controllerValue = new
InjectedValue<ModelController>();
private VDBLifeCycleListener vdbListener;
+ private VDBLifeCycleListener restEasyListener;
private LinkedHashMap<String, Resource> visibilityMap;
public VDBService(VDBMetaData metadata, LinkedHashMap<String, Resource>
visibilityMap) {
@@ -171,7 +172,9 @@
};
getVDBRepository().addListener(this.vdbListener);
- getVDBRepository().addListener(new ResteasyEnabler(controllerValue.getValue(),
executorInjector.getValue()));
+
+ this.restEasyListener = new ResteasyEnabler(controllerValue.getValue(),
executorInjector.getValue());
+ getVDBRepository().addListener(this.restEasyListener);
MetadataStore store = new MetadataStore();
@@ -265,8 +268,9 @@
GlobalTableStore gts = vdb.getAttachment(GlobalTableStore.class);
this.objectReplicatorInjector.getValue().stop(gts);
}
+ getVDBRepository().removeVDB(this.vdb.getName(), this.vdb.getVersion());
getVDBRepository().removeListener(this.vdbListener);
- getVDBRepository().removeVDB(this.vdb.getName(), this.vdb.getVersion());
+ getVDBRepository().removeListener(this.restEasyListener);
final ServiceController<?> controller =
context.getController().getServiceContainer().getService(TeiidServiceNames.vdbFinishedServiceName(vdb.getName(),
vdb.getVersion()));
if (controller != null) {
controller.setMode(ServiceController.Mode.REMOVE);
Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/rest/ResteasyEnabler.java
===================================================================
---
trunk/jboss-integration/src/main/java/org/teiid/jboss/rest/ResteasyEnabler.java 2012-08-27
22:38:00 UTC (rev 4372)
+++
trunk/jboss-integration/src/main/java/org/teiid/jboss/rest/ResteasyEnabler.java 2012-08-27
23:07:08 UTC (rev 4373)
@@ -90,7 +90,7 @@
@Override
public void removed(String name, int version, CompositeVDB cvdb) {
VDBMetaData vdb = cvdb.getVDB();
- String generate = vdb.getPropertyValue("auto-generate-rest-war");
//$NON-NLS-1$
+ String generate =
vdb.getPropertyValue(ResteasyEnabler.REST_NAMESPACE+"auto-generate");
//$NON-NLS-1$
final String warName = buildName(vdb);
if (generate != null && Boolean.parseBoolean(generate)
&& ((AdminImpl) this.admin).getDeployments().contains(warName)) {