svn commit: r1295413 - in /openejb/trunk/openejb: container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ container/openejb-core/src/main/java/org/apache/openejb/util/ tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/

[db...@apache.org]

Author: dblevins
Date: Thu Mar  1 04:26:59 2012
New Revision: 1295413

URL: http://svn.apache.org/viewvc?rev=1295413&view=rev
Log:
Cleaner names
TOMEE-146

Added:
    openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/Contexts.java
      - copied, changed from r1295185, openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/ContextUtil.java
Removed:
    openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/ContextUtil.java
Modified:
    openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
    openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatJndiBuilder.java

Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java?rev=1295413&r1=1295412&r2=1295413&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java Thu Mar  1 04:26:59 2012
@@ -27,7 +27,6 @@ import org.apache.openejb.BeanContext;
 import org.apache.openejb.BeanType;
 import org.apache.openejb.ClassLoaderUtil;
 import org.apache.openejb.Container;
-import org.apache.openejb.Core;
 import org.apache.openejb.DuplicateDeploymentIdException;
 import org.apache.openejb.Injection;
 import org.apache.openejb.JndiConstants;
@@ -74,7 +73,7 @@ import org.apache.openejb.spi.Applicatio
 import org.apache.openejb.spi.ContainerSystem;
 import org.apache.openejb.spi.SecurityService;
 import org.apache.openejb.util.AsmParameterNameLoader;
-import org.apache.openejb.util.ContextUtil;
+import org.apache.openejb.util.Contexts;
 import org.apache.openejb.util.LogCategory;
 import org.apache.openejb.util.Logger;
 import org.apache.openejb.util.Messages;
@@ -862,7 +861,7 @@ public class Assembler extends Assembler
                 }
 
                 // a bit weird but just to be consistent if user doesn't lookup directly the resource
-                Context lastContext = ContextUtil.mkdirs(containerSystemContext, path);
+                Context lastContext = Contexts.createSubcontexts(containerSystemContext, path);
                 try {
                     lastContext.bind(path.substring(path.lastIndexOf("/") + 1, path.length()), value.getValue());
                 } catch (NameAlreadyBoundException nabe) {

Copied: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/Contexts.java (from r1295185, openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/ContextUtil.java)
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/Contexts.java?p2=openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/Contexts.java&p1=openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/ContextUtil.java&r1=1295185&r2=1295413&rev=1295413&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/ContextUtil.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/Contexts.java Thu Mar  1 04:26:59 2012
@@ -20,12 +20,12 @@ package org.apache.openejb.util;
 import javax.naming.Context;
 import javax.naming.NamingException;
 
-public class ContextUtil {
-    private ContextUtil() {
+public class Contexts {
+    private Contexts() {
         // no-op
     }
 
-    public static Context mkdirs(Context context, String key) {
+    public static Context createSubcontexts(Context context, String key) {
         final String[] parts = key.split("/");
 
         int i = 0;

Modified: openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatJndiBuilder.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatJndiBuilder.java?rev=1295413&r1=1295412&r2=1295413&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatJndiBuilder.java (original)
+++ openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatJndiBuilder.java Thu Mar  1 04:26:59 2012
@@ -69,7 +69,7 @@ import org.apache.openejb.loader.SystemI
 import org.apache.openejb.persistence.JtaEntityManager;
 import org.apache.openejb.persistence.JtaEntityManagerRegistry;
 import org.apache.openejb.spi.ContainerSystem;
-import org.apache.openejb.util.ContextUtil;
+import org.apache.openejb.util.Contexts;
 import org.apache.tomee.common.EjbFactory;
 import org.apache.tomee.common.EnumFactory;
 import org.apache.tomee.common.LookupFactory;
@@ -204,7 +204,7 @@ public class TomcatJndiBuilder {
                 try {
                     final String key = entry.getKey();
                     Object value = normalize(entry.getValue());
-                    ContextUtil.mkdirs(root, key);
+                    Contexts.createSubcontexts(root, key);
                     root.rebind(key, value);
                 } catch (NamingException e) {
                     e.printStackTrace();