maguro      2005/03/28 22:55:16

  Modified:    
modules/openejb-builder/src/test/org/openejb/corba/security/config/tss
                        TSSConfigEditorTest.java
  Log:

  Removed reliance on tmporb-ssl
  
  Revision  Changes    Path
  1.7       +52 -50    
openejb/modules/openejb-builder/src/test/org/openejb/corba/security/config/tss/TSSConfigEditorTest.java
  
  Index: TSSConfigEditorTest.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/test/org/openejb/corba/security/config/tss/TSSConfigEditorTest.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- TSSConfigEditorTest.java  27 Mar 2005 02:04:42 -0000      1.6
  +++ TSSConfigEditorTest.java  29 Mar 2005 03:55:16 -0000      1.7
  @@ -49,11 +49,13 @@
   import java.util.Properties;
   
   import junit.framework.TestCase;
  -import org.apache.geronimo.common.DeploymentException;
  -import org.apache.geronimo.pool.ThreadPool;
   import org.apache.xmlbeans.XmlCursor;
   import org.apache.xmlbeans.XmlException;
   import org.apache.xmlbeans.XmlObject;
  +
  +import org.apache.geronimo.common.DeploymentException;
  +import org.apache.geronimo.pool.ThreadPool;
  +
   import org.openejb.corba.CORBABean;
   
   
  @@ -62,26 +64,26 @@
    */
   public class TSSConfigEditorTest extends TestCase {
       private static final String TEST_XML1 = "<foo:tss 
xmlns:foo=\"http://www.openejb.org/xml/ns/corba-tss-config_1_0\";>\n" +
  -            "                <foo:SSL port=\"443\" 
hostname=\"corba.apache.org\">\n" +
  -            "                    <foo:supports>Integrity Confidentiality 
EstablishTrustInTarget EstablishTrustInClient</foo:supports>\n" +
  -            "                    <foo:requires>Integrity</foo:requires>\n" +
  -            "                </foo:SSL>\n" +
  -            "                <foo:compoundSecMechTypeList>\n" +
  -            "                    <foo:compoundSecMech>\n" +
  -            "                    </foo:compoundSecMech>\n" +
  -            "                </foo:compoundSecMechTypeList>\n" +
  -            "            </foo:tss>";
  +                                            "                <foo:SSL 
port=\"443\" hostname=\"corba.apache.org\">\n" +
  +                                            "                    
<foo:supports>Integrity Confidentiality EstablishTrustInTarget 
EstablishTrustInClient</foo:supports>\n" +
  +                                            "                    
<foo:requires>Integrity</foo:requires>\n" +
  +                                            "                </foo:SSL>\n" +
  +                                            "                
<foo:compoundSecMechTypeList>\n" +
  +                                            "                    
<foo:compoundSecMech>\n" +
  +                                            "                    
</foo:compoundSecMech>\n" +
  +                                            "                
</foo:compoundSecMechTypeList>\n" +
  +                                            "            </foo:tss>";
       private static final String TEST_XML2 = "<foo:tss inherit=\"true\" 
xmlns:foo=\"http://www.openejb.org/xml/ns/corba-tss-config_1_0\"/>";
       private static final String TEST_XML3 = "<tss 
xmlns=\"http://www.openejb.org/xml/ns/corba-tss-config_1_0\";>\n" +
  -            "                <SSL port=\"443\">\n" +
  -            "                    <supports>BAD_ENUM Integrity 
Confidentiality EstablishTrustInTarget EstablishTrustInClient</supports>\n" +
  -            "                    <requires>Integrity</requires>\n" +
  -            "                </SSL>\n" +
  -            "                <compoundSecMechTypeList>\n" +
  -            "                    <compoundSecMech>\n" +
  -            "                    </compoundSecMech>\n" +
  -            "                </compoundSecMechTypeList>\n" +
  -            "            </tss>";
  +                                            "                <SSL 
port=\"443\">\n" +
  +                                            "                    
<supports>BAD_ENUM Integrity Confidentiality EstablishTrustInTarget 
EstablishTrustInClient</supports>\n" +
  +                                            "                    
<requires>Integrity</requires>\n" +
  +                                            "                </SSL>\n" +
  +                                            "                
<compoundSecMechTypeList>\n" +
  +                                            "                    
<compoundSecMech>\n" +
  +                                            "                    
</compoundSecMech>\n" +
  +                                            "                
</compoundSecMechTypeList>\n" +
  +                                            "            </tss>";
   
   
       private XmlObject getXmlObject(String xmlString) throws XmlException {
  @@ -126,39 +128,39 @@
   
   
       private static final String propString = "\n" +
  -            "\n" +
  -            "            
org.omg.PortableInterceptor.ORBInitializerClass.org.openejb.corba.transaction.TransactionInitializer\n"
 +
  -            "            
org.omg.PortableInterceptor.ORBInitializerClass.org.openejb.corba.security.SecurityInitializer\n"
 +
  -            "            
org.omg.PortableInterceptor.ORBInitializerClass.org.openejb.corba.openorb.OpenORBInitializer\n"
 +
  -            "\n" +
  -            "            Xopenorb.debug.level=HIGH\n" +
  -            "            Xopenorb.debug.trace=DEBUG\n" +
  -            "\n" +
  -            "            
iiop.TransportServerInitializerClass=org.openorb.orb.ssl.SSLTransportServerInitializer\n"
 +
  -            "\n" +
  -            "            secure.server.allowUnsecure=false";
  +                                             "\n" +
  +                                             "            
org.omg.PortableInterceptor.ORBInitializerClass.org.openejb.corba.transaction.TransactionInitializer\n"
 +
  +                                             "            
org.omg.PortableInterceptor.ORBInitializerClass.org.openejb.corba.security.SecurityInitializer\n"
 +
  +                                             "            
org.omg.PortableInterceptor.ORBInitializerClass.org.openejb.corba.openorb.OpenORBInitializer\n"
 +
  +                                             "\n" +
  +                                             "            
Xopenorb.debug.level=HIGH\n" +
  +                                             "            
Xopenorb.debug.trace=DEBUG\n" +
  +                                             "\n" +
  +                                             "            
iiop.TransportServerInitializerClass=org.openorb.orb.ssl.SSLTransportServerInitializer\n"
 +
  +                                             "\n" +
  +                                             "            
secure.server.allowUnsecure=false";
       private static final String TEST_XML4 = "            <tss:tss 
xmlns:tss=\"http://www.openejb.org/xml/ns/corba-tss-config_1_0\"; 
xmlns:sec=\"http://geronimo.apache.org/xml/ns/security\";>\n" +
  -            "                <tss:default-principal 
realm-name=\"public-properties-realm\">\n" +
  -            "                    <sec:principal 
class=\"org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal\" 
name=\"guest\"/>\n" +
  -            "                </tss:default-principal>\n" +
  -            "                <tss:SSL port=\"6685\" 
hostname=\"localhost\">\n" +
  -            "                    <tss:supports>Integrity Confidentiality 
EstablishTrustInTarget EstablishTrustInClient</tss:supports>\n" +
  -            "                    <tss:requires>Integrity Confidentiality 
EstablishTrustInClient</tss:requires>\n" +
  -            "                </tss:SSL>\n" +
  -            "                <tss:compoundSecMechTypeList>\n" +
  -            "                    <tss:compoundSecMech>\n" +
  -            "                        <tss:GSSUP 
targetName=\"geronimo-properties-realm\"/>\n" +
  -            "                        <tss:sasMech>\n" +
  -            "                            <tss:identityTokenTypes>ITTAbsent 
ITTAnonymous ITTPrincipalName</tss:identityTokenTypes>\n" +
  -            "                        </tss:sasMech>\n" +
  -            "                    </tss:compoundSecMech>\n" +
  -            "                </tss:compoundSecMechTypeList>\n" +
  -            "            </tss:tss>";
  +                                            "                
<tss:default-principal realm-name=\"public-properties-realm\">\n" +
  +                                            "                    
<sec:principal 
class=\"org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal\" 
name=\"guest\"/>\n" +
  +                                            "                
</tss:default-principal>\n" +
  +                                            "                <tss:SSL 
port=\"6685\" hostname=\"localhost\">\n" +
  +                                            "                    
<tss:supports>Integrity Confidentiality EstablishTrustInTarget 
EstablishTrustInClient</tss:supports>\n" +
  +                                            "                    
<tss:requires>Integrity Confidentiality 
EstablishTrustInClient</tss:requires>\n" +
  +                                            "                </tss:SSL>\n" +
  +                                            "                
<tss:compoundSecMechTypeList>\n" +
  +                                            "                    
<tss:compoundSecMech>\n" +
  +                                            "                        
<tss:GSSUP targetName=\"geronimo-properties-realm\"/>\n" +
  +                                            "                        
<tss:sasMech>\n" +
  +                                            "                            
<tss:identityTokenTypes>ITTAbsent ITTAnonymous 
ITTPrincipalName</tss:identityTokenTypes>\n" +
  +                                            "                        
</tss:sasMech>\n" +
  +                                            "                    
</tss:compoundSecMech>\n" +
  +                                            "                
</tss:compoundSecMechTypeList>\n" +
  +                                            "            </tss:tss>";
   
       public void testCORBABean() throws Exception {
           ClassLoader classLoader = getClass().getClassLoader();
           ThreadPool threadPool = new ThreadPool(10, "foo", 1000, classLoader);
  -        String configAdapter = 
"org.openejb.corba.openorb.OpenORBConfigAdapter";
  +        String configAdapter = 
"org.openejb.corba.sunorb.SunORBConfigAdapter";
           CORBABean corbaBean = new CORBABean(configAdapter, classLoader, 
threadPool, null, null);
           ArrayList args = new ArrayList();
           corbaBean.setArgs(args);
  
  
  

Reply via email to