Repository: tomee Updated Branches: refs/heads/tomee-1.7.x 8b2ef1f4a -> e3867f851
Factor out appInfo.containerIds as we now have appInfo.containers Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/6e3f0c6c Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/6e3f0c6c Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/6e3f0c6c Branch: refs/heads/tomee-1.7.x Commit: 6e3f0c6c240fc879000281c16101f988d59a769d Parents: 8b2ef1f Author: Jonathan Gallimore <[email protected]> Authored: Fri Jan 19 16:13:06 2018 +0000 Committer: Jonathan Gallimore <[email protected]> Committed: Mon Jan 22 17:36:53 2018 +0000 ---------------------------------------------------------------------- .../openejb/assembler/classic/AppInfo.java | 1 - .../openejb/assembler/classic/Assembler.java | 3 --- .../apache/openejb/config/AppInfoBuilder.java | 22 ++++++++++++-------- 3 files changed, 13 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/6e3f0c6c/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/AppInfo.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/AppInfo.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/AppInfo.java index fa4153c..6481792 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/AppInfo.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/AppInfo.java @@ -46,7 +46,6 @@ public class AppInfo extends InfoObject { public List<ContainerInfo> containers = new ArrayList<ContainerInfo>(); public final List<String> libs = new ArrayList<String>(); public final Set<String> watchedResources = new TreeSet<String>(); - public final Set<String> containerIds = new TreeSet<String>(); public final Set<String> resourceIds = new TreeSet<String>(); public final Set<String> resourceAliases = new TreeSet<String>(); public final JndiEncInfo globalJndiEnc = new JndiEncInfo(); http://git-wip-us.apache.org/repos/asf/tomee/blob/6e3f0c6c/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 aed78ea..4a45a90 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 @@ -2345,9 +2345,6 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A } } - for (final String id : appInfo.containerIds) { - removeContainer(id); - } for (final ContainerInfo containerInfo : appInfo.containers) { removeContainer(containerInfo.id); http://git-wip-us.apache.org/repos/asf/tomee/blob/6e3f0c6c/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java b/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java index 7b10eaa..942d181 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java @@ -165,7 +165,10 @@ class AppInfoBuilder { containerIds.add(containerInfo.id); } } - containerIds.addAll(appInfo.containerIds); + + for (final ContainerInfo containerInfo : appInfo.containers) { + containerIds.add(containerInfo.id); + } // // EJB Jars @@ -181,9 +184,9 @@ class AppInfoBuilder { for (final EnterpriseBeanInfo bean : ejbJarInfo.enterpriseBeans) { final EjbDeployment d = deploymentsByEjbName.get(bean.ejbName); if (d.getContainerId() != null && !containerIds.contains(d.getContainerId())) { - for (final String cId : appInfo.containerIds) { - if (cId.endsWith("/" + d.getContainerId())) { - d.setContainerId(cId); + for (final ContainerInfo containerInfo : appInfo.containers) { + if (containerInfo.id.endsWith("/" + d.getContainerId())) { + d.setContainerId(containerInfo.id); break; } } @@ -360,11 +363,12 @@ class AppInfoBuilder { info.resourceAliases.addAll(def.getAliases()); } } - for (final Container def : module.getContainers()) { - if (!def.getProperties().containsKey("ApplicationWide")) { - info.containerIds.add(def.getId()); - } - } + +// for (final Container def : module.getContainers()) { +// if (!def.getProperties().containsKey("ApplicationWide")) { +// info.containerIds.add(def.getId()); +// } +// } } private void buildAppContainers(final AppModule module, final AppInfo info) throws OpenEJBException {
