Changeset 30071

Timestamp:

02/12/08 15:20:48 (9 months ago)

Author:

bstefanescu

Message:

merged 28198 from trunk - security domain serialization

Files:

• org.nuxeo.runtime/branches/1.4/nuxeo-runtime/src/main/java/org/nuxeo/runtime/api/login/SecurityDomain.java (modified) (3 diffs)
• org.nuxeo.runtime/branches/1.4/nuxeo-runtime/src/test/java/org/nuxeo/runtime/TestSecurityDomain.java (copied) (copied from org.nuxeo.runtime/trunk/nuxeo-runtime/src/test/java/org/nuxeo/runtime/TestSecurityDomain.java)

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

@@ -20 +20 @@
-package org.nuxeo.runtime.api.login;
-
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
-import java.util.ArrayList;
+import java.util.HashMap;
-import java.util.List;
+import java.util.Map;
-
-import javax.security.auth.Subject;
@@ -39 +45 @@
- */
-@XObject("domain")
-
+
+
+
-
-    @XNode("@name")
-    private String name;
-
-
+transient 
-
-    public SecurityDomain() {
@@ -154 +162 @@
-    }
-
+
+    @SuppressWarnings("unchecked")
+    private void readObject(ObjectInputStream in)
+            throws ClassNotFoundException, IOException {
+        in.defaultReadObject();
+        // read app config entries
+        int size = in.readInt();
+        entries = new AppConfigurationEntry[size];
+        for (int i=0; i<size; i++) {
+            String name = (String)in.readObject();
+            String ctrlFlag = (String)in.readObject();
+            LoginModuleControlFlag flag = controlFlagFromString(ctrlFlag);
+            Map<String, ?> opts = (Map<String, ?>)in.readObject();
+            entries[i] = new AppConfigurationEntry(name, flag, opts);
+        }
+    }
+
+    private void writeObject(ObjectOutputStream out) throws IOException {
+        out.defaultWriteObject();
+        // write app config entries
+        if (entries == null) {
+           out.writeInt(0);
+        } else {
+            out.writeInt(entries.length);
+            for (int i=0; i<entries.length; i++) {
+                AppConfigurationEntry entry = entries[i];
+                out.writeObject(entry.getLoginModuleName());
+                out.writeObject(controlFlagToString(entry.getControlFlag()));
+                Map<String,?> opts = entry.getOptions();
+                if (!(opts instanceof Serializable)) {
+                    opts = new HashMap<String, Object>(opts);
+                }
+                out.writeObject(opts);
+            }
+        }
+    }
+
-}