geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r436917 - in /geronimo/sandbox/plugins/global-jndi/src: java/org/apache/geronimo/gjndi/KernelContextGBean.java test/org/apache/geronimo/gjndi/JavaCompContextTest.java
Date Fri, 25 Aug 2006 19:37:55 GMT
Author: dain
Date: Fri Aug 25 12:37:53 2006
New Revision: 436917

URL: http://svn.apache.org/viewvc?rev=436917&view=rev
Log:
Updated to newest xbean-naming api changes

Modified:
    geronimo/sandbox/plugins/global-jndi/src/java/org/apache/geronimo/gjndi/KernelContextGBean.java
    geronimo/sandbox/plugins/global-jndi/src/test/org/apache/geronimo/gjndi/JavaCompContextTest.java

Modified: geronimo/sandbox/plugins/global-jndi/src/java/org/apache/geronimo/gjndi/KernelContextGBean.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/plugins/global-jndi/src/java/org/apache/geronimo/gjndi/KernelContextGBean.java?rev=436917&r1=436916&r2=436917&view=diff
==============================================================================
--- geronimo/sandbox/plugins/global-jndi/src/java/org/apache/geronimo/gjndi/KernelContextGBean.java
(original)
+++ geronimo/sandbox/plugins/global-jndi/src/java/org/apache/geronimo/gjndi/KernelContextGBean.java
Fri Aug 25 12:37:53 2006
@@ -27,20 +27,21 @@
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.lifecycle.LifecycleAdapter;
 import org.apache.geronimo.kernel.lifecycle.LifecycleListener;
-import org.apache.xbean.naming.context.UnmodifiableContext;
+import org.apache.xbean.naming.context.ContextAccess;
+import org.apache.xbean.naming.context.WritableContext;
 
-import javax.naming.NamingException;
 import javax.naming.Name;
+import javax.naming.NamingException;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.Map;
 import java.util.Iterator;
+import java.util.Map;
 import java.util.Set;
 
 /**
  * @version $Rev$ $Date$
  */
-public class KernelContextGBean extends UnmodifiableContext implements GBeanLifecycle {
+public class KernelContextGBean extends WritableContext implements GBeanLifecycle {
     private static final Log log = LogFactory.getLog(KernelContextGBean.class);
 
     private final Kernel kernel;
@@ -49,7 +50,7 @@
     private final Map bindingsByAbstractName = new HashMap();
 
     public KernelContextGBean(String nameInNamespace, AbstractNameQuery abstractNameQuery,
Kernel kernel) throws NamingException {
-        super(nameInNamespace, Collections.EMPTY_MAP, false);
+        super(nameInNamespace, Collections.EMPTY_MAP, ContextAccess.UNMODIFIABLE, false);
         this.abstractNameQuery = abstractNameQuery;
         this.kernel = kernel;
     }

Modified: geronimo/sandbox/plugins/global-jndi/src/test/org/apache/geronimo/gjndi/JavaCompContextTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/plugins/global-jndi/src/test/org/apache/geronimo/gjndi/JavaCompContextTest.java?rev=436917&r1=436916&r2=436917&view=diff
==============================================================================
--- geronimo/sandbox/plugins/global-jndi/src/test/org/apache/geronimo/gjndi/JavaCompContextTest.java
(original)
+++ geronimo/sandbox/plugins/global-jndi/src/test/org/apache/geronimo/gjndi/JavaCompContextTest.java
Fri Aug 25 12:37:53 2006
@@ -35,15 +35,16 @@
 import java.util.Collections;
 
 import org.apache.geronimo.naming.java.RootContext;
-import org.apache.xbean.naming.context.UnmodifiableContext;
 import org.apache.xbean.naming.context.ImmutableContext;
+import org.apache.xbean.naming.context.WritableContext;
+import org.apache.xbean.naming.context.ContextAccess;
 import org.apache.xbean.naming.global.GlobalContextManager;
 
 /**
  * @version $Rev$ $Date$
  */
 public class JavaCompContextTest extends TestCase {
-    protected UnmodifiableContext readOnlyContext;
+    protected Context readOnlyContext;
     protected Properties syntax;
     protected Map envBinding;
     protected Context initialContext;
@@ -183,7 +184,7 @@
         bindings.put("env/here/there/anywhere", "long name");
         bindings.put("env/link", link);
 
-        readOnlyContext = new UnmodifiableContext(bindings);
+        readOnlyContext = new WritableContext("", bindings, ContextAccess.UNMODIFIABLE);
 
         envBinding = new HashMap();
         envBinding.put("hello", "Hello");



Mime
View raw message