geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject cvs commit: incubator-geronimo/modules/naming/src/test/org/apache/geronimo/naming/deployment ContextBuilderTest.java
Date Sun, 15 Feb 2004 16:33:44 GMT
djencks     2004/02/15 08:33:44

  Modified:    modules/jetty/src/java/org/apache/geronimo/jetty/deployment
                        AbstractModule.java JettyModule.java
                        UnpackedModule.java WARConfigurationFactory.java
               modules/naming/src/java/org/apache/geronimo/naming/deployment
                        ComponentContextBuilder.java
               modules/naming/src/test/org/apache/geronimo/naming/deployment
                        ContextBuilderTest.java
  Added:       modules/naming/src/java/org/apache/geronimo/naming/proxy
                        CFContainer.java EJBContainer.java
                        ExternalProxy.java ProxyFactory.java
                        ProxyManager.java
  Removed:     modules/naming/src/java/org/apache/geronimo/naming/java
                        ProxyFactory.java
  Log:
  framework for connecting 'external' proxies bound in jndi to 'internal' proxies supplied
by ejb and connection factory containers
  
  Revision  Changes    Path
  1.7       +2 -2      incubator-geronimo/modules/jetty/src/java/org/apache/geronimo/jetty/deployment/AbstractModule.java
  
  Index: AbstractModule.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/jetty/src/java/org/apache/geronimo/jetty/deployment/AbstractModule.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- AbstractModule.java	14 Feb 2004 18:49:43 -0000	1.6
  +++ AbstractModule.java	15 Feb 2004 16:33:44 -0000	1.7
  @@ -75,7 +75,7 @@
   import org.apache.geronimo.jetty.JettyWebApplicationContext;
   import org.apache.geronimo.kernel.Kernel;
   import org.apache.geronimo.naming.deployment.ComponentContextBuilder;
  -import org.apache.geronimo.naming.java.ProxyFactory;
  +import org.apache.geronimo.naming.proxy.ProxyFactory;
   import org.apache.geronimo.xbeans.geronimo.jetty.JettyWebAppType;
   import org.apache.geronimo.xbeans.j2ee.WebAppType;
   import org.apache.geronimo.xbeans.j2ee.WebAppDocument;
  
  
  
  1.13      +2 -2      incubator-geronimo/modules/jetty/src/java/org/apache/geronimo/jetty/deployment/JettyModule.java
  
  Index: JettyModule.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/jetty/src/java/org/apache/geronimo/jetty/deployment/JettyModule.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- JettyModule.java	14 Feb 2004 18:49:43 -0000	1.12
  +++ JettyModule.java	15 Feb 2004 16:33:44 -0000	1.13
  @@ -65,7 +65,7 @@
   
   import org.apache.geronimo.deployment.ConfigurationCallback;
   import org.apache.geronimo.deployment.DeploymentException;
  -import org.apache.geronimo.naming.java.ProxyFactory;
  +import org.apache.geronimo.naming.proxy.ProxyFactory;
   import org.apache.geronimo.xbeans.geronimo.jetty.JettyWebAppType;
   
   /**
  
  
  
  1.5       +2 -2      incubator-geronimo/modules/jetty/src/java/org/apache/geronimo/jetty/deployment/UnpackedModule.java
  
  Index: UnpackedModule.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/jetty/src/java/org/apache/geronimo/jetty/deployment/UnpackedModule.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- UnpackedModule.java	14 Feb 2004 01:50:15 -0000	1.4
  +++ UnpackedModule.java	15 Feb 2004 16:33:44 -0000	1.5
  @@ -59,7 +59,7 @@
   import java.net.URI;
   
   import org.apache.geronimo.deployment.DeploymentException;
  -import org.apache.geronimo.naming.java.ProxyFactory;
  +import org.apache.geronimo.naming.proxy.ProxyFactory;
   import org.apache.geronimo.xbeans.geronimo.jetty.JettyWebAppType;
   
   /**
  
  
  
  1.9       +2 -2      incubator-geronimo/modules/jetty/src/java/org/apache/geronimo/jetty/deployment/WARConfigurationFactory.java
  
  Index: WARConfigurationFactory.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/jetty/src/java/org/apache/geronimo/jetty/deployment/WARConfigurationFactory.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- WARConfigurationFactory.java	14 Feb 2004 01:50:15 -0000	1.8
  +++ WARConfigurationFactory.java	15 Feb 2004 16:33:44 -0000	1.9
  @@ -64,7 +64,7 @@
   import org.apache.geronimo.gbean.GBeanInfo;
   import org.apache.geronimo.gbean.GBeanInfoFactory;
   import org.apache.geronimo.xbeans.geronimo.jetty.JettyWebAppDocument;
  -import org.apache.geronimo.naming.java.ProxyFactory;
  +import org.apache.geronimo.naming.proxy.ProxyFactory;
   import org.apache.xmlbeans.SchemaType;
   import org.apache.xmlbeans.SchemaTypeLoader;
   import org.apache.xmlbeans.XmlBeans;
  
  
  
  1.2       +2 -2      incubator-geronimo/modules/naming/src/java/org/apache/geronimo/naming/deployment/ComponentContextBuilder.java
  
  Index: ComponentContextBuilder.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/naming/src/java/org/apache/geronimo/naming/deployment/ComponentContextBuilder.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ComponentContextBuilder.java	13 Feb 2004 23:41:47 -0000	1.1
  +++ ComponentContextBuilder.java	15 Feb 2004 16:33:44 -0000	1.2
  @@ -75,7 +75,7 @@
   import org.apache.geronimo.xbeans.j2ee.ResourceRefType;
   import org.apache.geronimo.xbeans.j2ee.EjbLinkType;
   import org.apache.geronimo.xbeans.j2ee.MessageDestinationLinkType;
  -import org.apache.geronimo.naming.java.ProxyFactory;
  +import org.apache.geronimo.naming.proxy.ProxyFactory;
   import org.apache.geronimo.naming.java.ReadOnlyContext;
   
   /**
  
  
  
  1.1                  incubator-geronimo/modules/naming/src/java/org/apache/geronimo/naming/proxy/CFContainer.java
  
  Index: CFContainer.java
  ===================================================================
  package org.apache.geronimo.naming.proxy;
  
  /**
   * Interface for connection factory containers.  The id is used by the ProxyManager to correlate
which external proxies
   * should be hooked up with which containers.
   *
   * @version $Revision: 1.1 $ $Date: 2004/02/15 16:33:44 $
   *
   * */
  public interface CFContainer {
      Object getProxy();
      Object getId();
  }
  
  
  
  1.1                  incubator-geronimo/modules/naming/src/java/org/apache/geronimo/naming/proxy/EJBContainer.java
  
  Index: EJBContainer.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.proxy;
  
  /**
   * Interface for ejb containers.  The id is used by the ProxyManager to correlate which
external proxies
   * should be hooked up with which containers.
   *
   * @version $Revision: 1.1 $ $Date: 2004/02/15 16:33:44 $
   *
   * */
  public interface EJBContainer {
      Object getHomeProxy();
      Object getLocalHomeProxy();
      Object getId();
  }
  
  
  
  1.1                  incubator-geronimo/modules/naming/src/java/org/apache/geronimo/naming/proxy/ExternalProxy.java
  
  Index: ExternalProxy.java
  ===================================================================
  package org.apache.geronimo.naming.proxy;
  
  /**
   * ExternalProxies are supplied by the ProxyFactory to the  ReadOnlyContext, and registered
   * with the ProxyManager together with an id.  When a gbean supplying the same id is registered
   * with the ProxyManager, the ProxyManager calls setTarget on the ExternalProxy.  The externalProxy
   * is expected to use the internal proxy supplied to make itself usable.
   *
   * @version $Revision: 1.1 $ $Date: 2004/02/15 16:33:44 $
   *
   * */
  public interface ExternalProxy {
      void setTarget(Object internalProxy);
  }
  
  
  
  1.1                  incubator-geronimo/modules/naming/src/java/org/apache/geronimo/naming/proxy/ProxyFactory.java
  
  Index: ProxyFactory.java
  ===================================================================
  package org.apache.geronimo.naming.proxy;
  
  import javax.naming.NamingException;
  
  /**
   * An instance of ProxyFactory is supplied to the ComponentContextBuilder to let it construct
objects
   * to bind in the ReadOnlyContext.  Using the ProxyManager, these would be ExternalProxies
registered
   * with the ProxyManager.
   *
   * @version $Revision: 1.1 $ $Date: 2004/02/15 16:33:44 $
   *
   * */
  public interface ProxyFactory {
  
      Object getProxy(Class homeInterface, Class remoteInterface, Object targetId) throws
NamingException;
  
      Object getProxy(Class interfaced, Object targetId) throws NamingException;
  }
  
  
  
  1.1                  incubator-geronimo/modules/naming/src/java/org/apache/geronimo/naming/proxy/ProxyManager.java
  
  Index: ProxyManager.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.proxy;
  
  import java.net.URI;
  import java.net.URISyntaxException;
  import java.util.Collection;
  import java.util.HashMap;
  import java.util.HashSet;
  import java.util.Iterator;
  import java.util.Map;
  import java.util.ArrayList;
  
  import javax.naming.NamingException;
  
  import org.apache.geronimo.gbean.GBean;
  import org.apache.geronimo.gbean.GBeanContext;
  import org.apache.geronimo.gbean.ReferenceCollection;
  import org.apache.geronimo.gbean.ReferenceCollectionEvent;
  import org.apache.geronimo.gbean.ReferenceCollectionListener;
  import org.apache.geronimo.gbean.WaitingException;
  
  /**
   * This manages connecting and disconnecting the external proxies supplied by ProxyFactory
   * and bound into the ReadOnlyContext to the "internal" proxies supplied by EJBContainer
and
   * CFContainer implementations.  This class works based on the notifications provided by
GBean
   * Refereneces.  The external proxy has to supply and id for the internal proxy it is interested
in,
   * and the CFContainer and EJBContainer have to supply such an id.  When a referenced container
supplies
   * a previously requested id, they are matched up by a call to the external proxy.
   *
   * @version $Revision: 1.1 $ $Date: 2004/02/15 16:33:44 $
   *
   * */
  public class ProxyManager implements GBean {
  
      private final Map idToEJBRemoteClientsMap = new HashMap();
      private final Map idToEJBLocalClientsMap = new HashMap();
      private final Map idToCFClientsMap = new HashMap();
  
      private final Map idToEJBContainerMap = new HashMap();
      private final Map idToCFContainerMap = new HashMap();
  
      private ReferenceCollection ejbReferences;
      private ReferenceCollection cfReferences;
  
      private final ReferenceCollectionListener ejbContainerListener = new ReferenceCollectionListener()
{
          public void memberAdded(ReferenceCollectionEvent event) {
              EJBContainer container = (EJBContainer) event.getMember();
              ejbRegistered(container);
          }
  
          public void memberRemoved(ReferenceCollectionEvent event) {
              EJBContainer container = (EJBContainer) event.getMember();
              ejbUnregistered(container);
          }
  
      };
  
      private final ReferenceCollectionListener cfContainerListener = new ReferenceCollectionListener()
{
          public void memberAdded(ReferenceCollectionEvent event) {
              CFContainer container = (CFContainer) event.getMember();
              cfRegistered(container);
          }
  
          public void memberRemoved(ReferenceCollectionEvent event) {
              CFContainer container = (CFContainer) event.getMember();
              cfUnregistered(container);
          }
  
      };
  
      public ProxyManager(ReferenceCollection ejbReferences, ReferenceCollection cfReferences)
{
          this.ejbReferences = ejbReferences;
          this.cfReferences = cfReferences;
      }
  
      public URI encode(String remoteKernelId, String objectName, String operation) throws
NamingException {
          try {
              return new URI("proxy", remoteKernelId, '/' + objectName, operation, null);
          } catch (URISyntaxException e) {
              throw (NamingException) new NamingException("Invalid syntax in generated URI").initCause(e);
          }
      }
  
      public void setGBeanContext(GBeanContext context) {
      }
  
      public void doStart() throws WaitingException, Exception {
          ejbReferences.addReferenceCollectionListener(ejbContainerListener);
          Collection copy;
          synchronized (ejbReferences) {
              copy = new ArrayList(ejbReferences);
          }
          for (Iterator iterator = copy.iterator(); iterator.hasNext();) {
              EJBContainer ejbContainer = (EJBContainer) iterator.next();
              ejbRegistered(ejbContainer);
          }
          cfReferences.addReferenceCollectionListener(cfContainerListener);
          synchronized (cfReferences) {
              copy = new ArrayList(cfReferences);
          }
          for (Iterator iterator = copy.iterator(); iterator.hasNext();) {
              CFContainer cfContainer = (CFContainer) iterator.next();
              cfRegistered(cfContainer);
          }
      }
  
      public void doStop() throws WaitingException, Exception {
          Collection copy;
          synchronized (ejbReferences) {
              copy = new ArrayList(ejbReferences);
          }
          for (Iterator iterator = copy.iterator(); iterator.hasNext();) {
              EJBContainer ejbContainer = (EJBContainer) iterator.next();
              ejbUnregistered(ejbContainer);
          }
          ejbReferences.removeReferenceCollectionListener(ejbContainerListener);
          synchronized (cfReferences) {
              copy = new ArrayList(cfReferences);
          }
          for (Iterator iterator = copy.iterator(); iterator.hasNext();) {
              CFContainer cfContainer = (CFContainer) iterator.next();
              cfUnregistered(cfContainer);
          }
          cfReferences.removeReferenceCollectionListener(cfContainerListener);
      }
  
      public void doFail() {
      }
  
      public synchronized void registerEJBLocalProxy(Object id, ExternalProxy proxy) {
          Collection proxies = (Collection)idToEJBLocalClientsMap.get(id);
          if (proxies == null) {
              proxies = new HashSet();
              idToEJBLocalClientsMap.put(id, proxies);
          }
          proxies.add(proxy);
      }
  
      public synchronized void unregisterEJBLocalProxy(Object id, ExternalProxy proxy) {
          Collection proxies = (Collection)idToEJBLocalClientsMap.get(id);
          assert proxies != null;
          proxies.remove(proxy);
      }
  
      public synchronized void registerEJBRemoteProxy(Object id, ExternalProxy proxy) {
          Collection proxies = (Collection)idToEJBRemoteClientsMap.get(id);
          if (proxies == null) {
              proxies = new HashSet();
              idToEJBRemoteClientsMap.put(id, proxies);
          }
          proxies.add(proxy);
      }
  
      public synchronized void unregisterEJBRemoteProxy(Object id, ExternalProxy proxy) {
          Collection proxies = (Collection)idToEJBRemoteClientsMap.get(id);
          assert proxies != null;
          proxies.remove(proxy);
      }
  
      public synchronized void registerCFProxy(Object id, ExternalProxy proxy) {
          Collection proxies = (Collection)idToCFClientsMap.get(id);
          if (proxies == null) {
              proxies = new HashSet();
              idToCFClientsMap.put(id, proxies);
          }
          proxies.add(proxy);
      }
  
      public synchronized void unregisterCFProxy(Object id, ExternalProxy proxy) {
          Collection proxies = (Collection)idToCFClientsMap.get(id);
          assert proxies != null;
          proxies.remove(proxy);
      }
  
      //TODO these private methods are slightly unsafe in that they call out to
      //the ejbcontainer and the external proxy within a synchronized block.
      //I think it is sufficiently unlikely that either call can produce a deadlock
      //that I have left these methods unsafe.
      private synchronized void cfRegistered(CFContainer container) {
          Object id = container.getId();
          idToCFContainerMap.put(id, container);
          Collection clients = (Collection)idToCFClientsMap.get(id);
          if (clients != null) {
              Object internalProxy = container.getProxy();
              for (Iterator iterator = clients.iterator(); iterator.hasNext();) {
                  ExternalProxy proxy = (ExternalProxy) iterator.next();
                  proxy.setTarget(internalProxy);
              }
          }
      }
  
      private synchronized void cfUnregistered(CFContainer container) {
          Object id = container.getId();
          idToCFContainerMap.remove(id);
          Collection clients = (Collection)idToCFClientsMap.get(id);
          if (clients != null) {
              for (Iterator iterator = clients.iterator(); iterator.hasNext();) {
                  ExternalProxy proxy = (ExternalProxy) iterator.next();
                  proxy.setTarget(null);
              }
          }
      }
  
      private synchronized void ejbRegistered(EJBContainer container) {
          Object id = container.getId();
          idToEJBContainerMap.put(id, container);
          Collection remoteClients = (Collection)idToEJBRemoteClientsMap.get(id);
          if (remoteClients != null) {
              Object internalProxy = container.getHomeProxy();
              for (Iterator iterator = remoteClients.iterator(); iterator.hasNext();) {
                  ExternalProxy proxy = (ExternalProxy) iterator.next();
                  proxy.setTarget(internalProxy);
              }
          }
          Collection localClients = (Collection)idToEJBLocalClientsMap.get(id);
          if (localClients != null) {
              Object internalProxy = container.getHomeProxy();
              for (Iterator iterator = localClients.iterator(); iterator.hasNext();) {
                  ExternalProxy proxy = (ExternalProxy) iterator.next();
                  proxy.setTarget(internalProxy);
              }
          }
      }
  
      private synchronized void ejbUnregistered(EJBContainer container) {
          Object id = container.getId();
          idToEJBContainerMap.remove(id);
          Collection remoteClients = (Collection)idToEJBRemoteClientsMap.get(id);
          if (remoteClients != null) {
              for (Iterator iterator = remoteClients.iterator(); iterator.hasNext();) {
                  ExternalProxy proxy = (ExternalProxy) iterator.next();
                  proxy.setTarget(null);
              }
          }
          Collection localClients = (Collection)idToEJBLocalClientsMap.get(id);
          if (localClients != null) {
              for (Iterator iterator = localClients.iterator(); iterator.hasNext();) {
                  ExternalProxy proxy = (ExternalProxy) iterator.next();
                  proxy.setTarget(null);
              }
          }
      }
  
  }
  
  
  
  1.2       +2 -2      incubator-geronimo/modules/naming/src/test/org/apache/geronimo/naming/deployment/ContextBuilderTest.java
  
  Index: ContextBuilderTest.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/naming/src/test/org/apache/geronimo/naming/deployment/ContextBuilderTest.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ContextBuilderTest.java	13 Feb 2004 23:41:47 -0000	1.1
  +++ ContextBuilderTest.java	15 Feb 2004 16:33:44 -0000	1.2
  @@ -74,7 +74,7 @@
   import junit.framework.TestCase;
   import org.apache.geronimo.deployment.DeploymentException;
   import org.apache.geronimo.kernel.jmx.JMXKernel;
  -import org.apache.geronimo.naming.java.ProxyFactory;
  +import org.apache.geronimo.naming.proxy.ProxyFactory;
   import org.apache.geronimo.xbeans.geronimo.GerEjbLocalRefType;
   import org.apache.geronimo.xbeans.geronimo.GerEjbRefType;
   import org.apache.geronimo.xbeans.geronimo.GerMessageDestinationRefType;
  
  
  

Mime
View raw message