geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jboy...@apache.org
Subject cvs commit: incubator-geronimo/modules/core/src/test/org/apache/geronimo/naming/java ThreadContextTest.java
Date Thu, 30 Oct 2003 02:00:07 GMT
jboynes     2003/10/29 18:00:07

  Modified:    modules/core/src/java/org/apache/geronimo/naming/java
                        RootContext.java
  Added:       modules/core/src/test/org/apache/geronimo/naming/java
                        ThreadContextTest.java
  Log:
  Allow component context to be inherited by threads
  
  Revision  Changes    Path
  1.4       +2 -2      incubator-geronimo/modules/core/src/java/org/apache/geronimo/naming/java/RootContext.java
  
  Index: RootContext.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/naming/java/RootContext.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- RootContext.java	4 Sep 2003 05:16:17 -0000	1.3
  +++ RootContext.java	30 Oct 2003 02:00:07 -0000	1.4
  @@ -67,7 +67,7 @@
    * @version $Revision$ $Date$
    */
   public class RootContext extends ReadOnlyContext {
  -    private static ThreadLocal compContext = new ThreadLocal();
  +    private static InheritableThreadLocal compContext = new InheritableThreadLocal();
   
       RootContext(Hashtable env) {
           super(env);
  
  
  
  1.1                  incubator-geronimo/modules/core/src/test/org/apache/geronimo/naming/java/ThreadContextTest.java
  
  Index: ThreadContextTest.java
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2003 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution,
   *    if any, must include the following acknowledgment:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowledgment may appear in the software itself,
   *    if and wherever such third-party acknowledgments normally appear.
   *
   * 4. The names "Apache" and "Apache Software Foundation" and
   *    "Apache Geronimo" must not be used to endorse or promote products
   *    derived from this software without prior written permission. For
   *    written permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache",
   *    "Apache Geronimo", nor may "Apache" appear in their name, without
   *    prior written permission of the Apache Software Foundation.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   *
   * ====================================================================
   */
  package org.apache.geronimo.naming.java;
  
  import java.util.HashMap;
  import java.util.Iterator;
  import java.util.Map;
  import java.util.Properties;
  import java.util.NoSuchElementException;
  import java.util.Hashtable;
  
  import javax.naming.Binding;
  import javax.naming.CompositeName;
  import javax.naming.CompoundName;
  import javax.naming.Context;
  import javax.naming.InitialContext;
  import javax.naming.NameClassPair;
  import javax.naming.NamingEnumeration;
  import javax.naming.NamingException;
  import javax.naming.LinkRef;
  
  import org.apache.geronimo.common.StopWatch;
  
  import junit.framework.TestCase;
  
  /**
   * Test component context can be inherited by Threads spawned by
   * a component. This is required for Application Client and Servlets;
   * it is not applicable to EJBs as they are not allowed to create Threads. 
   *
   * @version $Revision: 1.1 $ $Date: 2003/10/30 02:00:07 $
   */
  public class ThreadContextTest extends TestCase {
      private Map compBinding;
      private Map envBinding;
  
      public void testThreadInheritence() throws Exception {
          RootContext.setComponentContext(new ReadOnlyContext(compBinding));
          Thread worker = new Thread() {
              public void run() {
                  try {
                      assertEquals("Hello", new InitialContext().lookup("java:comp/env/hello"));
                  } catch (NamingException e) {
                      fail(e.getMessage());
                  }
              }
          };
          worker.start();
          worker.join();
      }
  
      protected void setUp() throws Exception {
          super.setUp();
  
          compBinding = new HashMap();
  
          envBinding = new HashMap();
          envBinding.put("hello", "Hello");
          envBinding.put("world", "Hello World");
          envBinding.put("link", new LinkRef("java:comp/env/hello"));
          compBinding.put("env", new ReadOnlyContext(envBinding));
      }
  }
  
  
  

Mime
View raw message