You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by da...@apache.org on 2007/01/24 05:05:18 UTC
svn commit: r499245 - in
/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb:
alt/config/GeronimoMappedName.java assembler/classic/JndiEncBuilder.java
core/ivm/naming/IntraVmJndiReference.java
Author: dain
Date: Tue Jan 23 20:05:17 2007
New Revision: 499245
URL: http://svn.apache.org/viewvc?view=rev&rev=499245
Log:
Add helper method and new entry point for geronimo integration
Modified:
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/GeronimoMappedName.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IntraVmJndiReference.java
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/GeronimoMappedName.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/GeronimoMappedName.java?view=diff&rev=499245&r1=499244&r2=499245
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/GeronimoMappedName.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/GeronimoMappedName.java Tue Jan 23 20:05:17 2007
@@ -60,14 +60,6 @@
}
for (EnterpriseBean enterpriseBean : ejbJar.getEnterpriseBeans()) {
- for (EjbRef ref : enterpriseBean.getEjbRef()) {
- String refName = ref.getEjbRefName();
- ref.setMappedName(MAPPED_NAME_PREFIX + refName);
- }
- for (EjbLocalRef ref : enterpriseBean.getEjbLocalRef()) {
- String refName = ref.getEjbRefName();
- ref.setMappedName(MAPPED_NAME_PREFIX + refName);
- }
for (MessageDestinationRef ref : enterpriseBean.getMessageDestinationRef()) {
String refName = ref.getMessageDestinationRefName();
ref.setMappedName(MAPPED_NAME_PREFIX + refName);
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java?view=diff&rev=499245&r1=499244&r2=499245
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java Tue Jan 23 20:05:17 2007
@@ -103,6 +103,38 @@
}
public Context build() throws OpenEJBException {
+ Map<String, Object> bindings = buildMap();
+
+ Context context;
+ if (System.getProperty("openejb.naming","ivm").equals("xbean")) {
+ context = createXBeanWritableContext(bindings);
+ } else {
+ context = createIvmContext();
+
+ // bind the bindings
+ for (Iterator iterator = bindings.entrySet().iterator(); iterator.hasNext();) {
+ Map.Entry entry = (Map.Entry) iterator.next();
+ String name = (String) entry.getKey();
+ Object value = entry.getValue();
+ if (value == null) continue;
+ try {
+ Name parsedName = context.getNameParser("").parse(name);
+ for (int i = 1; i < parsedName.size(); i++) {
+ Name contextName = parsedName.getPrefix(i);
+ if (!bindingExists(context, contextName)) {
+ context.createSubcontext(contextName);
+ }
+ }
+ context.bind(name, value);
+ } catch (NamingException e) {
+ throw new org.apache.openejb.SystemException("Unable to bind '" + name + "' into bean's enc.", e);
+ }
+ }
+ }
+ return context;
+ }
+
+ public Map<String, Object> buildMap() throws OpenEJBException {
Map<String, Object> bindings = new HashMap<String, Object>();
// bind TransactionManager
@@ -277,34 +309,7 @@
bindings.put(normalize(referenceInfo.referenceName), wrapReference(reference));
}
}
-
- Context context;
- if (System.getProperty("openejb.naming","ivm").equals("xbean")) {
- context = createXBeanWritableContext(bindings);
- } else {
- context = createIvmContext();
-
- // bind the bindings
- for (Iterator iterator = bindings.entrySet().iterator(); iterator.hasNext();) {
- Map.Entry entry = (Map.Entry) iterator.next();
- String name = (String) entry.getKey();
- Object value = entry.getValue();
- if (value == null) continue;
- try {
- Name parsedName = context.getNameParser("").parse(name);
- for (int i = 1; i < parsedName.size(); i++) {
- Name contextName = parsedName.getPrefix(i);
- if (!bindingExists(context, contextName)) {
- context.createSubcontext(contextName);
- }
- }
- context.bind(name, value);
- } catch (NamingException e) {
- throw new org.apache.openejb.SystemException("Unable to bind '" + name + "' into bean's enc.", e);
- }
- }
- }
- return context;
+ return bindings;
}
private WritableContext createXBeanWritableContext(Map bindings) {
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IntraVmJndiReference.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IntraVmJndiReference.java?view=diff&rev=499245&r1=499244&r2=499245
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IntraVmJndiReference.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/IntraVmJndiReference.java Tue Jan 23 20:05:17 2007
@@ -29,6 +29,10 @@
this.jndiName = jndiName;
}
+ public String getJndiName() {
+ return jndiName;
+ }
+
public Object getObject() throws NamingException {
ContainerSystem containerSystem = SystemInstance.get().getComponent(ContainerSystem.class);
return containerSystem.getJNDIContext().lookup(jndiName);