portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r533883 [2/3] - in /portals/jetspeed-2/branches/J2-M2-REDUX: components/jetspeed-capability/ components/jetspeed-capability/src/main/java/org/apache/jetspeed/ components/jetspeed-capability/src/main/java/org/apache/jetspeed/serializer/ comp...
Date Mon, 30 Apr 2007 23:41:10 GMT
Modified: portals/jetspeed-2/branches/J2-M2-REDUX/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/JetspeedSerializerImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/JetspeedSerializerImpl.java?view=diff&rev=533883&r1=533882&r2=533883
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/JetspeedSerializerImpl.java (original)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/JetspeedSerializerImpl.java Mon Apr 30 16:41:09 2007
@@ -16,49 +16,29 @@
  */
 package org.apache.jetspeed.serializer;
 
-import java.security.Principal;
-import java.util.ArrayList;
-import java.util.Collection;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.sql.Date;
+import java.util.Collections;
 import java.util.HashMap;
-import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
-import java.util.Set;
-import java.util.prefs.Preferences;
 
-import javax.security.auth.Subject;
-
-import javolution.xml.XMLBinding;
-
-import org.apache.jetspeed.capabilities.Capabilities;
-import org.apache.jetspeed.capabilities.Capability;
-import org.apache.jetspeed.capabilities.Client;
-import org.apache.jetspeed.capabilities.MediaType;
-import org.apache.jetspeed.capabilities.MimeType;
-import org.apache.jetspeed.components.ComponentManager;
-import org.apache.jetspeed.profiler.Profiler;
-import org.apache.jetspeed.profiler.ProfilerException;
-import org.apache.jetspeed.profiler.rules.PrincipalRule;
-import org.apache.jetspeed.profiler.rules.ProfilingRule;
-import org.apache.jetspeed.profiler.rules.RuleCriterion;
-import org.apache.jetspeed.security.BasePrincipal;
-import org.apache.jetspeed.security.Group;
-import org.apache.jetspeed.security.GroupManager;
-import org.apache.jetspeed.security.PasswordCredential;
-import org.apache.jetspeed.security.PermissionManager;
-import org.apache.jetspeed.security.PortalResourcePermission;
-import org.apache.jetspeed.security.Role;
-import org.apache.jetspeed.security.RoleManager;
-import org.apache.jetspeed.security.User;
-import org.apache.jetspeed.security.UserManager;
-import org.apache.jetspeed.security.om.InternalPermission;
-import org.apache.jetspeed.security.om.InternalPrincipal;
-import org.apache.jetspeed.security.spi.PasswordCredentialProvider;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.jetspeed.serializer.objects.JSApplication;
+import org.apache.jetspeed.serializer.objects.JSApplications;
 import org.apache.jetspeed.serializer.objects.JSCapabilities;
 import org.apache.jetspeed.serializer.objects.JSCapability;
 import org.apache.jetspeed.serializer.objects.JSClient;
 import org.apache.jetspeed.serializer.objects.JSClientCapabilities;
 import org.apache.jetspeed.serializer.objects.JSClientMimeTypes;
 import org.apache.jetspeed.serializer.objects.JSClients;
+import org.apache.jetspeed.serializer.objects.JSEntities;
+import org.apache.jetspeed.serializer.objects.JSEntity;
+import org.apache.jetspeed.serializer.objects.JSEntityPreference;
+import org.apache.jetspeed.serializer.objects.JSEntityPreferences;
 import org.apache.jetspeed.serializer.objects.JSGroup;
 import org.apache.jetspeed.serializer.objects.JSGroups;
 import org.apache.jetspeed.serializer.objects.JSMediaType;
@@ -69,6 +49,8 @@
 import org.apache.jetspeed.serializer.objects.JSPWAttributes;
 import org.apache.jetspeed.serializer.objects.JSPermission;
 import org.apache.jetspeed.serializer.objects.JSPermissions;
+import org.apache.jetspeed.serializer.objects.JSPortlet;
+import org.apache.jetspeed.serializer.objects.JSPortlets;
 import org.apache.jetspeed.serializer.objects.JSPrincipalRule;
 import org.apache.jetspeed.serializer.objects.JSPrincipalRules;
 import org.apache.jetspeed.serializer.objects.JSProfilingRule;
@@ -77,7 +59,6 @@
 import org.apache.jetspeed.serializer.objects.JSRoles;
 import org.apache.jetspeed.serializer.objects.JSRuleCriterion;
 import org.apache.jetspeed.serializer.objects.JSRuleCriterions;
-import org.apache.jetspeed.serializer.objects.JSSeedData;
 import org.apache.jetspeed.serializer.objects.JSSnapshot;
 import org.apache.jetspeed.serializer.objects.JSUser;
 import org.apache.jetspeed.serializer.objects.JSUserAttributes;
@@ -86,933 +67,136 @@
 import org.apache.jetspeed.serializer.objects.JSUserUsers;
 import org.apache.jetspeed.serializer.objects.JSUsers;
 
+import javolution.xml.XMLBinding;
+import javolution.xml.XMLObjectReader;
+import javolution.xml.XMLObjectWriter;
+
+// Ate: A complete refactored implementation for better separation of concerns, delegating serialization to JetspeedComponentSerializer instances
+//      which removes dependencies on the target components from this one.
+// Note: still a work in progress
 /**
  * Jetspeed Serializer
- * <p>
- * The Serializer is capable of reading and writing the current content of the
- * Jetspeed environment to and from XML files. The component can be used from a
- * standalone java application for seeding a new database or from a running
- * portal as an administrative backup/restore function.
- * <p>
- * The XML file needs to indicate whether passwords used in credentials
- * are plain text or whether they are encoded. The import algoritm can determine -
- * prior to reading users - which encode/decode scheme was used and if <none> or
- * <implements PasswordEncodingService> then we store plain passwords (Note that
- * that alone requires the resulting XML to be encoded!!!!!)
- * 
- * @author <a href="mailto:hajo@bluesunrise.com">Hajo Birthelmer</a>
- * @version $Id: $
+ * @author <a href="mailto:ate@douma.nu">Ate Douma</a>
+ * @version $Id$
  */
