svn commit: r1578721 - in /portals/jetspeed-2/portal/trunk: components/jetspeed-capability/src/main/java/org/apache/jetspeed/serializer/ components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/ components/jetspeed-page-manager/src/main/...

[email protected]
Newsgroups gmane.comp.jakarta.jetspeed.devel
Message-ID <[email protected]>
Author: rwatler
Date: Tue Mar 18 02:25:49 2014
New Revision: 1578721

URL: http://svn.apache.org/r1578721
Log:
JS2-874: Generics cleanup.

Modified:
    portals/jetspeed-2/portal/trunk/components/jetspeed-capability/src/main/java/org/apache/jetspeed/serializer/JetspeedCapabilitiesSerializer.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/AbstractPageManager.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/DelegatingPageManager.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/serializer/JetspeedUserTemplateSerializer.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/java/org/apache/jetspeed/portalsite/TestPortalSite.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/spaces/SpacesServiceImpl.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/main/java/org/apache/jetspeed/serializer/JetspeedProfilerSerializer.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/serializer/JetspeedRegistrySerializer.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/serializer/JetspeedSecuritySerializer.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/AbstractJetspeedComponentSerializer.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/test/java/org/apache/jetspeed/serializer/TestSnapshot.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-sso/src/main/java/org/apache/jetspeed/serializer/JetspeedSSOSerializer.java
    portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/serializer/JetspeedComponentSerializer.java

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-capability/src/main/java/org/apache/jetspeed/serializer/JetspeedCapabilitiesSerializer.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-capability/src/main/java/org/apache/jetspeed/serializer/JetspeedCapabilitiesSerializer.java?rev=1578721&r1=1578720&r2=1578721&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-capability/src/main/java/org/apache/jetspeed/serializer/JetspeedCapabilitiesSerializer.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-capability/src/main/java/org/apache/jetspeed/serializer/JetspeedCapabilitiesSerializer.java Tue Mar 18 02:25:49 2014
@@ -74,7 +74,7 @@ public class JetspeedCapabilitiesSeriali
      * @see org.apache.jetspeed.serializer.JetspeedComponentSerializer#processImport(org.apache.jetspeed.serializer.objects.JSSnapshot,
      *      java.util.Map, org.apache.commons.logging.Log)
      */
