You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by ge...@apache.org on 2011/05/31 18:31:20 UTC
svn commit: r1129786 - in
/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb:
assembler/classic/ cdi/
Author: genspring
Date: Tue May 31 16:31:19 2011
New Revision: 1129786
URL: http://svn.apache.org/viewvc?rev=1129786&view=rev
Log:
Cleanup moduleId and moduleURI usage in JndiEncBuilder.
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbJarBuilder.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EnterpriseBeanBuilder.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiResourceInjectionService.java
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java?rev=1129786&r1=1129785&r2=1129786&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java Tue May 31 16:31:19 2011
@@ -495,8 +495,8 @@ public class Assembler extends Assembler
InjectionBuilder injectionBuilder = new InjectionBuilder(classLoader);
List<Injection> appInjections = injectionBuilder.buildInjections(appInfo.globalJndiEnc);
appInjections.addAll(injectionBuilder.buildInjections(appInfo.appJndiEnc));
- Context globalJndiContext = new JndiEncBuilder(appInfo.globalJndiEnc, appInjections, null, GLOBAL_UNIQUE_ID, classLoader).build(JndiEncBuilder.JndiScope.global);
- Context appJndiContext = new JndiEncBuilder(appInfo.appJndiEnc, appInjections, appInfo.appId, appInfo.appId, classLoader).build(JndiEncBuilder.JndiScope.app);
+ Context globalJndiContext = new JndiEncBuilder(appInfo.globalJndiEnc, appInjections, null, null, GLOBAL_UNIQUE_ID, classLoader).build(JndiEncBuilder.JndiScope.global);
+ Context appJndiContext = new JndiEncBuilder(appInfo.appJndiEnc, appInjections, appInfo.appId, null, appInfo.appId, classLoader).build(JndiEncBuilder.JndiScope.app);
try {
// Generate the cmp2/cmp1 concrete subclasses
@@ -716,7 +716,7 @@ public class Assembler extends Assembler
List<Injection> injections = injectionBuilder.buildInjections(clientInfo.jndiEnc);
// build the enc
- JndiEncBuilder jndiEncBuilder = new JndiEncBuilder(clientInfo.jndiEnc, injections, "Bean", clientInfo.moduleId, clientInfo.uniqueId, classLoader, appContext);
+ JndiEncBuilder jndiEncBuilder = new JndiEncBuilder(clientInfo.jndiEnc, injections, "Bean", clientInfo.moduleId, null, clientInfo.uniqueId, classLoader, appContext);
// if there is at least a remote client classes
// or if there is no local client classes
// then, we can set the client flag
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbJarBuilder.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbJarBuilder.java?rev=1129786&r1=1129785&r2=1129786&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbJarBuilder.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbJarBuilder.java Tue May 31 16:31:19 2011
@@ -49,7 +49,7 @@ public class EjbJarBuilder {
InjectionBuilder injectionBuilder = new InjectionBuilder(context.getClassLoader());
List<Injection> moduleInjections = injectionBuilder.buildInjections(ejbJar.moduleJndiEnc);
moduleInjections.addAll(appInjections);
- Context moduleJndiContext = new JndiEncBuilder(ejbJar.moduleJndiEnc, moduleInjections, ejbJar.moduleId, ejbJar.uniqueId, context.getClassLoader()).build(JndiEncBuilder.JndiScope.module);
+ Context moduleJndiContext = new JndiEncBuilder(ejbJar.moduleJndiEnc, moduleInjections, ejbJar.moduleId, ejbJar.moduleUri, ejbJar.uniqueId, context.getClassLoader()).build(JndiEncBuilder.JndiScope.module);
HashMap<String, BeanContext> deployments = new HashMap<String, BeanContext>();
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EnterpriseBeanBuilder.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EnterpriseBeanBuilder.java?rev=1129786&r1=1129785&r2=1129786&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EnterpriseBeanBuilder.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EnterpriseBeanBuilder.java Tue May 31 16:31:19 2011
@@ -138,7 +138,7 @@ class EnterpriseBeanBuilder {
}
// build the enc
- JndiEncBuilder jndiEncBuilder = new JndiEncBuilder(bean.jndiEnc, injections, transactionType, moduleContext.getId(), moduleContext.getUniqueId(), moduleContext.getClassLoader(), moduleContext.getAppContext());
+ JndiEncBuilder jndiEncBuilder = new JndiEncBuilder(bean.jndiEnc, injections, transactionType, moduleContext.getId(), null, moduleContext.getUniqueId(), moduleContext.getClassLoader(), moduleContext.getAppContext());
Context compJndiContext = jndiEncBuilder.build(JndiEncBuilder.JndiScope.comp);
bind(compJndiContext, "module", moduleContext.getModuleJndiContext());
bind(compJndiContext, "app", moduleContext.getAppContext().getAppJndiContext());
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java?rev=1129786&r1=1129785&r2=1129786&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java Tue May 31 16:31:19 2011
@@ -91,6 +91,7 @@ public class JndiEncBuilder {
private final boolean beanManagedTransactions;
private final JndiEncInfo jndiEnc;
private final URI moduleUri;
+ private final String moduleId;
private final String uniqueId;
private final List<Injection> injections;
private final ClassLoader classLoader;
@@ -99,21 +100,19 @@ public class JndiEncBuilder {
private boolean useCrossClassLoaderRef = true;
private boolean client = false;
- public JndiEncBuilder(JndiEncInfo jndiEnc, List<Injection> injections, String moduleId, String uniqueId, ClassLoader classLoader) throws OpenEJBException {
- this(jndiEnc, injections, null, moduleId, uniqueId, classLoader, null);
+ public JndiEncBuilder(JndiEncInfo jndiEnc, List<Injection> injections, String moduleId, URI moduleUri, String uniqueId, ClassLoader classLoader) throws OpenEJBException {
+ this(jndiEnc, injections, null, moduleId, moduleUri, uniqueId, classLoader, null);
}
- public JndiEncBuilder(JndiEncInfo jndiEnc, List<Injection> injections, String transactionType, String moduleId, String uniqueId, ClassLoader classLoader, AppContext appContext) throws OpenEJBException {
+ public JndiEncBuilder(JndiEncInfo jndiEnc, List<Injection> injections, String transactionType, String moduleId, URI moduleUri, String uniqueId, ClassLoader classLoader, AppContext appContext) throws OpenEJBException {
this.jndiEnc = jndiEnc;
this.injections = injections;
this.appContext = appContext;
beanManagedTransactions = transactionType != null && transactionType.equalsIgnoreCase("Bean");
- try {
- moduleUri = moduleId == null? null: new URI(moduleId);
- } catch (URISyntaxException e) {
- throw new OpenEJBException(e);
- }
+ this.moduleId = moduleId;
+ this.moduleUri = moduleUri;
+
this.uniqueId = uniqueId;
this.classLoader = classLoader;
}
@@ -460,8 +459,8 @@ public class JndiEncBuilder {
}
private void addSpecialModuleBindings(Map<String, Object> bindings) {
- if (moduleUri != null) {
- bindings.put("module/ModuleName", moduleUri.toString());
+ if (moduleId != null) {
+ bindings.put("module/ModuleName", moduleId);
}
// ensure the bindings will be non-empty
if (bindings.isEmpty()) {
@@ -470,8 +469,8 @@ public class JndiEncBuilder {
}
private void addSpecialAppBindings(Map<String, Object> bindings) {
- if (moduleUri != null) {
- bindings.put("app/AppName", moduleUri.toString());
+ if (moduleId != null) {
+ bindings.put("app/AppName", moduleId);
}
// ensure the bindings will be non-empty
if (bindings.isEmpty()) {
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiResourceInjectionService.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiResourceInjectionService.java?rev=1129786&r1=1129785&r2=1129786&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiResourceInjectionService.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiResourceInjectionService.java Tue May 31 16:31:19 2011
@@ -99,7 +99,7 @@ public class CdiResourceInjectionService
cdiInfo.setInjections(injections);
// TODO: handle app/global/module namespaces?
- JndiEncBuilder encBuilder = new JndiEncBuilder(jndiEnc, injections, appModule.appId, appModule.appId, classLoader);
+ JndiEncBuilder encBuilder = new JndiEncBuilder(jndiEnc, injections, appModule.appId, null, appModule.appId, classLoader);
this.contexts.put(cdiInfo, encBuilder.build(JndiEncBuilder.JndiScope.comp));
}
}