-public class JetspeedSerializerImpl extends JetspeedSerializerBase implements JetspeedSerializer
+public class JetspeedSerializerImpl implements JetspeedSerializer
 {
+    private static final Log log = LogFactory.getLog(JetspeedSerializerImpl.class);
 
- 
-    private HashMap roleMap = new HashMap();
-
-    private HashMap groupMap = new HashMap();
-
-    private HashMap userMap = new HashMap();
-
-    private HashMap mimeMap = new HashMap();
-    private HashMap mimeMapInt = new HashMap();
-
-    private HashMap mediaMap = new HashMap();
-
-    private HashMap capabilityMap = new HashMap();
-    private HashMap capabilityMapInt = new HashMap();
-
-    private HashMap clientMap = new HashMap();
-
-    private HashMap permissionMap = new HashMap();
+    private String defaultIndent;
 
-    private HashMap rulesMap = new HashMap();
+    private List serializers;
+    private XMLBinding binding;
+    private Map defaultSettings;
 
-    int refCouter = 0;
-
- 
-    private static String ENCODING_STRING = "JETSPEED 2.1 - 2006";
-    private static String JETSPEED = "JETSPEED";
-    
-    
-    protected Class getSerializerDataClass()
+    public JetspeedSerializerImpl(List serializers, Map defaultSettings)
     {
-    	return JSSeedData.class;
-    }    
-
-    protected String getSerializerDataTag()
-    {
-    	return TAG_SNAPSHOT;
-    }    
-    
-    public JetspeedSerializerImpl()
-    {
-    	super();
+        this.serializers = Collections.unmodifiableList(serializers);
+        this.defaultSettings = defaultSettings != null ? Collections.unmodifiableMap(defaultSettings) : Collections.EMPTY_MAP;
+        binding = new XMLBinding();
+        setupAliases(binding);
     }
-
-    /**
-     * hand over existing component manager
-     * 
-     * @param cm
-     */
-    public JetspeedSerializerImpl(ComponentManager cm)
+    
+    public List getSerializers()
     {
-    	super(cm);
+        return serializers;
     }
-
-    /**
-     * This constructor takes the application root, the search path for the boot
-     * component configuration files and the search path for the application
-     * component configuration files.
-     * <p>
-     * For example: new JetspeedSerializerImpl("./", "assembly/boot/*.xml",
-     * "assembly/*.xml") will establish the current directory as the root,
-     * process all xml files in the assembly/boot directory before processing
-     * all xml files in the assembly directory itself.
-     * 
-     * @param appRoot
-     *            working directory
-     * @param bootConfig
-     *            boot (primary) file or files (wildcards are allowed)
-     * @param appConfig
-     *            application (secondary) file or files (wildcards are allowed)
-     */
-    public JetspeedSerializerImpl(String appRoot, String[] bootConfig,
-            String[] appConfig) throws SerializerException
+    
+    public Map getDefaultSettings()
     {
-    	super(appRoot,bootConfig,appConfig);
+        return defaultSettings;
     }
 
- 
- 
-
- 
-  
-
-
-    /**
-     * reset instruction flags to default settings (all true)
+    /*
+     * (non-Javadoc)
      * 
+     * @see org.apache.jetspeed.serializer.JetspeedSerializer#setDefaultIndent(String)
      */
-    protected void resetSettings()
+    public final void setDefaultIndent(String indent)
     {
-        setSetting(JetspeedSerializer.KEY_PROCESS_USERS, true);
-        setSetting(JetspeedSerializer.KEY_PROCESS_CAPABILITIES, true);
-        setSetting(JetspeedSerializer.KEY_PROCESS_PROFILER, true);
-        setSetting(JetspeedSerializer.KEY_OVERWRITE_EXISTING, true);
-        setSetting(JetspeedSerializer.KEY_BACKUP_BEFORE_PROCESS, true);
+        this.defaultIndent = indent;
     }
 
- 
-    /**
-     * On import, get the basic SnapShot data
+    /*
+     * (non-Javadoc)
      * 
+     * @see org.apache.jetspeed.serializer.JetspeedSerializer#getDefaultIndent()
      */
-    protected void getSnapshotData()
+    public final String getDefaultIndent()
     {
-        logMe("date created : " + getSnapshot().getDateCreated());
-        logMe("software Version : " + getSnapshot().getSavedVersion());
-        logMe("software SUbVersion : " + getSnapshot().getSavedSubversion());
+        return this.defaultIndent;
     }
 
-  
-    
-    private void recreateCapabilities (Capabilities caps) throws SerializerException
-    {
-    	logMe("recreateCapabilities - processing");
-    	JSCapabilities capabilities = ((JSSeedData)getSnapshot()).getCapabilities();
-    	if ((capabilities != null) && (capabilities.size() > 0))
-    	{
-    		Iterator _it = capabilities.iterator();
-    		while (_it.hasNext())
-    		{
-    			JSCapability _c = (JSCapability)_it.next();
-// create a new Capability
-    			try
-    			{
-    				Capability capability = caps.createCapability(_c.getName());
-					/** THE KEY_OVERWRITE_EXISTING test is not required for capabilites, since they carry no other information than the name
-					 *  Used here for consistency, though
-					 */   				
-    				if ((this.getSetting(JetspeedSerializer.KEY_OVERWRITE_EXISTING)) || (capability.getCapabilityId() == 0))
-    				{
-    					caps.storeCapability(capability);
-    				}
-    				this.capabilityMap.put(_c.getName(), capability);
-    			}
-    			catch (Exception e)
-    			{
-    				throw new SerializerException(
-    			            SerializerException.CREATE_OBJECT_FAILED
-    			            	.create("org.apache.jetspeed.capabilities.Capabilities",e.getLocalizedMessage()));
- 			}
-    		}
-    	}
-    	else
-    		logMe("NO CAPABILITES?????");
-    	logMe("recreateCapabilities - done");
-    }
-    private void recreateMimeTypes (Capabilities caps) throws SerializerException
-    {
-    	logMe("recreateMimeTypes - processing");
-    	JSMimeTypes mimeTypes = ((JSSeedData)getSnapshot()).getMimeTypes();
-    	if ((mimeTypes != null) && (mimeTypes.size() > 0))
-    	{
-    		Iterator _it = mimeTypes.iterator();
-    		while (_it.hasNext())
-    		{
-    			JSMimeType _c = (JSMimeType)_it.next();
-// create a new Mime Type
-    			try
-    			{
-    				MimeType mimeType = caps.createMimeType(_c.getName());
-					/** THE KEY_OVERWRITE_EXISTING test is not required for mime types, since they carry no other information than the name
-					 *  Used here for consistency, though
-					 */   				
-    				if ((this.getSetting(JetspeedSerializer.KEY_OVERWRITE_EXISTING)) || (mimeType.getMimetypeId() == 0))
-    				{
-    					caps.storeMimeType(mimeType);
-    				}
-    				this.mimeMap.put(_c.getName(), mimeType);
-
-    			}
-    			catch (Exception e)
-    			{
-    				throw new SerializerException(
-    			            SerializerException.CREATE_OBJECT_FAILED
-    			                    .create("org.apache.jetspeed.capabilities.MimeType",e.getLocalizedMessage()));
-    			}
-    		}
-    	}
-    	else
-    		logMe("NO MIME TYPES?????");
-    	logMe("recreateMimeTypes - done");
-    }
-
-    private void recreateMediaTypes (Capabilities caps) throws SerializerException
+    public void importData(String filename) throws SerializerException
     {
-    	 String _line;
-    	 
-    	logMe("recreateMediaTypes - processing");
-    	JSMediaTypes mediaTypes = ((JSSeedData)getSnapshot()).getMediaTypes();
-    	if ((mediaTypes != null) && (mediaTypes.size() > 0))
-    	{
-    		Iterator _it = mediaTypes.iterator();
-    		while (_it.hasNext())
-    		{
-    			JSMediaType _c = (JSMediaType)_it.next();
-// create a new Media
-    			try
-    			{
-    				MediaType mediaType = caps.createMediaType(_c.getName());
-					/** THE KEY_OVERWRITE_EXISTING test IS required for media types, since they carry no other information than the name
-					 *  Used here for consistency, though
-					 */   				
-    				if ((this.getSetting(JetspeedSerializer.KEY_OVERWRITE_EXISTING)) || (mediaType.getMediatypeId() == 0))
-    				{
-//    					 set object fields               
-    			        mediaType.setCharacterSet(_c.getCharacterSet());
-    			        mediaType.setTitle(_c.getTitle());
-    			        mediaType.setDescription(_c.getDescription());
-    			       
-    			        try
-    			        {
-    			        	_line = _c.getMimeTypesString().toString();
-    			        	ArrayList list = this.getTokens(_line);
-    			        	if ((list != null) && (list.size()>0))
-    			        	{
-    			        		Iterator _it1 = list.iterator();
-	        			        int added = 0;
-	        			        while (_it1.hasNext())
-	        			        {
-	        			        	MimeType _mt = caps.createMimeType((String)_it1.next());
-	        			        	if (_mt != null)
-	        			        		mediaType.addMimetype(_mt);
-	        			        	added++;
-	        			        }
-    			        	}
-    			        }
-    			        catch (Exception e1)
-    			        {
-    			        	e1.printStackTrace();
-    			        }
-    			        try
-    			        {
-    			        	_line  = _c.getCapabilitiesString().toString();
-    			        	ArrayList list = this.getTokens(_line);
-    			        	if ((list != null) && (list.size()>0))
-    			        	{
-	    			        	Iterator _it1 = list.iterator();
-	    			        	if ((list != null) && (list.size()>0))
-	    			        	{
-		        			        int added = 0;
-		        			        while (_it1.hasNext())
-		        			        {
-		        			        	Capability _ct = caps.createCapability((String)_it1.next());
-		        			        	if (_ct != null)
-		        			        		mediaType.addCapability(_ct);
-		        			        	added++;
-		        			        }
-	    			        	}
-    			        	}
-    			        }
-    			        catch (Exception e1)
-    			        {
-    			        	e1.printStackTrace();
-    			        }
-    					caps.storeMediaType(mediaType);
-    				}
-    				this.mediaMap.put(_c.getName(), mediaType);
-    			}
-    			catch (Exception e)
-    			{
-    				throw new SerializerException(
-    			            SerializerException.CREATE_OBJECT_FAILED
-    			                    .create("org.apache.jetspeed.capabilities.MediaType",e.getLocalizedMessage()));
-    			}
-    		}
-    	}
-    	else
-    		logMe("NO MEDIA TYPES?????");
-    	logMe("recreateMediaTypes - done");
+        importData(filename, null);
     }
- 
     
-    private void recreateClients (Capabilities caps) throws SerializerException
-    {
-    	 String _line;
-    	 
-    	logMe("recreateClients - processing");
-    	JSClients clients = ((JSSeedData)getSnapshot()).getClients();
-    	if ((clients != null) && (clients.size() > 0))
-    	{
-    		Iterator _it = clients.iterator();
-    		while (_it.hasNext())
-    		{
-    			JSClient _c = (JSClient)_it.next();
-// create a new Media
-    			try
-    			{
-    				Client client = caps.createClient(_c.getName());
-					/** THE KEY_OVERWRITE_EXISTING test IS required for media types, since they carry no other information than the name
-					 *  Used here for consistency, though
-					 */   				
-    				if ((this.getSetting(JetspeedSerializer.KEY_OVERWRITE_EXISTING)) || (client.getClientId() == 0))
-    				{
-//    					 set object fields               
-    			        client.setUserAgentPattern(_c.getUserAgentPattern());
-    			        client.setManufacturer(_c.getManufacturer());
-    			        client.setModel(_c.getModel());
-    			        client.setEvalOrder(_c.getEvalOrder());
-    			        String myPrefMimeType = _c.getPreferredMimeTypeID();
-    			        client.setVersion(_c.getVersion());
-    			        try
-    			        {
-    			        	_line = _c.getMimeTypesString().toString();
-    			        	ArrayList list = this.getTokens(_line);
-    			        	if ((list != null) && (list.size()>0))
-    			        	{
-    			        		Iterator _it1 = list.iterator();
-	        			        int added = 0;
-	        			        while (_it1.hasNext())
-	        			        {
-	        			        	MimeType _mt = caps.createMimeType((String)_it1.next());
-	        			        	if (_mt != null)
-	        			        	{
-	        			        		client.getMimetypes().add(_mt);
-	        			        		if (_mt.getMimetypeId() == 0)
-	        			        		{
-	        			        			caps.storeMimeType(_mt);
-	        			        		}
-	        			        		if (myPrefMimeType.equalsIgnoreCase(_mt.getName()))
-	        			        				client.setPreferredMimeTypeId(_mt.getMimetypeId());	
-	        			        			
-	        			        	}
-	        			        	added++;
-	        			        }
-    			        	}
-    			        }
-    			        catch (Exception e1)
-    			        {
-    			        	e1.printStackTrace();
-    			        }
-    			        try
-    			        {
-    			        	_line  = _c.getCapabilitiesString().toString();
-    			        	ArrayList list = this.getTokens(_line);
-    			        	if ((list != null) && (list.size()>0))
-    			        	{
-	    			        	Iterator _it1 = list.iterator();
-	    			        	if ((list != null) && (list.size()>0))
-	    			        	{
-		        			        int added = 0;
-		        			        while (_it1.hasNext())
-		        			        {
-		        			        	Capability _ct = caps.createCapability((String)_it1.next());
-		        			        	if (_ct != null)
-		        			        		client.getCapabilities().add(_ct);
-		        			        	added++;
-		        			        }
-	    			        	}
-    			        	}
-    			        }
-    			        catch (Exception e1)
-    			        {
-    			        	e1.printStackTrace();
-    			        }
-    					caps.storeClient(client);
-    				}
-    				this.clientMap.put(_c.getName(), client);
-    			}
-    			catch (Exception e)
-    			{
-    				throw new SerializerException(
-    			            SerializerException.CREATE_OBJECT_FAILED
-    			                    .create("org.apache.jetspeed.capabilities.Client",e.getLocalizedMessage()));
-    			}
-    		}
-    	}
-    	else
-    		logMe("NO MEDIA TYPES?????");
-    	logMe("recreateClients - done");
-    }
-
-    
-    private void importCapabilitiesInfrastructure() throws SerializerException
-    {
-    	logMe("importCapabilitiesInfrastructure - processing");
-        Capabilities caps = (Capabilities) getCM()
-        .getComponent("org.apache.jetspeed.capabilities.Capabilities");
-        if (caps == null)
-        	throw new SerializerException(
-            SerializerException.COMPONENTMANAGER_DOES_NOT_EXIST
-                    .create("org.apache.jetspeed.capabilities.Capabilities"));
-        
-        recreateCapabilities(caps);
-        recreateMimeTypes(caps);
-        recreateMediaTypes(caps);
-        recreateClients(caps);
-        
-        
-    	logMe("importCapabilitiesInfrastructure - processing done");
-    }
-
-
-    /**
-     * import the groups, roles and finally the users to the current environment
-     * 
-     * @throws SerializerException
-     */
-    private void recreateRolesGroupsUsers() throws SerializerException
+    public void importData(String filename, Map settings) throws SerializerException
     {
-    	logMe("recreateRolesGroupsUsers");
-        GroupManager groupManager = (GroupManager) getCM()
-                .getComponent("org.apache.jetspeed.security.GroupManager");
-        if (groupManager == null)
-            throw new SerializerException(
-                    SerializerException.COMPONENTMANAGER_DOES_NOT_EXIST
-                            .create("org.apache.jetspeed.security.GroupManager"));
-        RoleManager roleManager = (RoleManager) getCM()
-        .getComponent("org.apache.jetspeed.security.RoleManager");
-        if (roleManager == null)
-            throw new SerializerException(
-                    SerializerException.COMPONENTMANAGER_DOES_NOT_EXIST
-                            .create("org.apache.jetspeed.security.RoleManager"));
-        UserManager userManager = (UserManager) getCM()
-        .getComponent("org.apache.jetspeed.security.UserManager");
-        if (userManager == null)
-        	throw new SerializerException(
-            SerializerException.COMPONENTMANAGER_DOES_NOT_EXIST
-                    .create("org.apache.jetspeed.security.UserManager"));
+        Map processSettings = getProcessSettings(settings);
+        JSSnapshot snapshot = readSnapshot(filename, binding);
 
-        
-        
-        
-        JSGroups groups = null;
-        JSRoles roles = null;
+        if (snapshot == null)
+            throw new SerializerException(SerializerException.FILE_PROCESSING_ERROR.create(new String[] { filename,
+                    "Snapshot is NULL" }));
 
-        groups = ((JSSeedData)getSnapshot()).getGroups();
-        
-        Iterator _it = groups.iterator();
-        while (_it.hasNext())
+        if (!(snapshot.checkVersion()))
+            throw new SerializerException(SerializerException.INCOMPETIBLE_VERSION.create(new String[] { filename,
+                    String.valueOf(snapshot.getSoftwareVersion()), String.valueOf(snapshot.getSavedSubversion()) }));
+        for (int i = 0, size = serializers.size(); i < size; i++)
         {
-        	String name = ((JSGroup)_it.next()).getName();
-
-	        try
-	        {
-	        	if (!(groupManager.groupExists(name)))
-	        		groupManager.addGroup(name);
-	        	Group group = groupManager.getGroup(name);
-	        	this.groupMap.put(name, group.getPrincipal());
-	        } catch (Exception e)
-	        {
-	            throw new SerializerException(
-	                    SerializerException.CREATE_OBJECT_FAILED
-	                            .create(new String[]
-	                            { "Group", e.getMessage()}));
-	        }
+            ((JetspeedComponentSerializer) serializers.get(i)).processImport(snapshot, processSettings);
         }
-    	logMe("recreateGroups - done");
-    	logMe("processing roles");
-
-        roles = ((JSSeedData)getSnapshot()).getRoles();
-        
-        _it = roles.iterator();
-        while (_it.hasNext())
-        {
-        	String name = ((JSRole)_it.next()).getName();
-
-	        try
-	        {
-	        	if (!(roleManager.roleExists(name)))
-	        		roleManager.addRole(name);
-	        	Role role = roleManager.getRole(name);
-	        	this.roleMap.put(name, role.getPrincipal());
-	        } catch (Exception e)
-	        {
-	            throw new SerializerException(
-	                    SerializerException.CREATE_OBJECT_FAILED
-	                            .create(new String[]
-	                            { "Role", e.getMessage()}));
-	        }
-        }
-    	logMe("recreateRoles - done");
-    	logMe("processing users");
-
-    	/** determine whether passwords can be reconstructed or not */
-    	int passwordEncoding = compareCurrentSecurityProvider((JSSeedData)getSnapshot());
-        JSUsers users = null;
-        users = ((JSSeedData)getSnapshot()).getUsers();
-        
-        _it = users.iterator();
-        while (_it.hasNext())
-        {
-        	
-        	JSUser jsuser = (JSUser)_it.next();
-
-	        try
-	        {
-	        	User user = null;
-	        	if (userManager.userExists(jsuser.getName()))
-	        	{
-	        		user = userManager.getUser(jsuser.getName());
-	        	}
-				if ((this.getSetting(JetspeedSerializer.KEY_OVERWRITE_EXISTING)) || (user == null))
-				{
-					if (user == null) //create new one
-					{
-    					String password = recreatePassword(jsuser.getPassword());
-    			    	logMe("add User "+ jsuser.getName() + " with password " + password);
-   			    		userManager.importUser(jsuser.getName(), password,(passwordEncoding == PASSTHRU_REQUIRED));
-    			    	logMe("add User done ");
-						user = userManager.getUser(jsuser.getName());
-					}
-					try
-					{
-						userManager.setPasswordEnabled(jsuser.getName(), jsuser.getPwEnabled());						
-						userManager.setPasswordUpdateRequired(jsuser.getName(), jsuser.getPwRequiredUpdate());
-						java.sql.Date d = jsuser.getPwExpirationDate();
-						if (d != null)
-							userManager.setPasswordExpiration(jsuser.getName(), d);						
-					}
-					catch (Exception e)
-					{
-						// most likely caused by protected users (like "guest")
-						logMe("setting userinfo for "+ jsuser.getName() + " failed because of " + e.getLocalizedMessage());
-					}
-					
-				//credentials
-			        Subject subject = user.getSubject();
-
-					ArrayList listTemp = jsuser.getPrivateCredentials();
-					if ((listTemp != null) && (listTemp.size()>0))
-					{
-						Iterator _itTemp = listTemp.iterator();
-						while (_itTemp.hasNext())
-						{
-							subject.getPrivateCredentials().add(_itTemp.next());
-						}
-					}
-					listTemp = jsuser.getPublicCredentials();
-					if ((listTemp != null) && (listTemp.size()>0))
-					{
-						Iterator _itTemp = listTemp.iterator();
-						while (_itTemp.hasNext())
-						{
-							subject.getPublicCredentials().add(_itTemp.next());
-						}
-					}
-					JSUserGroups jsUserGroups = jsuser.getGroupString();
-					if (jsUserGroups != null)
-						listTemp = this.getTokens(jsUserGroups.toString());
-					else
-						listTemp = null;
-					if ((listTemp != null) && (listTemp.size()>0))
-					{
-						Iterator _itTemp = listTemp.iterator();
-						while (_itTemp.hasNext())
-						{
-							groupManager.addUserToGroup(jsuser.getName(), (String)_itTemp.next());
-						}
-					}
-					JSUserRoles jsUserRoles = jsuser.getRoleString();
-					if (jsUserRoles != null)
-						listTemp = this.getTokens(jsUserRoles.toString());
-					else
-						listTemp = null;
-					if ((listTemp != null) && (listTemp.size()>0))
-					{
-						Iterator _itTemp = listTemp.iterator();
-						while (_itTemp.hasNext())
-						{
-							roleManager.addRoleToUser(jsuser.getName(), (String)_itTemp.next());
-						}
-					}
-    				JSUserAttributes attributes = jsuser.getUserInfo();
-					if (attributes != null)
-					{
-		                Preferences userAttributes = user.getUserAttributes();
-						HashMap map = attributes.getMyMap();
-						if (map != null)
-						{
-							Iterator _itTemp = map.keySet().iterator();
-							while (_itTemp.hasNext())
-							{
-						         String userAttrName = (String)_itTemp.next();
-//						         if ( userAttributes.get(userAttrName, "").equals("") 
-						         String userAttrValue = (String)map.get(userAttrName);
-						         userAttributes.put(userAttrName, userAttrValue);
-				            }
-						}
-						
-					}
-    				
-					JSNVPElements jsNVP = jsuser.getPreferences();
-					if ((jsNVP != null) && (jsNVP.getMyMap() != null))
-					{
-    					Preferences preferences = user.getPreferences();	
-						Iterator _itTemp = jsNVP.getMyMap().keySet().iterator();
-						while (_itTemp.hasNext())
-						{
-							String prefKey = (String)_itTemp.next();
-							String prefValue = (String)(jsNVP.getMyMap().get(prefKey));
-							preferences.put(prefKey,prefValue);
-						}
-					}
-		        	
-		        	this.userMap.put(jsuser.getName(), getUserPrincipal(user));
-
-				}    					
-	        } catch (Exception e)
-	        {
-	            e.printStackTrace();
-                throw new SerializerException(
-	                    SerializerException.CREATE_OBJECT_FAILED
-	                            .create(new String[]
-	                            { "User", e.getMessage()}));
-	        }
-        }
-    	logMe("recreateUsers - done");
-    	recreatePermissions();
-    	return;
     }
-    
-    /**
-     * called only after users have been established
-     * @throws SerializerException
-     */
-    private void recreateUserPrincipalRules() throws SerializerException
-    {
-    	logMe("recreateUserPrincipalRules - started");
-    	
-        Profiler pm = (Profiler) getCM()
-        .getComponent("org.apache.jetspeed.profiler.Profiler");
-        if (pm == null)
-
-        	throw new SerializerException(
-            SerializerException.COMPONENTMANAGER_DOES_NOT_EXIST
-                    .create("org.apache.jetspeed.profiler.Profiler"));
-        UserManager userManager = (UserManager) getCM()
-        .getComponent("org.apache.jetspeed.security.UserManager");
-        if (userManager == null)
-        	throw new SerializerException(
-            SerializerException.COMPONENTMANAGER_DOES_NOT_EXIST
-                    .create("org.apache.jetspeed.security.UserManager"));
-
-        // get Rules for each user
-
-        Iterator _itUsers = ((JSSeedData)getSnapshot()).getUsers().iterator();
-        while (_itUsers.hasNext())
-        {
-            JSUser _user = (JSUser) _itUsers.next();
-            JSPrincipalRules jsRules = _user.getRules();
-            try
-            {
-	            User user = userManager.getUser(_user.getName());
-	            Principal principal = getUserPrincipal(user);
-	            if (jsRules != null)
-	            {
-	            	Iterator _itRoles = jsRules.iterator();
-	                while (_itRoles.hasNext())
-	                {
-	                	JSPrincipalRule pr = (JSPrincipalRule) _itRoles.next();
-	                	ProfilingRule pRule = pm.getRule(pr.getRule());
-	                	
-	                	try
-	                	{
-	                		PrincipalRule p1 = pm.createPrincipalRule();
-	                		p1.setLocatorName(pr.getLocator());
-	                		p1.setProfilingRule(pRule);
-	                		p1.setPrincipalName(principal.getName());
-	                		pm.storePrincipalRule(p1);
-	                	}
-	                	catch (Exception eRole)
-	                	{
-	                		eRole.printStackTrace();
-	                	}
-	                }
-	            }
-            }
-        	catch (Exception eUser)
-        	{
-        		eUser.printStackTrace();
-        	}
-        }
-    	logMe("recreateUserPrincipalRules - done");
 
+    public void exportData(String name, String filename) throws SerializerException
+    {
+        exportData(name, filename, null);
     }
-    /**
-     * recreates all permissions from the current snapshot
-     * 
-     * @throws SerializerException
-     */
-    private void recreatePermissions() throws SerializerException
+    
+    public void exportData(String name, String filename, Map settings) throws SerializerException
     {
-    	logMe("recreatePermissions - started");
-        PermissionManager pm = (PermissionManager) getCM()
-                .getComponent("org.apache.jetspeed.security.PermissionManager");
-        if (pm == null)
-            throw new SerializerException(
-                    SerializerException.COMPONENTMANAGER_DOES_NOT_EXIST
-                            .create("org.apache.jetspeed.security.PermissionManager"));
-
-        Iterator list = null;
-        try
-        {
-        	list = ((JSSeedData)getSnapshot()).getPermissions().iterator();
-        } catch (Exception e)
-        {
-            throw new SerializerException(
-                    SerializerException.GET_EXISTING_OBJECTS
-                            .create(new String[]
-                            { "Permissions", e.getMessage()}));
-        }
+        Map processSettings = getProcessSettings(settings);
+        JSSnapshot snapshot = new JSSnapshot(name);
+        snapshot.setDateCreated(new Date(new java.util.Date().getTime()).toString());
+        snapshot.setSavedVersion(snapshot.getSoftwareVersion());
+        snapshot.setSavedSubversion(snapshot.getSoftwareSubVersion());
 
-        while (list.hasNext())
+        for (int i = 0, size = serializers.size(); i < size; i++)
         {
-            JSPermission _js = (JSPermission)list.next();
-            PortalResourcePermission perm = _js.getPermissionForType();
-            if ((perm != null) && (perm instanceof PortalResourcePermission))
-            {
-            	try
-                {
-                    pm.addPermission(perm);
-                    ArrayList listTemp = null;
-					JSUserGroups jsUserGroups = _js.getGroupString();
-					if (jsUserGroups != null)
-						listTemp = this.getTokens(jsUserGroups.toString());
-					else
-						listTemp = null;
-					if ((listTemp != null) && (listTemp.size()>0))
-					{
-						Iterator _itTemp = listTemp.iterator();
-						while (_itTemp.hasNext())
-						{
-							Principal p = (Principal)this.groupMap.get((String)_itTemp.next());
-							if (p != null)
-								pm.grantPermission(p, perm);
-						}
-					}
-					JSUserRoles jsUserRoles = _js.getRoleString();
-					if (jsUserRoles != null)
-						listTemp = this.getTokens(jsUserRoles.toString());
-					else
-						listTemp = null;
-					if ((listTemp != null) && (listTemp.size()>0))
-					{
-						Iterator _itTemp = listTemp.iterator();
-						while (_itTemp.hasNext())
-						{
-   							Principal p = (Principal)this.roleMap.get((String)_itTemp.next());
-							if (p != null)
-								pm.grantPermission(p, perm);
-						}
-					}
-					JSUserUsers jsUserUsers = _js.getUserString();
-					if (jsUserUsers != null)
-						listTemp = this.getTokens(jsUserUsers.toString());
-					else
-						listTemp = null;
-					if ((listTemp != null) && (listTemp.size()>0))
-					{
-						Iterator _itTemp = listTemp.iterator();
-						while (_itTemp.hasNext())
-						{
-   							Principal p = (Principal)this.userMap.get((String)_itTemp.next());
-							if (p != null)
-								pm.grantPermission(p, perm);
-						}
-					}
-
-	            } 
-	           	catch (Exception e)
-	            {
-	                throw new SerializerException(
-	                        SerializerException.CREATE_SERIALIZED_OBJECT_FAILED
-	                                .create(new String[]
-	                                { "Permissions", e.getMessage()}));
-	            }
-            }
+            ((JetspeedComponentSerializer) serializers.get(i)).processExport(snapshot, processSettings);
         }
-    	logMe("recreatePermissions - done");
+        
+        writeSnapshot(snapshot, filename, binding, processSettings);
     }
-
-    private Principal getUserPrincipal(User user)
+    
+    public void deleteData() throws SerializerException
     {
-        Subject subject = user.getSubject();
-        // get the user principal
-        Set principals = subject.getPrincipals();
-        Iterator list = principals.iterator();
-        while (list.hasNext())
-        {
-            BasePrincipal principal = (BasePrincipal) list.next();
-            String path = principal.getFullPath();
-            if (path.startsWith("/user/"))
-            return principal;
-        }
-        return null;
-
+        deleteData(null);
     }
     
-    private void importProfiler()
+    public void deleteData(Map settings) throws SerializerException
     {
-        System.out.println("importProfiler - processing");
-        try
+        Map processSettings = getProcessSettings(settings);
+        for (int i = 0, size = serializers.size(); i < size; i++)
         {
-        	recreateProfilingRules();
-        }
-        catch (Exception e)
-        {
-        	e.printStackTrace();
-        }
-  
-        try
-        {
-            this.recreateRolesGroupsUsers();
-            recreateUserPrincipalRules();
-        	
-        }
-        catch (Exception e)
-        {
-        	e.printStackTrace();
+            ((JetspeedComponentSerializer) serializers.get(i)).deleteData(processSettings);
         }
     }
 
-
-    /**
-     * The workhorse for importing data
-     * 
-     * @param binding
-     *            established XML binding
-     * @return
-     * @throws SerializerException
-     */
-    protected void processImport() throws SerializerException
+    
+    protected Map getProcessSettings(Map settings)
     {
-        this.logMe("*********reinstalling data*********");
-        
-        // TODO: HJB Make sure to clean lookup tables before next run
-
-        if (this.getSetting(JetspeedSerializer.KEY_PROCESS_CAPABILITIES))
+        Map processSettings = new HashMap(defaultSettings);
+        processSettings.put(KEY_LOGGER, log);
+        if ( settings != null )
         {
-            logMe("creating clients, mediatypes and mimetypes");
-            importCapabilitiesInfrastructure();
+            processSettings.putAll(settings);
         }
-        
-        /**
-         * the order is important, since profiling rules are referenced by the user 
-         * 
-         */
-        
-        if (this.getSetting(JetspeedSerializer.KEY_PROCESS_PROFILER))
-        {
-            logMe("collecting permissions, profiling rules and users/proups etc. etc.");
-            importProfiler();
-        } else
-        {
-            logMe("permissions, rules etc. skipped ");
-	       
-	        if (this.getSetting(JetspeedSerializer.KEY_PROCESS_USERS))
-	        {
-	            logMe("creating users/roles/groups");
-	            this.recreateRolesGroupsUsers();
-	        }
-	        else
-	        {
-	            logMe("users skipped - ensure we have valid users to work with");
-	            exportUsers();
-	        }
-        } 
-    }
-
-    /**
-     * The workhorse for exporting data
-     * 
-     * @param binding
-     *            established XML binding
-     * @return
-     * @throws SerializerException
-     */
-    protected void processExport(String name, XMLBinding binding)
-            throws SerializerException
-    {
-        this.logMe("*********collecting data*********");
-        /** first create the snapshot file */
-
-       setSnapshot(new JSSeedData(name));
-
-        setSnapshotData();
-
-        if (this.getSetting(JetspeedSerializer.KEY_PROCESS_CAPABILITIES))
-        {
-            logMe("collecting clients, mediatypes and mimetypes");
-            exportCapabilitiesInfrastructure();
-        } else
-            logMe("capabilities skipped");
-
-        if (this.getSetting(JetspeedSerializer.KEY_PROCESS_USERS))
-        {
-            logMe("collecting users");
-            exportUsers();
-
-            /** permissions require users - hence inside this scope */
-            if (this.getSetting(JetspeedSerializer.KEY_PROCESS_PROFILER))
-            {
-                logMe("collecting permissions, profiling rules etc.");
-                this.getProfilingRules();
-            } else
-                logMe(" profiling rules etc. skipped");
-
-        } else
-            logMe("users skipped");
-
+        return processSettings;
     }
 
-    /**
-     * Setup the binding for the different classes, mapping each extracted class
-     * to a unique tag name in the XML
-     * 
-     * @param binding
-     */
     protected void setupAliases(XMLBinding binding)
     {
         binding.setAlias(JSRole.class, "Role");
@@ -1048,945 +232,193 @@
         binding.setAlias(JSPrincipalRule.class, "Rule");
         binding.setAlias(JSPrincipalRules.class, "Rules");
 
+        binding.setAlias(JSPWAttributes.class, "credentials");
+
+        binding.setAlias(JSApplication.class, "PortletApplication");
+        binding.setAlias(JSApplications.class, "PortletApplications");
+        binding.setAlias(JSPortlet.class, "Portlet");
+        binding.setAlias(JSPortlets.class, "Portlets");
+        binding.setAlias(JSEntity.class, "Entity");
+        binding.setAlias(JSEntities.class, "Entities");
+        binding.setAlias(JSEntityPreference.class, "Principal");
+        binding.setAlias(JSEntityPreferences.class, "Settings");
+        binding.setAlias(JSNVPElements.class, "preferences");
+
         binding.setAlias(String.class, "String");
         binding.setAlias(Integer.class, "int");
-        
-        binding.setAlias(JSPWAttributes.class,"credentials");
 
         binding.setClassAttribute(null);
-
-    }
-
-    /**
-     * simple lookup for principal object from a map
-     * @param map
-     * @param _fullPath
-     * @return
-     */
-
-    private Object getObjectBehindPrinicpal(Map map, BasePrincipal _principal)
-    {
-        return getObjectBehindPath(map, _principal.getFullPath());
-    }
-
-
-
-	/**
-	 * create a serializable wrapper for role 
-	 * 
-	 * @param role
-	 * @return
-	 */
-    private JSRole createJSRole(Role role)
-    {
-        JSRole _role = new JSRole();
-        _role.setName(role.getPrincipal().getName());
-        return _role;
     }
 
-	/**
-	 * export roles 
-	 * 
-	 * @return
-	 */
-    private void exportRoles() throws SerializerException
+    protected JSSnapshot readSnapshot(String importFileName, XMLBinding binding) throws SerializerException
     {
-        RoleManager roleManager = (RoleManager) getCM()
-                .getComponent("org.apache.jetspeed.security.RoleManager");
-        if (roleManager == null)
-            throw new SerializerException(
-                    SerializerException.COMPONENTMANAGER_DOES_NOT_EXIST
-                            .create("org.apache.jetspeed.security.RoleManager"));
-
-        Iterator list = null;
+        XMLObjectReader reader = null;
+        JSSnapshot snap = null;
         try
         {
-            list = roleManager.getRoles("");
-        } catch (Exception e)
-        {
-            throw new SerializerException(
-                    SerializerException.GET_EXISTING_OBJECTS
-                            .create(new String[]
-                            { "Role", e.getMessage()}));
+            reader = XMLObjectReader.newInstance(new FileInputStream(importFileName));
         }
-        while (list.hasNext())
+        catch (Exception e)
         {
-            try
-            {
-                Role role = (Role) list.next();
-                JSRole _tempRole = (JSRole) getObjectBehindPrinicpal(roleMap,
-                        (BasePrincipal) (role.getPrincipal()));
-                if (_tempRole == null)
-                {
-                    _tempRole = createJSRole(role);
-                    roleMap.put(_tempRole.getName(), _tempRole);
-                    ((JSSeedData)getSnapshot()).getRoles().add(_tempRole);
-                }
-
-            } catch (Exception e)
-            {
-                throw new SerializerException(
-                        SerializerException.CREATE_SERIALIZED_OBJECT_FAILED
-                                .create(new String[]
-                                { "Role", e.getMessage()}));
-            }
+            throw new SerializerException(SerializerException.FILE_READER_ERROR.create(new String[] { importFileName,
+                    e.getMessage() }));
         }
-        return;
-    }
-
-    /** Groups -------------------------- */
-    /**
-     * create a wrapper JSGroup object
-     */
-    private JSGroup createJSGroup(Group group)
-    {
-        JSGroup _group = new JSGroup();
-        _group.setName(group.getPrincipal().getName());
-        return _group;
-    }
-
-    /**
-     * extract the groups from the current environment
-     * 
-     * @throws SerializerException
-     */
-    private void exportGroups() throws SerializerException
-    {
-        GroupManager groupManager = (GroupManager) getCM()
-                .getComponent("org.apache.jetspeed.security.GroupManager");
-        if (groupManager == null)
-            throw new SerializerException(
-                    SerializerException.COMPONENTMANAGER_DOES_NOT_EXIST
-                            .create("org.apache.jetspeed.security.GroupManager"));
-        Iterator list = null;
         try
         {
-            list = groupManager.getGroups("");
-        } catch (Exception e)
+            if (binding != null)
+                reader.setBinding(binding);
+            snap = (JSSnapshot) reader.read(TAG_SNAPSHOT, JSSnapshot.class);
+        }
+        catch (Exception e)
         {
-            throw new SerializerException(
-                    SerializerException.GET_EXISTING_OBJECTS
-                            .create(new String[]
-                            { "Group", e.getMessage()}));
+            e.printStackTrace();
+            new SerializerException(SerializerException.FILE_PROCESSING_ERROR.create(new String[] { importFileName,
+                    e.getMessage() }));
         }
-        while (list.hasNext())
+        finally
         {
-
+            /** ensure the reader is closed */
             try
             {
-                Group group = (Group) list.next();
-                JSGroup _tempGroup = (JSGroup) getObjectBehindPrinicpal(
-                        groupMap, (BasePrincipal) (group.getPrincipal()));
-                if (_tempGroup == null)
-                {
-                    _tempGroup = createJSGroup(group);
-                    groupMap.put(_tempGroup.getName(), _tempGroup);
-                    ((JSSeedData)getSnapshot()).getGroups().add(_tempGroup);
-                }
-
-            } catch (Exception e)
-            {
-                throw new SerializerException(
-                        SerializerException.CREATE_SERIALIZED_OBJECT_FAILED
-                                .create(new String[]
-                                { "Group", e.getMessage()}));
+                log.debug("*********closing up reader ********");
+                reader.close();
             }
-        }
-        return;
-    }
-
-    /**
-     * Add the credentials to the JSUser object.
-     * <p>
-     * If the credential provided is a PasswordCredential, userid and password
-     * are extracted and set explcitely
-     * 
-     * @param isPublic
-     *            public or private credential
-     * @param newUser
-     *            the JS user object reference
-     * @param credential
-     *            the credential object
-     */
-
-    private void addJSUserCredentials(boolean isPublic, JSUser newUser,
-            Object credential)
-    {
-        if (credential == null) return;
-        if (credential instanceof PasswordCredential)
-        {
-            PasswordCredential pw = (PasswordCredential) credential;
-            newUser.setUserCredential(pw.getUserName(), pw.getPassword(),pw.getExpirationDate(),pw.isEnabled(), pw.isExpired(), pw.isUpdateRequired());
-            return;
-        } else if (isPublic)
-            newUser.addPublicCredential(credential);
-        else
-            newUser.addPrivateCredential(credential);
-    }
-
-    /**
-     * create a new JSUser object
-     * 
-     * @param user
-     * @return a new JSUser object
-     */
-    private JSUser createJSUser(User user)
-    {
-        JSUser _newUser = new JSUser();
-
-        Subject subject = user.getSubject();
-        // get the user principal
-        Set principals = subject.getPrincipals();
-        Iterator list = principals.iterator();
-        while (list.hasNext())
-        {
-            BasePrincipal principal = (BasePrincipal) list.next();
-            String path = principal.getFullPath();
-            if (path.startsWith("/role/"))
-            {
-                JSRole _tempRole = (JSRole) this.getObjectBehindPath(roleMap,
-                        principal.getName());
-                if (_tempRole != null)
-                {
-                    _newUser.addRole(_tempRole);
-                }
-
-            } else
+            catch (Exception e1)
             {
-                if (path.startsWith("/group/"))
-                {
-                    JSGroup _tempGroup = (JSGroup) this.getObjectBehindPath(
-                            groupMap, principal.getName());
-                    if (_tempGroup != null)
-                    {
-                        _newUser.addGroup(_tempGroup);
-                    }
-
-                } else if (path.startsWith("/user/"))
-                    _newUser.setPrincipal(principal);
-
+                log.debug("Error in closing reader " + e1.getMessage());
+                /**
+                 * don't do anything with this exception - never let the bubble
+                 * out of the finally block
+                 */
+                return null;
             }
-
-        }
-        // System.out.println("User Public Credentials");
-        Set credentials = subject.getPublicCredentials();
-        list = credentials.iterator();
-        while (list.hasNext())
-        {
-            Object credential = list.next();
-            addJSUserCredentials(true, _newUser, credential);
         }
-        // System.out.println("User Private Credentials");
-        credentials = subject.getPrivateCredentials();
-        list = credentials.iterator();
-        while (list.hasNext())
-        {
-            Object credential = list.next();
-            addJSUserCredentials(false, _newUser, credential);
-        }
-
-        Preferences preferences = user.getPreferences();
-        _newUser.setPreferences(preferences);
-        preferences = user.getUserAttributes();
-        _newUser.setUserInfo(preferences);
-        //TODO: HJB, fix preferences...userinfo doesn't return values in prefs_property_value (in fact preferences.keys() is []
-        return _newUser;
+        return snap;
     }
 
-
-    /**
-     * Collect all the roles, groups and users from the current environment.
-     * Include the current SecurityProvider to understand, whether the password
-     * collected can be used upon import
-     * 
-     * @throws SerializerException
-     */
-
-    private void exportUsers() throws SerializerException
+    protected void writeSnapshot(JSSnapshot snapshot, String filename, XMLBinding binding, Map settings) throws SerializerException
     {
-        /** set the security provider info in the snapshot file */
-        ((JSSeedData)getSnapshot()).setEncryption(getEncryptionString());
-        /** get the roles */
-        exportRoles();
-        /** get the groups */
-        exportGroups();
-
-        /** users */
-        UserManager userManager = (UserManager) getCM()
-                .getComponent("org.apache.jetspeed.security.UserManager");
-        if (userManager == null)
-            throw new SerializerException(
-                    SerializerException.COMPONENTMANAGER_DOES_NOT_EXIST
-                            .create("org.apache.jetspeed.security.UserManager"));
-        Iterator list = null;
-        try
-        {
-            list = userManager.getUsers("");
-        } catch (Exception e)
+        XMLObjectWriter writer = openWriter(filename, settings);
+        writer.setBinding(binding);
+        if (this.getDefaultIndent() != null)
         {
-            throw new SerializerException(
-                    SerializerException.GET_EXISTING_OBJECTS
-                            .create(new String[]
-                            { "User", e.getMessage()}));
+            writer.setIndentation(this.getDefaultIndent());
         }
-        while (list.hasNext())
+        try
         {
-
-            try
-            {
-                User _user = (User) list.next();
-                JSUser _tempUser = createJSUser(_user);
-                userMap.put(_tempUser.getName(), _tempUser);
-                ((JSSeedData)getSnapshot()).getUsers().add(_tempUser);
-            } catch (Exception e)
-            {
-                throw new SerializerException(
-                        SerializerException.CREATE_SERIALIZED_OBJECT_FAILED
-                                .create(new String[]
-                                { "User", e.getMessage()}));
-            }
+            log.debug("*********Writing data*********");
+            writer.write(snapshot, TAG_SNAPSHOT, JSSnapshot.class);
 
         }
-        return;
-
-    }
-
-    /**
-     * extract the capabilities and save in snapshot file
-     * 
-     * @param caps
-     *            capability-container
-     * @throws SerializerException
-     */
-    private void exportCapabilites(Capabilities caps)
-            throws SerializerException
-    {
-
-        Iterator list = caps.getCapabilities();
-
-        while (list.hasNext())
+        catch (Exception e)
         {
-            try
-            {
-                Capability _cp = (Capability) list.next();
-                JSCapability _jsC = new JSCapability();
-                _jsC.setName(_cp.getName());
-                this.capabilityMap.put(_jsC.getName(), _jsC);
-                this.capabilityMapInt.put(new Integer(_cp.getCapabilityId()), _jsC);
-                ((JSSeedData)getSnapshot()).getCapabilities().add(_jsC);
-            } catch (Exception e)
-            {
-                throw new SerializerException(
-                        SerializerException.CREATE_SERIALIZED_OBJECT_FAILED
-                                .create(new String[]
-                                { "C", e.getMessage()}));
-            }
+            throw new SerializerException(SerializerException.FILE_PROCESSING_ERROR.create(new String[] { filename,
+                    e.getMessage() }));
         }
-        return;
-
-    }
-
-    /**
-     * exstract the mime types anmd save in snapshot file
-     * 
-     * @param caps
-     *            capability container
-     * @throws SerializerException
-     */
-    private void exportMimeTypes(Capabilities caps) throws SerializerException
-    {
-
-        Iterator list = caps.getMimeTypes();
-
-        while (list.hasNext())
+        finally
         {
+            /** ensure the writer is closed */
             try
             {
-                MimeType _mt = (MimeType) list.next();
-                JSMimeType _jsM = new JSMimeType();
-                _jsM.setName(_mt.getName());
-                this.mimeMap.put(_jsM.getName(), _jsM);
-                this.mimeMapInt.put(new Integer(_mt.getMimetypeId()), _jsM);
-
-                ((JSSeedData)getSnapshot()).getMimeTypes().add(_jsM);
-            } catch (Exception e)
+                log.debug("*********closing up********");
+                writer.close();
+            }
+            catch (Exception e)
             {
-                throw new SerializerException(
-                        SerializerException.CREATE_SERIALIZED_OBJECT_FAILED
-                                .create(new String[]
-                                { "MimeType", e.getMessage()}));
+                log.error("Error in closing writer " + e.getMessage());
+                /**
+                 * don't do anything with this exception - never let the bubble
+                 * out of the finally block
+                 */
             }
         }
-        return;
-
     }
 
     /**
-     * create a JS CLient
-     * 
-     * @param c
-     *            the existing Client object
-     * @return
-     * @throws SerializerException
+     * create or open a given file for writing
      */
