Changeset 30081

Show
Ignore:
Timestamp:
02/12/08 16:06:01 (9 months ago)
Author:
bstefanescu
Message:

resolved differences between trunk and branch

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • org.nuxeo.runtime/branches/1.4/nuxeo-runtime/src/main/java/org/nuxeo/runtime/api/login/SecurityDomain.java

    r30071 r30081  
    186186        } else { 
    187187            out.writeInt(entries.length); 
    188             for (int i=0; i<entries.length; i++) { 
    189                 AppConfigurationEntry entry = entries[i]; 
     188            for (AppConfigurationEntry entry : entries) { 
    190189                out.writeObject(entry.getLoginModuleName()); 
    191190                out.writeObject(controlFlagToString(entry.getControlFlag())); 
    192                 Map<String,?> opts = entry.getOptions(); 
     191                Map<String, ?> opts = entry.getOptions(); 
    193192                if (!(opts instanceof Serializable)) { 
    194193                    opts = new HashMap<String, Object>(opts); 

  • org.nuxeo.runtime/branches/1.4/nuxeo-runtime/src/test/java/org/nuxeo/runtime/TestSecurityDomain.java

    r30071 r30081  
    2222import java.io.ByteArrayInputStream; 
    2323import java.io.ByteArrayOutputStream; 
    24 import java.io.IOException; 
    2524import java.io.ObjectInputStream; 
    2625import java.io.ObjectOutputStream; 
    2726import java.util.HashMap; 
     27import java.util.Map; 
    2828 
    2929import javax.security.auth.login.AppConfigurationEntry; 
    3030 
     31import junit.framework.TestCase; 
     32 
    3133import org.nuxeo.runtime.api.login.SecurityDomain; 
    32  
    33 import com.sun.corba.se.impl.orbutil.ObjectWriter; 
    34  
    35 import junit.framework.TestCase; 
    3634 
    3735public class TestSecurityDomain extends TestCase { 
    3836 
    3937    public void testSerialization() { 
    40         String securityDomainName = "nuxeo-test"; 
    41         String name1 = "myLoginModule"; 
    4238        AppConfigurationEntry.LoginModuleControlFlag flag1 = AppConfigurationEntry.LoginModuleControlFlag.REQUISITE; 
    43         HashMap<String,Object> opts1 = new HashMap<String, Object>(); 
     39        Map<String,Object> opts1 = new HashMap<String, Object>(); 
    4440        opts1.put("key1", "value1"); 
    4541        opts1.put("key2", "value2"); 
     42 
     43        String name1 = "myLoginModule"; 
    4644        AppConfigurationEntry entry1 = new  AppConfigurationEntry(name1, flag1, opts1); 
    4745 
    4846        String name2 = "myLoginModule"; 
    4947        AppConfigurationEntry.LoginModuleControlFlag flag2 = AppConfigurationEntry.LoginModuleControlFlag.REQUISITE; 
    50         HashMap<String,Object> opts2 = new HashMap<String, Object>(); 
     48        Map<String,Object> opts2 = new HashMap<String, Object>(); 
    5149        AppConfigurationEntry entry2 = new  AppConfigurationEntry(name2, flag2, opts2); 
    5250 
     51        String securityDomainName = "nuxeo-test"; 
    5352        SecurityDomain sd = new SecurityDomain(securityDomainName, new AppConfigurationEntry[] {entry1, entry2}); 
    5453 
    …… 
    7372        } catch (Exception e) { 
    7473            e.printStackTrace(); 
    75             fail("Exception: "+e); 
     74            fail("Exception: " + e); 
    7675        } 
    7776    }