[openejb-scm] openejb/modules/core/src/java/org/openejb/corba/util Util.java

[dblevins]

dblevins    2005/09/29 04:02:24

  Modified:    modules/core/src/java/org/openejb/corba/util Tag: v2_0_G1M5
                        Util.java
  Log:

  Merging head back into v2_0_G1M5 branch
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.20.2.1  +6 -6      
openejb/modules/core/src/java/org/openejb/corba/util/Util.java
  
  Index: Util.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/corba/util/Util.java,v
  retrieving revision 1.20
  retrieving revision 1.20.2.1
  diff -u -r1.20 -r1.20.2.1
  --- Util.java 11 Sep 2005 20:40:29 -0000      1.20
  +++ Util.java 29 Sep 2005 08:02:24 -0000      1.20.2.1
  @@ -69,11 +69,11 @@
   import javax.naming.NamingException;
   import javax.rmi.PortableRemoteObject;
   
  -import org.bouncycastle.asn1.DERInputStream;
  -import org.bouncycastle.asn1.DERObjectIdentifier;
  -import org.bouncycastle.asn1.DEROutputStream;
  -import org.bouncycastle.asn1.x509.GeneralName;
  -import org.bouncycastle.asn1.x509.X509Name;
  +import org.apache.geronimo.util.asn1.DERInputStream;
  +import org.apache.geronimo.util.asn1.DERObjectIdentifier;
  +import org.apache.geronimo.util.asn1.DEROutputStream;
  +import org.apache.geronimo.util.asn1.x509.GeneralName;
  +import org.apache.geronimo.util.asn1.x509.X509Name;
   import org.omg.CORBA.Any;
   import org.omg.CORBA.ORB;
   import org.omg.CORBA.UserException;