-
-    private JSClient createJSClient(Client c) throws SerializerException
+    protected XMLObjectWriter openWriter(String filename, Map settings) throws SerializerException
     {
-        try
-        {
-            JSClient jsC = new JSClient(c);
-            // find the mimeTypes
-            Iterator _itM = c.getMimetypes().iterator();
-            while (_itM.hasNext())
-            {
-                MimeType _m = (MimeType) _itM.next();
-                JSMimeType _mt = (JSMimeType) mimeMap.get(_m.getName());
-                if (_mt != null) jsC.getMimeTypes().add(_mt);
-            }
-            
-    		Integer id = new Integer(c.getPreferredMimeTypeId());
-    		JSMimeType _mt = (JSMimeType) mimeMapInt.get(id);
-    		if (_mt != null)
-    			jsC.setPreferredMimeTypeID(_mt.getName());
-    		else
-    			jsC.setPreferredMimeTypeID("???");
-
-            // find the capabilities
-            Iterator _itC = c.getCapabilities().iterator();
-            while (_itC.hasNext())
-            {
-                Capability _c = (Capability) _itC.next();
-                JSCapability _ct = (JSCapability) capabilityMap.get(_c
-                        .getName());
-                if (_ct != null) jsC.getCapabilities().add(_ct);
-            }
+        File f;
 
-            return jsC;
-        } catch (Exception e)
+        try
         {
-            throw new SerializerException(
-                    SerializerException.CREATE_SERIALIZED_OBJECT_FAILED
-                            .create(new String[]
-                            { "Client", e.getMessage()}));
+            f = new File(filename);
         }
-
-    }
-
-    /**
-     * extract the current clients and save in the snapshot file
-     * 
-     * @param list
-     * @param caps
-     * @return
-     * @throws SerializerException
-     */
-    private void exportClients(Capabilities caps) throws SerializerException
-    {
-
-        /** first the the mime types */
-        exportMimeTypes(caps);
-
-        /** second get the capabilities */
-        this.exportCapabilites(caps);
-
-        /** now get the clients */
-        Iterator _it = caps.getClients();
-        while (_it.hasNext())
+        catch (Exception e)
         {
-            Client c = (Client) _it.next();
-            JSClient jsC = createJSClient(c);
-            if (jsC == null)
-                throw new SerializerException(
-                        SerializerException.CREATE_SERIALIZED_OBJECT_FAILED
-                                .create(new String[]
-                                { "Client", "createClient returned NULL"}));
-            this.clientMap.put(jsC.getName(), jsC);
-            ((JSSeedData)getSnapshot()).getClients().add(jsC);
+            throw new SerializerException(SerializerException.FILE_PROCESSING_ERROR.create(new String[] { filename,
+                    e.getMessage() }));
         }
-        return;
-    }
-
-    /**
-     * extract the media types and save in snapshot file
-     * 
-     * @param caps
-     *            capabilit container
-     * @throws SerializerException
-     */
-    private void exportMediaTypes(Capabilities caps) throws SerializerException
-    {
-        Iterator list = caps.getMediaTypes();
+        boolean exists = f.exists();
 
-        while (list.hasNext())
+        if (exists)
         {
-            try
-            {
-                MediaType _mt = (MediaType) list.next();
-                JSMediaType _jsM = new JSMediaType(_mt);
-                // find the mimeTypes
-                Iterator _itM = _mt.getMimetypes().iterator();
-                while (_itM.hasNext())
-                {
-                    MimeType _m = (MimeType) _itM.next();
-                    JSMimeType _mttype = (JSMimeType) mimeMap.get(_m.getName());
-                    if (_mttype != null) _jsM.getMimeTypes().add(_mttype);
-                }
-                // find the capabilities
-                Iterator _itC = _mt.getCapabilities().iterator();
-                while (_itC.hasNext())
-                {
-                    Capability _c = (Capability) _itC.next();
-                    JSCapability _ct = (JSCapability) capabilityMap.get(_c
-                            .getName());
-                    if (_ct != null) _jsM.getCapabilities().add(_ct);
-                }
-                this.mediaMap.put(_jsM.getName(), _jsM);
-                ((JSSeedData)getSnapshot()).getMediaTypes().add(_jsM);
-            } catch (Exception e)
-            {
-                // do whatever
-                throw new SerializerException(
-                        SerializerException.CREATE_SERIALIZED_OBJECT_FAILED
-                                .create(new String[]
-                                { "MediaType", e.getMessage()}));
+            if (!(isSettingSet(settings, JetspeedSerializer.KEY_OVERWRITE_EXISTING)))
+                throw new SerializerException(SerializerException.FILE_ALREADY_EXISTS.create(filename));
+            if (isSettingSet(settings, JetspeedSerializer.KEY_BACKUP_BEFORE_PROCESS))
+            {
+                String backName = createUniqueBackupFilename(f.getName());
+                if (backName == null)
+                    throw new SerializerException(SerializerException.FILE_BACKUP_FAILED.create(filename));
+                File ftemp = new File(backName);
+                f.renameTo(ftemp);
             }
         }
-        return;
-    }
-
-    /**
-     * Extracts all capability related objects (clients, mimetypes and
-     * mediatypes) and their relationships
-     * 
-     * @return
-     */
-
-    private void exportCapabilitiesInfrastructure() throws SerializerException
-    {
-        Capabilities caps = (Capabilities) getCM()
-                .getComponent("org.apache.jetspeed.capabilities.Capabilities");
-        if (caps == null)
-            throw new SerializerException(
-                    SerializerException.COMPONENTMANAGER_DOES_NOT_EXIST
-                            .create("org.apache.jetspeed.capabilities.Capabilities"));
-
-        /**
-         * get the clients (which in turn will get the mime types and
-         * capailities)
-         */
-
-        exportClients(caps);
-        // get the mediatTypes, too
-
-        exportMediaTypes(caps);
-
-    }
-
-    /**
-     * extract all permissions from the current environment
-     * 
-     * @throws SerializerException
-     */
-    private void getPermissions() throws SerializerException
-    {
-        Object o = null;
-        PermissionManager pm = (PermissionManager) getCM()
-                .getComponent("org.apache.jetspeed.security.PermissionManager");
-        if (pm == null)
-            throw new SerializerException(
-                    SerializerException.COMPONENTMANAGER_DOES_NOT_EXIST
-                            .create("org.apache.jetspeed.security.PermissionManager"));
-
-        Iterator list = null;
         try
         {
-            list = pm.getPermissions().iterator();
-        } catch (Exception e)
-        {
-            throw new SerializerException(
-                    SerializerException.GET_EXISTING_OBJECTS
-                            .create(new String[]
-                            { "Permissions", e.getMessage()}));
+            XMLObjectWriter writer = XMLObjectWriter.newInstance(new FileOutputStream(filename));
+            return writer;
         }
-
-        while (list.hasNext())
+        catch (Exception e)
         {
-            try
-            {
-                JSPermission _js = new JSPermission();
-
-                InternalPermission p = (InternalPermission) list.next();
-                _js.setResource(p.getName());
-                _js.setActions(p.getActions());
-                _js.setId(p.getPermissionId());
-                _js.setType(_js.getTypeForClass(p.getClassname()));
-
-                Iterator list2 = p.getPrincipals().iterator();
-                while (list2.hasNext())
-                {
-                    o = list2.next();
-                    InternalPrincipal principal = (InternalPrincipal) o;
-                    String path = principal.getFullPath();
-                    if (path.startsWith("/role/"))
-                    {
-                        JSRole _tempRole = (JSRole) this.getObjectBehindPath(
-                                roleMap, removeFromString(path, "/role/"));
-                        if (_tempRole != null)
-                        {
-                            _js.addRole(_tempRole);
-                        }
-
-                    } else
-                    {
-                        if (path.startsWith("/group/"))
-                        {
-                            JSGroup _tempGroup = (JSGroup) this
-                                    .getObjectBehindPath(groupMap,
-                                            removeFromString(path, "/group/"));
-                            if (_tempGroup != null)
-                            {
-                                _js.addGroup(_tempGroup);
-                            }
-
-                        } else
-                        {
-                            if (path.startsWith("/user/"))
-                            {
-                                JSUser _tempUser = (JSUser) this
-                                        .getObjectBehindPath(
-                                                userMap,
-                                                removeFromString(path, "/user/"));
-                                if (_tempUser != null)
-                                {
-                                    _js.addUser(_tempUser);
-                                }
-
-                            }
-
-                        }
-
-                    }
-                }
-                this.permissionMap.put(_js.getType(), _js);
-                ((JSSeedData)getSnapshot()).getPermissions().add(_js);
-
-            } catch (Exception e)
-            {
-                throw new SerializerException(
-                        SerializerException.CREATE_SERIALIZED_OBJECT_FAILED
-                                .create(new String[]
-                                { "Permissions", e.getMessage()}));
-            }
+            throw new SerializerException(SerializerException.FILE_WRITER_ERROR.create(new String[] { filename,
+                    e.getMessage() }));
         }
-        return;
-
     }
 
     /**
-     * Create the Profiling Rule Wrapper
+     * returns if the key for a particular setting is true. False if the key
+     * doesn't exist.
      * 
-     * @param p
+     * @param key
      * @return
      */
-    private JSProfilingRule createProfilingRule(ProfilingRule p, boolean standard)
+    protected static boolean isSettingSet(Map settings, String key)
     {
-        JSProfilingRule rule = new JSProfilingRule();
-        
-        
-        
-        rule.setStandardRule(standard);
-        rule.setDescription(p.getTitle());
-        rule.setId(p.getId());
-
-        Collection col = p.getRuleCriteria();
-        Iterator keys = col.iterator();
-        while (keys.hasNext())
+        if (settings != null)
         {
-            RuleCriterion rc = (RuleCriterion) keys.next();
-            rule.getCriterions().add(new JSRuleCriterion(rc));
-        }
-        return rule;
-
-    }
-
-    /**
-     * read the permissions and then the profiling rules.
-     * <p>
-     * after that update the cross reference with the users
-     * 
-     * @throws SerializerException
-     */
-    private void getProfilingRules() throws SerializerException
-    {
-        getPermissions();
-        Profiler pm = (Profiler) getCM()
-                .getComponent("org.apache.jetspeed.profiler.Profiler");
-        if (pm == null)
-
-            throw new SerializerException(
-                    SerializerException.COMPONENTMANAGER_DOES_NOT_EXIST
-                            .create("org.apache.jetspeed.profiler.Profiler"));
-        Class standardRuleClass = null;
-        try
-        {
-        	ProfilingRule tempStandardRule = pm.createProfilingRule(true);
-        	standardRuleClass = tempStandardRule.getClass();
-        }
-        catch (Exception e)
-        {
-        	throw new SerializerException(
-                SerializerException.CREATE_OBJECT_FAILED
-                        .create(new String[]
-                        { "Standard Rule", e.getMessage()}));
-        }
-        
-        Iterator list = null;
-        try
-        {
-            list = pm.getRules().iterator();
-        } catch (Exception e)
-        {
-            throw new SerializerException(
-                    SerializerException.GET_EXISTING_OBJECTS
-                            .create(new String[]
-                            { "ProfilingRules", e.getMessage()}));
-        }
-        while (list.hasNext())
-        {
-            try
-            {
-                ProfilingRule p = (ProfilingRule) list.next();
-                if (!(this.rulesMap.containsKey(p.getId())))
-                {
-                    JSProfilingRule rule = createProfilingRule(p, (standardRuleClass == p.getClass()));
-                    rulesMap.put(rule.getId(), rule);
-                    ((JSSeedData)getSnapshot()).getRules().add(rule);
-
-                }
-            } catch (Exception e)
-            {
-                throw new SerializerException(
-                        SerializerException.CREATE_SERIALIZED_OBJECT_FAILED
-                                .create(new String[]
-                                { "ProfilingRules", e.getMessage()}));
-            }
-        }
-
-        // determine the defualt rule
-        ProfilingRule defaultRule = pm.getDefaultRule();
-        if (defaultRule != null)
-        	((JSSeedData)getSnapshot()).setDefaultRule(defaultRule.getId());
-
-        // get Rules for each user
-
-        Iterator _itUsers = this.userMap.values().iterator();
-        while (_itUsers.hasNext())
-        {
-            JSUser _user = (JSUser) _itUsers.next();
-            Principal principal = _user.getPrincipal();
-            if (principal != null)
+            Object o = settings.get(key);
+            if (o != null && o instanceof Boolean)
             {
-                Collection col = pm.getRulesForPrincipal(principal);
-                Iterator _itCol = col.iterator();
-                while (_itCol.hasNext())
-                {
-                    PrincipalRule p1 = (PrincipalRule) _itCol.next();
-                    JSPrincipalRule pr = new JSPrincipalRule(p1
-                            .getLocatorName(), p1.getProfilingRule().getId());
-                    _user.getRules().add(pr);
-                }
+                return ((Boolean) o).booleanValue();
             }
         }
-
-        return;
-
+        return false;
     }
 
     /**
-     * Establish whether incoming passwords are "clear" text or whether they are
-     * to be decoded. That however depends on whether the passwords were encoded
-     * with the current active provider or not.
+     * Helper routine to create a unique filename for a backup of an existing
+     * filename....not intended to be rocket science...
      * 
+     * @param name
      * @return
      */
-    protected int compareCurrentSecurityProvider(JSSeedData file)
+    protected static String createUniqueBackupFilename(String name)
     {
-        String _fileEncryption = file.getEncryption();
-        if ((_fileEncryption == null) || (_fileEncryption.length() == 0))
-            return NO_DECODING; // passwords are in clear text
-        
-        if (_fileEncryption.equals(getEncryptionString()))
-        	return PASSTHRU_REQUIRED;
-        else
-        	return NO_DECODING;
-    }
+        String newName = name + ".bak";
 
-    private String getEncryptionString()
-    {
-        PasswordCredentialProvider provider = (PasswordCredentialProvider) getCM()
-        .getComponent("org.apache.jetspeed.security.spi.PasswordCredentialProvider");
-		if (provider == null)
-		{
-		    System.err
-		            .println("Error!!! PasswordCredentialProvider not available");
-		    return ENCODING_STRING;
-		}
-		try
-		{
-			PasswordCredential credential = provider.create(JETSPEED,ENCODING_STRING);
-			if ((credential != null) && (credential.getPassword() != null))
-				return new String(credential.getPassword());
-			else
-			    return ENCODING_STRING;
-		}
-		catch (Exception e)
-		{
-			e.printStackTrace();
-			return ENCODING_STRING;
-		}
+        File f = new File(newName);
+        int counter = 0;
+        if (!(f.exists()))
+            return newName;
+        while (counter < 100)
+        {
+            String newName1 = newName + counter;
+            if (!(new File(newName1).exists()))
+                return newName1;
+            counter++;
+        }
+        return null;
     }
-    
-    /**
-     * ++++++++++++++++++++++++++++++HELPERS
-     * +++++++++++++++++++++++++++++++++++++++++++++
-     */
-
-  
-
-
-    /**
-     * recreate a rule criterion object from the deserialized wrapper
-     * @param profiler established profile manager
-     * @param jsr deserialized object
-     * @return new RuleCriterion with content set to deserialized wrapepr
-     * @throws SerializerException
-     */
-	protected RuleCriterion recreateRuleCriterion(Profiler profiler, JSRuleCriterion jsr, ProfilingRule rule)
-		throws SerializerException, ClassNotFoundException
-	
-	{
-		try
-		{
-	
-	    	RuleCriterion c = profiler.createRuleCriterion();
-	    	if (c == null)
-	    		throw new SerializerException(
-	    				SerializerException.CREATE_OBJECT_FAILED
-	    					.create("org.apache.jetspeed.profiler.rules.RuleCriterion","returned null"));
-	    	c.setFallbackOrder(jsr.getFallBackOrder());
-	    	c.setFallbackType(jsr.getFallBackType());
-	    	c.setName(jsr.getName());
-	    	c.setType(jsr.getType());
-	    	c.setValue(jsr.getValue());
-	    	c.setRuleId(rule.getId());
-	    	return c;
-		}
-		catch (Exception e)
-		{
-			SerializerException.CREATE_OBJECT_FAILED
-			.create("org.apache.jetspeed.profiler.rules.RuleCriterion",e.getLocalizedMessage());
-			return null;
-		}
-	}
-    	
-	   /**
-     * recreate a profiling rule object from the deserialized wrapper and store it
-     * @param profiler established profile manager
-     * @param jsp deserialized object
-     * @
-     * @throws SerializerException, ClassNotFoundException, ProfilerException
-     */
-	   protected ProfilingRule recreateRule(Profiler profiler, ProfilingRule existingRule, JSProfilingRule jsp) throws SerializerException, ClassNotFoundException, ProfilerException
-	   {
-		   ProfilingRule rule = null;
-		   boolean existing = false;
-		   
-		   if (existingRule == null)
-		   {
-			   rule = profiler.getRule(jsp.getId());
-			   if (jsp.isStandardRule())
-			  	   rule = profiler.createProfilingRule(true);   
-			   else
-			  	   rule = profiler.createProfilingRule(false); 
-			   rule.setId(jsp.getId());
-		   }
-		   else
-		   {
-			   rule = existingRule;
-			   existing = true;
-		   }
-			   
-		   rule.setTitle(jsp.getDescription());
-		   
-		   JSRuleCriterions col = jsp.getCriterions();
-			   
-		   Iterator _it = col.iterator();
-		   while (_it.hasNext())
-		   {
-				   RuleCriterion c = recreateRuleCriterion(profiler, (JSRuleCriterion) _it.next(),rule);
-				   if (c != null)
-				   {
-					   Collection cHelp = rule.getRuleCriteria();
-					   if ((existing) && (cHelp.contains(c)))
-						   cHelp.remove(c); //remove existing duplicate
-					   cHelp.add(c); // add the current version back in
-				   }
-		   }
-		   return rule;
-
-	   }  	
-	
-    	
-    	
-	   private void recreateProfilingRules () throws SerializerException
-	    {
-	    	logMe("recreateProfilingRules - processing");
-	        Profiler pm = (Profiler) getCM()
-            .getComponent("org.apache.jetspeed.profiler.Profiler");
-	        if (pm == null)
-	        	throw new SerializerException(
-	        			SerializerException.COMPONENTMANAGER_DOES_NOT_EXIST
-                        	.create("org.apache.jetspeed.profiler.Profiler"));
-	    	JSProfilingRules rules = ((JSSeedData)getSnapshot()).getRules();
-	    	if ((rules != null) && (rules.size() > 0))
-	    	{
-	    		Iterator _it = rules.iterator();
-	    		while (_it.hasNext())
-	    		{
-	    			JSProfilingRule _c = (JSProfilingRule)_it.next();
-
-	    			try
-	    			{
-	    				ProfilingRule rule = null;
-	    				   
-	    				   rule = pm.getRule(_c.getId());
-	    				   if ((rule == null) || (this.getSetting(JetspeedSerializer.KEY_OVERWRITE_EXISTING)))
-	    				   {
-	    					   rule = recreateRule(pm,rule, _c);
-	    					   pm.storeProfilingRule(rule);
-	    				   }
-	    			}
-	    			catch (Exception e)
-	    			{
-	    				throw new SerializerException(
-	    			            SerializerException.CREATE_OBJECT_FAILED
-	    			            	.create("org.apache.jetspeed.capabilities.Capabilities",e.getLocalizedMessage()));
-	 			}
-	    		}
-	    		/** reset the default profiling rule */
-	    		String defaultRuleID = ((JSSeedData)getSnapshot()).getDefaultRule();
-	    		if (defaultRuleID != null)
-	    		{
-	    			ProfilingRule defaultRule = pm.getRule(defaultRuleID);
-	    			if (defaultRule != null)
-	    				pm.setDefaultRule(defaultRuleID);
-	    		}
-	    	}
-	    	else
-	    		logMe("NO PROFILING RULES?????");
-	    	logMe("recreateProfilingRules - done");
-	    }	
-
-
-
-}
+}
\ No newline at end of file

