Branch: refs/heads/master Home: https://github.com/teiid/teiid Commit: 9888ae5c62c877d1264608627b2a246e4df97425 https://github.com/teiid/teiid/commit/9888ae5c62c877d1264608627b2a246e4df... Author: shawkins <shawkins(a)redhat.com&gt; Date: 2016-03-09 (Wed, 09 Mar 2016) Changed paths: M jboss-integration/src/main/java/org/teiid/jboss/DQPCoreService.java M jboss-integration/src/main/java/org/teiid/jboss/JBossLifeCycleListener.java M jboss-integration/src/main/java/org/teiid/jboss/TeiidAdd.java M jboss-integration/src/main/java/org/teiid/jboss/VDBService.java M jboss-integration/src/main/java/org/teiid/jboss/rest/ResteasyEnabler.java M jboss-integration/src/test/java/org/teiid/jboss/TestResteasyEnabler.java M odata/src/main/java/org/teiid/odata/TeiidProducerProvider.java M olingo/src/main/java/org/teiid/olingo/web/ODataFilter.java M runtime/src/main/java/org/teiid/deployers/ContainerLifeCycleListener.java M runtime/src/main/java/org/teiid/deployers/EventDistributorImpl.java M runtime/src/main/java/org/teiid/deployers/VDBLifeCycleListener.java M runtime/src/main/java/org/teiid/deployers/VDBRepository.java M runtime/src/main/java/org/teiid/runtime/AbstractVDBDeployer.java M runtime/src/main/java/org/teiid/runtime/EmbeddedAdminFactory.java M runtime/src/main/java/org/teiid/runtime/EmbeddedServer.java M runtime/src/main/java/org/teiid/runtime/MaterializationManager.java M runtime/src/main/resources/org/teiid/runtime/i18n.properties M runtime/src/test/java/org/teiid/deployers/TestCompositeVDB.java M runtime/src/test/java/org/teiid/deployers/TestVDBStatusChecker.java M test-integration/common/src/test/java/org/teiid/arquillian/IntegrationTestRestWebserviceGeneration.java M test-integration/common/src/test/java/org/teiid/jdbc/FakeServer.java Log Message: ----------- TEIID-4024 fixing hang with rest war shutdown Conflicts: jboss-integration/src/main/java/org/teiid/jboss/TeiidAdd.java odata/src/main/java/org/teiid/odata/TeiidProducerProvider.java olingo/src/main/java/org/teiid/olingo/web/ODataFilter.java runtime/src/main/java/org/teiid/deployers/VDBRepository.java