-    protected void processImport(JSSnapshot snapshot, Map settings, Logger log) throws SerializerException
+    protected void processImport(JSSnapshot snapshot, Map<String,Object> settings, Logger log) throws SerializerException
     {
         if (isSettingSet(settings, JetspeedSerializer.KEY_PROCESS_CAPABILITIES))
         {
@@ -94,7 +94,7 @@ public class JetspeedCapabilitiesSeriali
      * @see org.apache.jetspeed.serializer.JetspeedComponentSerializer#processExport(org.apache.jetspeed.serializer.objects.JSSnapshot,
      *      java.util.Map, org.apache.commons.logging.Log)
      */
-    protected void processExport(JSSnapshot snapshot, Map settings, Logger log) throws SerializerException
+    protected void processExport(JSSnapshot snapshot, Map<String,Object> settings, Logger log) throws SerializerException
     {
         if (isSettingSet(settings, JetspeedSerializer.KEY_PROCESS_CAPABILITIES))
         {
@@ -109,7 +109,7 @@ public class JetspeedCapabilitiesSeriali
         }
     }
     
-    protected void deleteData(Map settings, Logger log) throws SerializerException
+    protected void deleteData(Map<String,Object> settings, Logger log) throws SerializerException
     {
         if (isSettingSet(settings, JetspeedSerializer.KEY_PROCESS_CAPABILITIES))
         {
@@ -149,7 +149,7 @@ public class JetspeedCapabilitiesSeriali
         }
     }
 
-    private void recreateCapabilities(JSSnapshot snapshot, Map settings, Logger log) throws SerializerException
+    private void recreateCapabilities(JSSnapshot snapshot, Map<String,Object> settings, Logger log) throws SerializerException
     {
         log.debug("recreateCapabilities - processing");
         JSCapabilities capabilities = snapshot.getCapabilities();
@@ -186,7 +186,7 @@ public class JetspeedCapabilitiesSeriali
         log.debug("recreateCapabilities - done");
     }
 
-    private void recreateMimeTypes(JSSnapshot snapshot, Map settings, Logger log) throws SerializerException
+    private void recreateMimeTypes(JSSnapshot snapshot, Map<String,Object> settings, Logger log) throws SerializerException
     {
         log.debug("recreateMimeTypes - processing");
         JSMimeTypes mimeTypes = snapshot.getMimeTypes();
@@ -224,7 +224,7 @@ public class JetspeedCapabilitiesSeriali
         log.debug("recreateMimeTypes - done");
     }
 
-    private void recreateMediaTypes(JSSnapshot snapshot, Map settings, Logger log) throws SerializerException
+    private void recreateMediaTypes(JSSnapshot snapshot, Map<String,Object> settings, Logger log) throws SerializerException
     {
         String line;
 
@@ -313,7 +313,7 @@ public class JetspeedCapabilitiesSeriali
         log.debug("recreateMediaTypes - done");
     }
 
-    private void recreateClients(JSSnapshot snapshot, Map settings, Logger log) throws SerializerException
+    private void recreateClients(JSSnapshot snapshot, Map<String,Object> settings, Logger log) throws SerializerException
     {
         String _line;
 
@@ -418,7 +418,7 @@ public class JetspeedCapabilitiesSeriali
      * 
      * @throws SerializerException
      */
-    private void exportCapabilites(Refs refs, JSSnapshot snapshot, Map settings, Logger log) throws SerializerException
+    private void exportCapabilites(Refs refs, JSSnapshot snapshot, Map<String,Object> settings, Logger log) throws SerializerException
     {
 
         Iterator list = caps.getCapabilities();
@@ -450,7 +450,7 @@ public class JetspeedCapabilitiesSeriali
      * 
      * @throws SerializerException
      */
-    private void exportMimeTypes(Refs refs, JSSnapshot snapshot, Map settings, Logger log) throws SerializerException
+    private void exportMimeTypes(Refs refs, JSSnapshot snapshot, Map<String,Object> settings, Logger log) throws SerializerException
     {
 
         Iterator list = caps.getMimeTypes();
@@ -537,7 +537,7 @@ public class JetspeedCapabilitiesSeriali
      * @return
      * @throws SerializerException
      */
-    private void exportClients(Refs refs, JSSnapshot snapshot, Map settings, Logger log) throws SerializerException
+    private void exportClients(Refs refs, JSSnapshot snapshot, Map<String,Object> settings, Logger log) throws SerializerException
     {
 
         /** first the the mime types */
@@ -570,7 +570,7 @@ public class JetspeedCapabilitiesSeriali
      *            capabilit container
      * @throws SerializerException
      */
-    private void exportMediaTypes(Refs refs, JSSnapshot snapshot, Map settings, Logger log) throws SerializerException
+    private void exportMediaTypes(Refs refs, JSSnapshot snapshot, Map<String,Object> settings, Logger log) throws SerializerException
     {
         Iterator list = caps.getMediaTypes();
 

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/AbstractPageManager.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/AbstractPageManager.java?rev=1578721&r1=1578720&r2=1578721&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/AbstractPageManager.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/AbstractPageManager.java Tue Mar 18 02:25:49 2014
@@ -188,39 +188,39 @@ public abstract class AbstractPageManage
         }
     }
     
-    public AbstractPageManager(IdGenerator generator, boolean permissionsEnabled, boolean constraintsEnabled, Map modelClasses)
+    public AbstractPageManager(IdGenerator generator, boolean permissionsEnabled, boolean constraintsEnabled, Map<String,Class<?>> modelClasses)
     {
         this(generator, permissionsEnabled, constraintsEnabled);     
 
-        this.fragmentClass = (Class)modelClasses.get("FragmentImpl");
-        this.pageClass = (Class)modelClasses.get("PageImpl");
-        this.folderClass = (Class)modelClasses.get("FolderImpl");
-        this.linkClass = (Class)modelClasses.get("LinkImpl");
-        this.pageSecurityClass = (Class)modelClasses.get("PageSecurityImpl");
-        this.folderMenuDefinitionClass = (Class)modelClasses.get("FolderMenuDefinitionImpl");
-        this.folderMenuExcludeDefinitionClass = (Class)modelClasses.get("FolderMenuExcludeDefinitionImpl");
-        this.folderMenuIncludeDefinitionClass = (Class)modelClasses.get("FolderMenuIncludeDefinitionImpl");
-        this.folderMenuOptionsDefinitionClass = (Class)modelClasses.get("FolderMenuOptionsDefinitionImpl");
-        this.folderMenuSeparatorDefinitionClass = (Class)modelClasses.get("FolderMenuSeparatorDefinitionImpl");
-        this.pageMenuDefinitionClass = (Class)modelClasses.get("PageMenuDefinitionImpl");
-        this.pageMenuExcludeDefinitionClass = (Class)modelClasses.get("PageMenuExcludeDefinitionImpl");
-        this.pageMenuIncludeDefinitionClass = (Class)modelClasses.get("PageMenuIncludeDefinitionImpl");
-        this.pageMenuOptionsDefinitionClass = (Class)modelClasses.get("PageMenuOptionsDefinitionImpl");
-        this.pageMenuSeparatorDefinitionClass = (Class)modelClasses.get("PageMenuSeparatorDefinitionImpl");
-        this.securityConstraintsClass = (Class)modelClasses.get("SecurityConstraintsImpl");
-        this.folderSecurityConstraintClass = (Class)modelClasses.get("FolderSecurityConstraintImpl");
-        this.pageSecurityConstraintClass = (Class)modelClasses.get("PageSecurityConstraintImpl");
-        this.fragmentSecurityConstraintClass = (Class)modelClasses.get("FragmentSecurityConstraintImpl");
-        this.linkSecurityConstraintClass = (Class)modelClasses.get("LinkSecurityConstraintImpl");
-        this.pageSecuritySecurityConstraintClass = (Class)modelClasses.get("PageSecuritySecurityConstraintImpl");
-        this.securityConstraintsDefClass = (Class)modelClasses.get("SecurityConstraintsDefImpl");
-        this.fragmentPreferenceClass = (Class)modelClasses.get("FragmentPreferenceImpl");
-        this.fragmentReferenceClass = (Class)modelClasses.get("FragmentReferenceImpl");
-        this.pageFragmentClass = (Class)modelClasses.get("PageFragmentImpl");
-        this.pageTemplateClass = (Class)modelClasses.get("PageTemplateImpl");
-        this.dynamicPageClass = (Class)modelClasses.get("DynamicPageImpl");
-        this.fragmentDefinitionClass = (Class)modelClasses.get("FragmentDefinitionImpl");
-        this.fragmentPropertyClass = (Class)modelClasses.get("FragmentPropertyImpl");
+        this.fragmentClass = modelClasses.get("FragmentImpl");
+        this.pageClass = modelClasses.get("PageImpl");
+        this.folderClass = modelClasses.get("FolderImpl");
+        this.linkClass = modelClasses.get("LinkImpl");
+        this.pageSecurityClass = modelClasses.get("PageSecurityImpl");
+        this.folderMenuDefinitionClass = modelClasses.get("FolderMenuDefinitionImpl");
+        this.folderMenuExcludeDefinitionClass = modelClasses.get("FolderMenuExcludeDefinitionImpl");
+        this.folderMenuIncludeDefinitionClass = modelClasses.get("FolderMenuIncludeDefinitionImpl");
+        this.folderMenuOptionsDefinitionClass = modelClasses.get("FolderMenuOptionsDefinitionImpl");
+        this.folderMenuSeparatorDefinitionClass = modelClasses.get("FolderMenuSeparatorDefinitionImpl");
+        this.pageMenuDefinitionClass = modelClasses.get("PageMenuDefinitionImpl");
+        this.pageMenuExcludeDefinitionClass = modelClasses.get("PageMenuExcludeDefinitionImpl");
+        this.pageMenuIncludeDefinitionClass = modelClasses.get("PageMenuIncludeDefinitionImpl");
+        this.pageMenuOptionsDefinitionClass = modelClasses.get("PageMenuOptionsDefinitionImpl");
+        this.pageMenuSeparatorDefinitionClass = modelClasses.get("PageMenuSeparatorDefinitionImpl");
+        this.securityConstraintsClass = modelClasses.get("SecurityConstraintsImpl");
+        this.folderSecurityConstraintClass = modelClasses.get("FolderSecurityConstraintImpl");
+        this.pageSecurityConstraintClass = modelClasses.get("PageSecurityConstraintImpl");
+        this.fragmentSecurityConstraintClass = modelClasses.get("FragmentSecurityConstraintImpl");
+        this.linkSecurityConstraintClass = modelClasses.get("LinkSecurityConstraintImpl");
+        this.pageSecuritySecurityConstraintClass = modelClasses.get("PageSecuritySecurityConstraintImpl");
+        this.securityConstraintsDefClass = modelClasses.get("SecurityConstraintsDefImpl");
+        this.fragmentPreferenceClass = modelClasses.get("FragmentPreferenceImpl");
+        this.fragmentReferenceClass = modelClasses.get("FragmentReferenceImpl");
+        this.pageFragmentClass = modelClasses.get("PageFragmentImpl");
+        this.pageTemplateClass = modelClasses.get("PageTemplateImpl");
+        this.dynamicPageClass = modelClasses.get("DynamicPageImpl");
+        this.fragmentDefinitionClass = modelClasses.get("FragmentDefinitionImpl");
+        this.fragmentPropertyClass = modelClasses.get("FragmentPropertyImpl");
     }
     
     /* (non-Javadoc)

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/DelegatingPageManager.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/DelegatingPageManager.java?rev=1578721&r1=1578720&r2=1578721&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/DelegatingPageManager.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/DelegatingPageManager.java Tue Mar 18 02:25:49 2014
@@ -55,7 +55,7 @@ public class DelegatingPageManager exten
             IdGenerator generator,
             boolean isPermissionsSecurity, 
             boolean isConstraintsSecurity,
-            Map modelClasses)
+            Map<String,Class<?>> modelClasses)
     {
         super(generator, isPermissionsSecurity, isConstraintsSecurity, modelClasses);
         this.delegate = delegate;

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/serializer/JetspeedUserTemplateSerializer.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/serializer/JetspeedUserTemplateSerializer.java?rev=1578721&r1=1578720&r2=1578721&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/serializer/JetspeedUserTemplateSerializer.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/serializer/JetspeedUserTemplateSerializer.java Tue Mar 18 02:25:49 2014
@@ -65,7 +65,7 @@ public class JetspeedUserTemplateSeriali
      * @see org.apache.jetspeed.serializer.JetspeedComponentSerializer#processExport(org.apache.jetspeed.serializer.objects.JSSnapshot,
      *      java.util.Map, org.apache.commons.logging.Log)
      */
-    protected void processExport(JSSnapshot snapshot, Map settings, Logger log) throws SerializerException
+    protected void processExport(JSSnapshot snapshot, Map<String,Object> settings, Logger log) throws SerializerException
     {
         if (isSettingSet(settings, JetspeedSerializer.KEY_PROCESS_USER_TEMPLATES))
         {
@@ -79,7 +79,7 @@ public class JetspeedUserTemplateSeriali
      * @see org.apache.jetspeed.serializer.JetspeedComponentSerializer#processImport(org.apache.jetspeed.serializer.objects.JSSnapshot,
      *      java.util.Map, org.apache.commons.logging.Log)
      */
-    protected void processImport(JSSnapshot snapshot, Map settings, Logger log) throws SerializerException
+    protected void processImport(JSSnapshot snapshot, Map<String,Object> settings, Logger log) throws SerializerException
     {
         if (isSettingSet(settings, JetspeedSerializer.KEY_PROCESS_USER_TEMPLATES))
         {
@@ -127,7 +127,7 @@ public class JetspeedUserTemplateSeriali
         }
     }
 
-    protected void deleteData(Map settings, Logger log) throws SerializerException
+    protected void deleteData(Map<String,Object> settings, Logger log) throws SerializerException
     {
         if (isSettingSet(settings, JetspeedSerializer.KEY_PROCESS_USER_TEMPLATES))
         {

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/java/org/apache/jetspeed/portalsite/TestPortalSite.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/java/org/apache/jetspeed/portalsite/TestPortalSite.java?rev=1578721&r1=1578720&r2=1578721&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/java/org/apache/jetspeed/portalsite/TestPortalSite.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/test/java/org/apache/jetspeed/portalsite/TestPortalSite.java Tue Mar 18 02:25:49 2014
@@ -644,14 +644,14 @@ public class TestPortalSite extends Abst
         assertNotNull(requestPageTemplateView);
         assertEquals("template.tpsml", requestPageTemplateView.getName());
         assertEquals("/template.tpsml", extractFileSystemPathFromId(requestPageTemplateView.getId()));
-        Map requestFragmentDefinitionViews = requestContext.getFragmentDefinitions();
+        Map<String,FragmentDefinition> requestFragmentDefinitionViews = requestContext.getFragmentDefinitions();
         assertNotNull(requestFragmentDefinitionViews);
         assertEquals(2, requestFragmentDefinitionViews.size());
-        FragmentDefinition requestFragmentDefinitionView0 = (FragmentDefinition)requestFragmentDefinitionViews.get("fake-fragment-definition-0");
+        FragmentDefinition requestFragmentDefinitionView0 = requestFragmentDefinitionViews.get("fake-fragment-definition-0");
         assertNotNull(requestFragmentDefinitionView0);
         assertEquals("definition0.fpsml", requestFragmentDefinitionView0.getName());
         assertEquals("/definition0.fpsml", extractFileSystemPathFromId(requestFragmentDefinitionView0.getId()));
-        FragmentDefinition requestFragmentDefinitionView1 = (FragmentDefinition)requestFragmentDefinitionViews.get("fake-fragment-definition-1");
+        FragmentDefinition requestFragmentDefinitionView1 = requestFragmentDefinitionViews.get("fake-fragment-definition-1");
         assertNotNull(requestFragmentDefinitionView1);
         assertEquals("definition1.fpsml", requestFragmentDefinitionView1.getName());
         assertEquals("/_user/user/definition1.fpsml", extractFileSystemPathFromId(requestFragmentDefinitionView1.getId()));        

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/spaces/SpacesServiceImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/spaces/SpacesServiceImpl.java?rev=1578721&r1=1578720&r2=1578721&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/spaces/SpacesServiceImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/spaces/SpacesServiceImpl.java Tue Mar 18 02:25:49 2014
@@ -16,13 +16,6 @@
  */
 package org.apache.jetspeed.spaces;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Locale;
-
 import org.apache.jetspeed.administration.AdminUtil;
 import org.apache.jetspeed.locator.TemplateLocator;
 import org.apache.jetspeed.om.folder.Folder;
@@ -36,6 +29,13 @@ import org.apache.jetspeed.page.document
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Locale;
+
 /**
  * Spaces Services
  *
@@ -62,11 +62,9 @@ public class SpacesServiceImpl implement
         try
         {
             envFolder = pageManager.getFolder(ENVIRONMENTS_LOCATION);
-            Iterator<Folder> it = envFolder.getFolders().iterator(); 
-            while (it.hasNext())
+            for (Node backingFolderNode : envFolder.getFolders())
             {
-                Folder backingFolder = it.next();
-                Environment env = loadEnvironment(backingFolder);
+                Environment env = loadEnvironment((Folder)backingFolderNode);
                 envs.add(env);
             }            
         }
@@ -147,11 +145,10 @@ public class SpacesServiceImpl implement
         {
             Folder root = pageManager.getFolder(Folder.PATH_SEPARATOR);
             Space defaultSpace = loadSpace(root);
-            result.add(defaultSpace);            
-            Iterator<Folder> spaces = root.getFolders().iterator();
-            for (int ix = 0; spaces.hasNext(); ix++)
+            result.add(defaultSpace);
+            for (Node folderNode : root.getFolders())
             {
-                Folder folder = spaces.next();
+                Folder folder = (Folder)folderNode;
                 if (folder.isReserved())
                     continue;
                 
@@ -188,10 +185,9 @@ public class SpacesServiceImpl implement
         }
         try
         {
-	        Iterator<Link> links = envFolder.getLinks().iterator();
-	        while (links.hasNext())
+            for (Node linkNode : envFolder.getLinks())
 	        {
-	        	Link link = links.next();
+	        	Link link = (Link)linkNode;
 	        	String spacePath = link.getPath();
 	        	Folder folder = pageManager.getFolder(spacePath);
                 if (folder.isHidden() || folder.isReserved())

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/main/java/org/apache/jetspeed/serializer/JetspeedProfilerSerializer.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/main/java/org/apache/jetspeed/serializer/JetspeedProfilerSerializer.java?rev=1578721&r1=1578720&r2=1578721&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/main/java/org/apache/jetspeed/serializer/JetspeedProfilerSerializer.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-profiler/src/main/java/org/apache/jetspeed/serializer/JetspeedProfilerSerializer.java Tue Mar 18 02:25:49 2014
@@ -65,7 +65,7 @@ public class JetspeedProfilerSerializer 
      * @see org.apache.jetspeed.serializer.JetspeedComponentSerializer#processExport(org.apache.jetspeed.serializer.objects.JSSnapshot,
      *      java.util.Map, org.apache.commons.logging.Log)
      */
-    protected void processExport(JSSnapshot snapshot, Map settings, Logger log) throws SerializerException
+    protected void processExport(JSSnapshot snapshot, Map<String,Object> settings, Logger log) throws SerializerException
     {
         if (isSettingSet(settings, JetspeedSerializer.KEY_PROCESS_PROFILER))
         {
@@ -75,7 +75,7 @@ public class JetspeedProfilerSerializer 
         }
     }
 
-    protected void deleteData(Map settings, Logger log) throws SerializerException
+    protected void deleteData(Map<String,Object> settings, Logger log) throws SerializerException
     {
         if (isSettingSet(settings, JetspeedSerializer.KEY_PROCESS_PROFILER))
         {
@@ -110,7 +110,7 @@ public class JetspeedProfilerSerializer 
      * @see org.apache.jetspeed.serializer.JetspeedComponentSerializer#processImport(org.apache.jetspeed.serializer.objects.JSSnapshot,
      *      java.util.Map, org.apache.commons.logging.Log)
      */
-    protected void processImport(JSSnapshot snapshot, Map settings, Logger log) throws SerializerException
+    protected void processImport(JSSnapshot snapshot, Map<String,Object> settings, Logger log) throws SerializerException
     {
         if (isSettingSet(settings, JetspeedSerializer.KEY_PROCESS_PROFILER))
         {
@@ -120,7 +120,7 @@ public class JetspeedProfilerSerializer 
         }
     }
 
-    private void recreateProfilingRules(JSSnapshot snapshot, Map settings, Logger log) throws SerializerException
+    private void recreateProfilingRules(JSSnapshot snapshot, Map<String,Object> settings, Logger log) throws SerializerException
     {
         log.debug("recreateProfilingRules - processing");
         JSProfilingRules rules = snapshot.getRules();
@@ -167,7 +167,7 @@ public class JetspeedProfilerSerializer 
      * 
      * @throws SerializerException
      */
-    private void recreateUserPrincipalRules(JSSnapshot snapshot, Map settings, Logger log) throws SerializerException
+    private void recreateUserPrincipalRules(JSSnapshot snapshot, Map<String,Object> settings, Logger log) throws SerializerException
     {
         log.debug("recreateUserPrincipalRules - started");
 
@@ -322,7 +322,7 @@ public class JetspeedProfilerSerializer 
      * 
      * @throws SerializerException
      */
-    private void exportProfilingRules(JSSnapshot snapshot, Map settings, Logger log) throws SerializerException
+    private void exportProfilingRules(JSSnapshot snapshot, Map<String,Object> settings, Logger log) throws SerializerException
     {
         HashMap rulesMap = new HashMap();
         Class standardRuleClass = null;
@@ -373,7 +373,7 @@ public class JetspeedProfilerSerializer 
             snapshot.setDefaultRule(defaultRule.getId());
     }
 
-    private void exportUserPrincipalRules(JSSnapshot snapshot, Map settings, Logger log) throws SerializerException
+    private void exportUserPrincipalRules(JSSnapshot snapshot, Map<String,Object> settings, Logger log) throws SerializerException
     {
         // get Rules for each user
         

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/serializer/JetspeedRegistrySerializer.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/serializer/JetspeedRegistrySerializer.java?rev=1578721&r1=1578720&r2=1578721&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/serializer/JetspeedRegistrySerializer.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/serializer/JetspeedRegistrySerializer.java Tue Mar 18 02:25:49 2014
@@ -74,7 +74,7 @@ public class JetspeedRegistrySerializer 
      * @see org.apache.jetspeed.serializer.JetspeedComponentSerializer#processExport(org.apache.jetspeed.serializer.objects.JSSnapshot, java.util.Map,
      * org.apache.commons.logging.Log)
      */
-    protected void processExport(JSSnapshot snapshot, Map settings, Logger log) throws SerializerException
+    protected void processExport(JSSnapshot snapshot, Map<String,Object> settings, Logger log) throws SerializerException
     {
         if (isSettingSet(settings, JetspeedSerializer.KEY_PROCESS_USER_PREFERENCES))
         {
@@ -88,7 +88,7 @@ public class JetspeedRegistrySerializer 
      * @see org.apache.jetspeed.serializer.JetspeedComponentSerializer#processImport(org.apache.jetspeed.serializer.objects.JSSnapshot, java.util.Map,
      * org.apache.commons.logging.Log)
      */
-    protected void processImport(JSSnapshot snapshot, Map settings, Logger log) throws SerializerException
+    protected void processImport(JSSnapshot snapshot, Map<String,Object> settings, Logger log) throws SerializerException
     {
         if (isSettingSet(settings, JetspeedSerializer.KEY_PROCESS_USER_PREFERENCES))
         {
@@ -97,7 +97,7 @@ public class JetspeedRegistrySerializer 
         }
     }
 
-    protected void deleteData(Map settings, Logger log) throws SerializerException
+    protected void deleteData(Map<String,Object> settings, Logger log) throws SerializerException
     {
         if (isSettingSet(settings, JetspeedSerializer.KEY_PROCESS_USER_PREFERENCES))
         {
@@ -126,7 +126,7 @@ public class JetspeedRegistrySerializer 
         }
     }
 
-    private void importEntities(JSSnapshot snapshot, Map settings, Logger log) throws SerializerException
+    private void importEntities(JSSnapshot snapshot, Map<String,Object> settings, Logger log) throws SerializerException
     {
         JSApplications applications = snapshot.getApplications();
         if (applications == null)
@@ -152,7 +152,7 @@ public class JetspeedRegistrySerializer 
         }
     }
 
-    void importPA(JSApplication app, PortletApplication pa, Map settings, Logger log) throws SerializerException
+    void importPA(JSApplication app, PortletApplication pa, Map<String,Object> settings, Logger log) throws SerializerException
     {
         /**
          * while more PAs for each portletDef list:entityMan:getPortletEntity(pd)
@@ -176,7 +176,7 @@ public class JetspeedRegistrySerializer 
         }
     }
 
-    private void importPD(JSApplication app, JSPortlet portlet, PortletDefinition pd, Map settings, Logger log) throws SerializerException
+    private void importPD(JSApplication app, JSPortlet portlet, PortletDefinition pd, Map<String,Object> settings, Logger log) throws SerializerException
     {
         Iterator it = portlet.getEntities().iterator();
         while (it.hasNext())
@@ -186,7 +186,7 @@ public class JetspeedRegistrySerializer 
         }
     }
 
-    private void importEntityPref(JSApplication app, JSPortlet portlet, JSEntity entity, PortletDefinition pd, Map settings, Logger log)
+    private void importEntityPref(JSApplication app, JSPortlet portlet, JSEntity entity, PortletDefinition pd, Map<String,Object> settings, Logger log)
     {
         JSEntityPreferences preferences = entity.getEntityPreferences();
         if ((preferences == null) || (preferences.size() == 0))
@@ -244,7 +244,7 @@ public class JetspeedRegistrySerializer 
         }
     }
 
-    private void exportEntities(JSSnapshot snapshot, Map settings, Logger log) throws SerializerException
+    private void exportEntities(JSSnapshot snapshot, Map<String,Object> settings, Logger log) throws SerializerException
     {
         Collection col = registry.getPortletApplications();
         if ((col == null) || (col.size() == 0))
@@ -279,7 +279,7 @@ public class JetspeedRegistrySerializer 
         }
     }
 
-    private JSApplication exportPA(PortletApplication pa, Map settings, Logger log) throws SerializerException
+    private JSApplication exportPA(PortletApplication pa, Map<String,Object> settings, Logger log) throws SerializerException
     {
         JSApplication jsApplication = null;
         /**
@@ -319,7 +319,7 @@ public class JetspeedRegistrySerializer 
         return jsApplication;
     }
 
-    private JSPortlet exportPD(PortletDefinition pd, Map settings, Logger log) throws SerializerException
+    private JSPortlet exportPD(PortletDefinition pd, Map<String,Object> settings, Logger log) throws SerializerException
     {
         JSPortlet jsPortlet = null;
         try
@@ -350,7 +350,7 @@ public class JetspeedRegistrySerializer 
         return jsPortlet;
     }
 
-    JSEntity exportEntityPref(PortletDefinition definition, String windowId, Map settings, Logger log)
+    JSEntity exportEntityPref(PortletDefinition definition, String windowId, Map<String,Object> settings, Logger log)
     {
         JSEntity jsEntity = null;
         jsEntity = new JSEntity();

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/serializer/JetspeedSecuritySerializer.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/serializer/JetspeedSecuritySerializer.java?rev=1578721&r1=1578720&r2=1578721&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/serializer/JetspeedSecuritySerializer.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/serializer/JetspeedSecuritySerializer.java Tue Mar 18 02:25:49 2014
@@ -139,7 +139,7 @@ public class JetspeedSecuritySerializer 
         this.domainStorageManager=sdsm;
     }
 
-    protected void processExport(JSSnapshot snapshot, Map settings, Logger log) throws SerializerException
+    protected void processExport(JSSnapshot snapshot, Map<String,Object> settings, Logger log) throws SerializerException
     {
         if (isSettingSet(settings, JetspeedSerializer.KEY_PROCESS_USERS))
         {
@@ -163,7 +163,7 @@ public class JetspeedSecuritySerializer 
         }
     }
 
-    protected void processImport(JSSnapshot snapshot, Map settings, Logger log) throws SerializerException
+    protected void processImport(JSSnapshot snapshot, Map<String,Object> settings, Logger log) throws SerializerException
     {
         if (isSettingSet(settings, JetspeedSerializer.KEY_PROCESS_USERS))
         {
@@ -190,7 +190,7 @@ public class JetspeedSecuritySerializer 
         }
     }
 
-    protected void deleteData(Map settings, Logger log) throws SerializerException
+    protected void deleteData(Map<String,Object> settings, Logger log) throws SerializerException
     {
         if (isSettingSet(settings, JetspeedSerializer.KEY_PROCESS_USERS))
         {
@@ -247,7 +247,7 @@ public class JetspeedSecuritySerializer 
         return domain;
     }
     
-    private void recreateSecurityDomains(ImportRefs refs, JSSnapshot snapshot, Map settings, Logger log) throws SerializerException {
+    private void recreateSecurityDomains(ImportRefs refs, JSSnapshot snapshot, Map<String,Object> settings, Logger log) throws SerializerException {
         log.debug("recreateSecurityDomains");
     
      // create system and default domain. Adding them to the seed is not necessary!           
@@ -339,7 +339,7 @@ public class JetspeedSecuritySerializer 
      * 
      * @throws SerializerException
      */
-    private void recreateJetspeedPrincipals(ImportRefs refs, JSSnapshot snapshot, Map settings, Logger log)
+    private void recreateJetspeedPrincipals(ImportRefs refs, JSSnapshot snapshot, Map<String,Object> settings, Logger log)
             throws SerializerException
     {
         log.debug("recreateJetspeedPrincipals");
@@ -584,7 +584,7 @@ public class JetspeedSecuritySerializer 
         log.debug("recreate jetspeed principals - done");
     }
     
-    private void recreateUserPrincipal(ImportRefs refs, JSSnapshot snapshot, Map settings, Logger log, JSPrincipal jsuser, int passwordEncoding)
+    private void recreateUserPrincipal(ImportRefs refs, JSSnapshot snapshot, Map<String,Object> settings, Logger log, JSPrincipal jsuser, int passwordEncoding)
     throws SerializerException
     {
         try
@@ -679,7 +679,7 @@ public class JetspeedSecuritySerializer 
         }
     }
 
-    private void recreateJetspeedPrincipalAssociations(ImportRefs refs, JSSnapshot snapshot, Map settings, Logger log)
+    private void recreateJetspeedPrincipalAssociations(ImportRefs refs, JSSnapshot snapshot, Map<String,Object> settings, Logger log)
             throws SerializerException
     {
         log.debug("recreateJetspeedPrincipalAssociations");
@@ -716,7 +716,7 @@ public class JetspeedSecuritySerializer 
      * 
      * @throws SerializerException
      */
-    private void recreatePermissions(ImportRefs refs, JSSnapshot snapshot, Map settings, Logger log) throws SerializerException
+    private void recreatePermissions(ImportRefs refs, JSSnapshot snapshot, Map<String,Object> settings, Logger log) throws SerializerException
     {
         log.debug("recreatePermissions - started");
         JSPermissions permissionList = null ;
@@ -855,7 +855,7 @@ public class JetspeedSecuritySerializer 
      * @throws SerializerException
      * @throws SecurityException 
      */
-    private void exportJetspeedPrincipals(ExportRefs refs, JSSnapshot snapshot, Map settings, Logger log)
+    private void exportJetspeedPrincipals(ExportRefs refs, JSSnapshot snapshot, Map<String,Object> settings, Logger log)
             throws SerializerException, SecurityException
     {
         /** set the security provider info in the snapshot file */
@@ -885,7 +885,7 @@ public class JetspeedSecuritySerializer 
         }
     }
 
-    private void exportJetspeedPrincipalAssociations(ExportRefs refs, JSSnapshot snapshot, Map settings, Logger log) throws SecurityException, SerializerException
+    private void exportJetspeedPrincipalAssociations(ExportRefs refs, JSSnapshot snapshot, Map<String,Object> settings, Logger log) throws SecurityException, SerializerException
     {
         Map<String, JetspeedPrincipalType> principalTypes = this.principalManagerProvider.getPrincipalTypeMap();
         Map<String, JetspeedPrincipalType> copiedPrincipalTypes = new HashMap<String, JetspeedPrincipalType>(principalTypes);
@@ -936,7 +936,7 @@ public class JetspeedSecuritySerializer 
      * 
      * @throws SerializerException
      */
-    private void exportPermissions(ExportRefs refs, JSSnapshot snapshot, Map settings, Logger log) throws SerializerException, SecurityException
+    private void exportPermissions(ExportRefs refs, JSSnapshot snapshot, Map<String,Object> settings, Logger log) throws SerializerException, SecurityException
     {
         for (JetspeedPermission perm : pm.getPermissions())
         {

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/AbstractJetspeedComponentSerializer.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/AbstractJetspeedComponentSerializer.java?rev=1578721&r1=1578720&r2=1578721&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/AbstractJetspeedComponentSerializer.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/AbstractJetspeedComponentSerializer.java Tue Mar 18 02:25:49 2014
@@ -32,26 +32,26 @@ import org.apache.jetspeed.serializer.ob
  */
 public abstract class AbstractJetspeedComponentSerializer implements JetspeedComponentSerializer
 {
-    public void deleteData(Map settings) throws SerializerException
+    public void deleteData(Map<String,Object> settings) throws SerializerException
     {
         deleteData(settings, (Logger)settings.get(JetspeedSerializer.KEY_LOGGER));
     }
 
-    public void processExport(JetspeedSerializedData data, Map settings) throws SerializerException
+    public void processExport(JetspeedSerializedData data, Map<String,Object> settings) throws SerializerException
     {
         processExport((JSSnapshot)data, settings, (Logger)settings.get(JetspeedSerializer.KEY_LOGGER));
     }
 
-    public void processImport(JetspeedSerializedData data, Map settings) throws SerializerException
+    public void processImport(JetspeedSerializedData data, Map<String,Object> settings) throws SerializerException
     {
         processImport((JSSnapshot)data, settings, (Logger)settings.get(JetspeedSerializer.KEY_LOGGER));
     }
 
-    protected abstract void deleteData(Map settings, Logger log) throws SerializerException;
+    protected abstract void deleteData(Map<String,Object> settings, Logger log) throws SerializerException;
 
-    protected abstract void processExport(JSSnapshot data, Map settings, Logger log) throws SerializerException;
+    protected abstract void processExport(JSSnapshot data, Map<String,Object> settings, Logger log) throws SerializerException;
 
-    protected abstract void processImport(JSSnapshot data, Map settings, Logger log) throws SerializerException;
+    protected abstract void processImport(JSSnapshot data, Map<String,Object> settings, Logger log) throws SerializerException;
     
     /**
      * returns if the key for a particular setting is true. False if the key
@@ -60,7 +60,7 @@ public abstract class AbstractJetspeedCo
      * @param key
      * @return
      */
-    protected static boolean isSettingSet(Map settings, String key)
+    protected static boolean isSettingSet(Map<String,Object> settings, String key)
     {
         if ( settings != null )
         {

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/test/java/org/apache/jetspeed/serializer/TestSnapshot.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/test/java/org/apache/jetspeed/serializer/TestSnapshot.java?rev=1578721&r1=1578720&r2=1578721&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/test/java/org/apache/jetspeed/serializer/TestSnapshot.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/test/java/org/apache/jetspeed/serializer/TestSnapshot.java Tue Mar 18 02:25:49 2014
@@ -16,14 +16,14 @@
  */
 package org.apache.jetspeed.serializer;
 
+import org.apache.jetspeed.serializer.objects.JSSnapshot;
+import org.apache.jetspeed.test.JetspeedTestCase;
+
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.jetspeed.serializer.objects.JSSnapshot;
-import org.apache.jetspeed.test.JetspeedTestCase;
-
 public class TestSnapshot extends JetspeedTestCase
 {
     protected void setUp() throws Exception
@@ -39,7 +39,7 @@ public class TestSnapshot extends Jetspe
     public void testSnapshot() throws Exception
     {
     	List<JetspeedComponentSerializer> serializers = new LinkedList<JetspeedComponentSerializer>();
-    	Map<String,String> settings = new HashMap<String,String>();
+    	Map<String,Object> settings = new HashMap<String,Object>();
     	JetspeedSerializerImpl serializer = new JetspeedSerializerImpl(serializers, settings);    
     	JSSnapshot snapshot = serializer.readSnapshot("j2-seed.xml", JetspeedSerializer.DEFAULT_TAG_SNAPSHOT_NAME);
     	assertNotNull(snapshot);

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-sso/src/main/java/org/apache/jetspeed/serializer/JetspeedSSOSerializer.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-sso/src/main/java/org/apache/jetspeed/serializer/JetspeedSSOSerializer.java?rev=1578721&r1=1578720&r2=1578721&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-sso/src/main/java/org/apache/jetspeed/serializer/JetspeedSSOSerializer.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-sso/src/main/java/org/apache/jetspeed/serializer/JetspeedSSOSerializer.java Tue Mar 18 02:25:49 2014
@@ -60,7 +60,7 @@ public class JetspeedSSOSerializer exten
     /* (non-Javadoc)
      * @see org.apache.jetspeed.serializer.AbstractJetspeedComponentSerializer#deleteData(java.util.Map, org.slf4j.Logger)
      */
-    protected void deleteData(Map settings, Logger log) throws SerializerException
+    protected void deleteData(Map<String,Object> settings, Logger log) throws SerializerException
     {
         if (isSettingSet(settings, JetspeedSerializer.KEY_PROCESS_SSO))
         {
@@ -71,7 +71,7 @@ public class JetspeedSSOSerializer exten
     /* (non-Javadoc)
      * @see org.apache.jetspeed.serializer.AbstractJetspeedComponentSerializer#processExport(org.apache.jetspeed.serializer.objects.JSSnapshot, java.util.Map, org.slf4j.Logger)
      */
-    protected void processExport(JSSnapshot data, Map settings, Logger log) throws SerializerException
+    protected void processExport(JSSnapshot data, Map<String,Object> settings, Logger log) throws SerializerException
     {
         if (isSettingSet(settings, JetspeedSerializer.KEY_PROCESS_SSO))
         {
@@ -83,7 +83,7 @@ public class JetspeedSSOSerializer exten
     /* (non-Javadoc)
      * @see org.apache.jetspeed.serializer.AbstractJetspeedComponentSerializer#processImport(org.apache.jetspeed.serializer.objects.JSSnapshot, java.util.Map, org.slf4j.Logger)
      */
-    protected void processImport(JSSnapshot data, Map settings, Logger log) throws SerializerException
+    protected void processImport(JSSnapshot data, Map<String,Object> settings, Logger log) throws SerializerException
     {
         if (isSettingSet(settings, JetspeedSerializer.KEY_PROCESS_SSO))
         {
@@ -99,7 +99,7 @@ public class JetspeedSSOSerializer exten
      * @param log export logger
      * @throws SerializerException
      */
-    private void deleteSSOSites(Map settings, Logger log) throws SerializerException
+    private void deleteSSOSites(Map<String,Object> settings, Logger log) throws SerializerException
     {
         Iterator<SSOSite> list = null;
         try
@@ -191,7 +191,7 @@ public class JetspeedSSOSerializer exten
      * @param log export logger
      * @throws SerializerException
      */
-    private void exportSSOSites(JSSnapshot data, Map settings, Logger log) throws SerializerException
+    private void exportSSOSites(JSSnapshot data, Map<String,Object> settings, Logger log) throws SerializerException
     {
         Map<String,JSSSOSite> ssoSitesMap = new HashMap<String,JSSSOSite>();
         Iterator<SSOSite> list = null;
@@ -293,7 +293,7 @@ public class JetspeedSSOSerializer exten
      * @param log import logger
      * @throws SerializerException
      */
-    private void recreateSSOSites(JSSnapshot data, Map settings, Logger log) throws SerializerException
+    private void recreateSSOSites(JSSnapshot data, Map<String,Object> settings, Logger log) throws SerializerException
     {
         log.debug("recreateSSOSites - processing");
 

Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/serializer/JetspeedComponentSerializer.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/serializer/JetspeedComponentSerializer.java?rev=1578721&r1=1578720&r2=1578721&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/serializer/JetspeedComponentSerializer.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/serializer/JetspeedComponentSerializer.java Tue Mar 18 02:25:49 2014
@@ -26,7 +26,7 @@ import java.util.Map;
  */
 public interface JetspeedComponentSerializer
 {
-    void processImport(JetspeedSerializedData data, Map settings) throws SerializerException;
-    void processExport(JetspeedSerializedData data, Map settings) throws SerializerException;
-    void deleteData(Map settings) throws SerializerException;
+    void processImport(JetspeedSerializedData data, Map<String,Object> settings) throws SerializerException;
+    void processExport(JetspeedSerializedData data, Map<String,Object> settings) throws SerializerException;
+    void deleteData(Map<String,Object> settings) throws SerializerException;
 }
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.