Modified: portals/jetspeed-2/branches/J2-M2-REDUX/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSPermission.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSPermission.java?view=diff&rev=533883&r1=533882&r2=533883
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSPermission.java (original)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/objects/JSPermission.java Mon Apr 30 16:41:09 2007
@@ -23,11 +23,6 @@
 import javolution.xml.stream.XMLStreamException;
 
 import org.apache.commons.lang.StringEscapeUtils;
-import org.apache.jetspeed.security.FolderPermission;
-import org.apache.jetspeed.security.FragmentPermission;
-import org.apache.jetspeed.security.PagePermission;
-import org.apache.jetspeed.security.PortalResourcePermission;
-import org.apache.jetspeed.security.PortletPermission;
 
 /**
  * Serialized Permission <permission type='folder' resource='/' actions='view,
@@ -118,31 +113,6 @@
 
 	}
 
-	public PortalResourcePermission getPermissionForType()
-	{
-		PortalResourcePermission newPermission = null; 
-		if ((this.type == null) || (this.type == TYPE_UNKNOWN))
-			return null;
-		try
-		{
-		if (type.equals(TYPE_FOLDER))
-			newPermission = new FolderPermission(this.resource,this.actions);
-		else if (type.equals(TYPE_FRAGMENT))
-			newPermission = new FragmentPermission(this.resource,this.actions);
-			else if (type.equals(TYPE_PAGE))
-				newPermission = new PagePermission(this.resource,this.actions);
-				else if (type.equals(TYPE_PORTAL))
-					newPermission = new PortletPermission(this.resource,this.actions);
-					else return null;
-			return newPermission;
-		}
-		catch (Exception e)
-		{
-			e.printStackTrace();
-			return null;
-		}
-		
-	}
 	public JSPermission()
 	{
 	}



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message