You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2015/04/29 17:52:49 UTC
tomee git commit: container is built after having built application
model (info tree) so backlisting application resources to initialize
container ones. Side note: we can desire to rework this lifecycle
Repository: tomee
Updated Branches:
refs/heads/master 064aec704 -> 1f9fdc9f6
container is built after having built application model (info tree) so backlisting application resources to initialize container ones. Side note: we can desire to rework this lifecycle
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/1f9fdc9f
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/1f9fdc9f
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/1f9fdc9f
Branch: refs/heads/master
Commit: 1f9fdc9f65d42144c7bf0e2c5b6f859ffa673c93
Parents: 064aec7
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Wed Apr 29 17:52:40 2015 +0200
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Wed Apr 29 17:52:40 2015 +0200
----------------------------------------------------------------------
.../java/org/apache/openejb/assembler/classic/Assembler.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/1f9fdc9f/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
index 840a42d..359d9bc 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
@@ -546,11 +546,17 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A
createSecurityService(configInfo.facilities.securityService);
+ final Set<String> reservedResourceIds = new HashSet<>(configInfo.facilities.resources.size());
+ for (final AppInfo appInfo : containerSystemInfo.applications) {
+ reservedResourceIds.addAll(appInfo.resourceIds);
+ }
+
final Set<String> rIds = new HashSet<>(configInfo.facilities.resources.size());
for (final ResourceInfo resourceInfo : configInfo.facilities.resources) {
createResource(resourceInfo);
rIds.add(resourceInfo.id);
}
+ rIds.removeAll(reservedResourceIds);
postConstructResources(rIds, ParentClassLoaderFinder.Helper.get(), systemInstance.getComponent(ContainerSystem.class).getJNDIContext(), null);
// Containers