Author: taylor
Date: Fri May 16 02:42:46 2014
New Revision: 1595089
URL: http://svn.apache.org/r1595089
Log:
JS2-874 - refactor Jetspeed API to use generics
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetUserListAction.java
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/request/JetspeedRequestContext.java
portals/jetspeed-2/portal/trunk/components/jetspeed-search/src/main/java/org/apache/jetspeed/search/AbstractObjectHandler.java
portals/jetspeed-2/portal/trunk/components/jetspeed-search/src/main/java/org/apache/jetspeed/search/BaseParsedObject.java
portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/activeauthentication/ActiveAuthenticationIdentityProviderImpl.java
portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/AuthorizationProviderImpl.java
portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/JetspeedSerializerImpl.java
portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/src/main/java/org/apache/jetspeed/statistics/impl/AggregateStatisticsImpl.java
portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/src/main/java/org/apache/jetspeed/statistics/impl/PortalStatisticsImpl.java
portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/headerresource/HeaderResourceLib.java
portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/pipeline/Pipeline.java
portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/pipeline/PipelineException.java
portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/pipeline/PipelineMapper.java
portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/pipeline/descriptor/PipelineDescriptorApi.java
portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/pipeline/descriptor/ValveDescriptorApi.java
portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/pipeline/valve/ValveContext.java
portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/request/RequestContext.java
portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/search/HandlerFactory.java
portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/search/ParsedObject.java
portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/security/AuthorizationProvider.java
portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/security/GroupManager.java
portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/security/JetspeedPermission.java
portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/security/JetspeedPrincipalManager.java
portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/security/JetspeedPrincipalResultList.java
portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/security/PrincipalManagerEventListener.java
portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/security/RoleManager.java
portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/security/UserManager.java
portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/security/activeauthentication/ActiveAuthenticationIdentityProvider.java
portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/serializer/JetspeedSerializer.java
portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/spaces/Spaces.java
portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/sso/SSOPrincipal.java
portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/sso/SSOProvider.java
portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/statistics/AggregateStatistics.java
portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/statistics/PortalStatistics.java
portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/tools/pamanager/servletcontainer/ApplicationServerManager.java
portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/userinfo/UserInfoManager.java
portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/util/FileSystemHelper.java
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetUserListAction.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetUserListAction.java?rev=1595089&r1=1595088&r2=1595089&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetUserListAction.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/layout/impl/GetUserListAction.java Fri May 16 02:42:46 2014
@@ -193,10 +193,8 @@ public class GetUserListAction
{
// Logged in users is a list of UserStats actions
- Iterator usersIter = pstats.getListOfLoggedInUsers().iterator();
- while(usersIter.hasNext())
+ for (Map<String,UserStats> userMap : pstats.getListOfLoggedInUsers())
{
- Map userMap = (Map)usersIter.next();
if(userMap != null && userMap.size() > 0)
{
Iterator userKeyIter = userMap.keySet().iterator();
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/request/JetspeedRequestContext.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/request/JetspeedRequestContext.java?rev=1595089&r1=1595088&r2=1595089&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/request/JetspeedRequestContext.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/request/JetspeedRequestContext.java Fri May 16 02:42:46 2014
@@ -16,22 +16,6 @@
*/
package org.apache.jetspeed.request;
-import java.security.Principal;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-import javax.security.auth.Subject;
-import javax.servlet.ServletConfig;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
import org.apache.commons.collections.list.TreeList;
import org.apache.jetspeed.Jetspeed;
import org.apache.jetspeed.PortalReservedParameters;
@@ -64,6 +48,21 @@ import org.apache.jetspeed.util.KeyValue
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import javax.security.auth.Subject;
+import javax.servlet.ServletConfig;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequestWrapper;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.security.Principal;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
/**
* Jetspeed Request Context is associated with each portal request. The request
* holds the contextual information shared amongst components in the portal,
@@ -107,7 +106,7 @@ public class JetspeedRequestContext impl
/**
* Create a new Request Context
*
- * @param pc
+ * @param rcc
* @param request
* @param response
* @param config
@@ -173,12 +172,12 @@ public class JetspeedRequestContext impl
return config;
}
- public Map getProfileLocators()
+ public Map<String,ProfileLocator> getProfileLocators()
{
return locators;
}
- public void setProfileLocators( Map locators )
+ public void setProfileLocators( Map<String,ProfileLocator> locators )
{
this.locators = locators;
}
@@ -267,7 +266,7 @@ public class JetspeedRequestContext impl
/**
* Sets the target Portlet Action Window
*
- * @param window
+ * @param portletWindow
*/
public void setActionWindow( PortletWindow portletWindow )
{
@@ -278,7 +277,7 @@ public class JetspeedRequestContext impl
/**
* Set the capabilityMap. Used by the CapabilityValve
*
- * @param capabilityMap
+ * @param map
*/
public void setCapabilityMap( CapabilityMap map )
{
@@ -376,9 +375,6 @@ public class JetspeedRequestContext impl
return request.getParameterMap();
}
- /**
- * @see org.apache.jetspeed.request.RequestContext#getRequestAttribute(java.lang.String)
- */
public Object getRequestAttribute( String key )
{
return request.getAttribute(key);
@@ -455,7 +451,7 @@ public class JetspeedRequestContext impl
* getPreferedLanguage
* </p>
*
- * @see org.apache.jetspeed.request.RequestContext#getPreferedLanguage(org.apache.pluto.container.om.portlet.PortletDefinition)
+ * @see org.apache.jetspeed.request.RequestContext#getPreferedLanguage(org.apache.jetspeed.om.portlet.PortletDefinition)
* @param portlet
* @return
*/
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-search/src/main/java/org/apache/jetspeed/search/AbstractObjectHandler.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-search/src/main/java/org/apache/jetspeed/search/AbstractObjectHandler.java?rev=1595089&r1=1595088&r2=1595089&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-search/src/main/java/org/apache/jetspeed/search/AbstractObjectHandler.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-search/src/main/java/org/apache/jetspeed/search/AbstractObjectHandler.java Fri May 16 02:42:46 2014
@@ -33,7 +33,7 @@ public abstract class AbstractObjectHand
/**
- * @see org.apache.jetspeed.services.search.ObjectHandler#getFields()
+ * @see org.apache.jetspeed.search.ObjectHandler#getFields()
*/
public Set getFields()
{
@@ -41,7 +41,7 @@ public abstract class AbstractObjectHand
}
/**
- * @see org.apache.jetspeed.services.search.ObjectHandler#getKeywords()
+ * @see org.apache.jetspeed.search.ObjectHandler#getKeywords()
*/
public Set getKeywords()
{
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-search/src/main/java/org/apache/jetspeed/search/BaseParsedObject.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-search/src/main/java/org/apache/jetspeed/search/BaseParsedObject.java?rev=1595089&r1=1595088&r2=1595089&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-search/src/main/java/org/apache/jetspeed/search/BaseParsedObject.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-search/src/main/java/org/apache/jetspeed/search/BaseParsedObject.java Fri May 16 02:42:46 2014
@@ -54,7 +54,7 @@ public class BaseParsedObject implements
/**
* Sets parsed object key
*
- * @param content
+ * @param key
*/
public void setKey(String key)
{
@@ -214,7 +214,7 @@ public class BaseParsedObject implements
/**
* Sets parsed object URL
*
- * @param fields
+ * @param url
*/
public void setURL(URL url)
{
@@ -254,7 +254,7 @@ public class BaseParsedObject implements
/**
* Setter for property className.
*
- * @param score New value of property className.
+ * @param className New value of property className.
*/
public void setClassName(String className)
{
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/activeauthentication/ActiveAuthenticationIdentityProviderImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/activeauthentication/ActiveAuthenticationIdentityProviderImpl.java?rev=1595089&r1=1595088&r2=1595089&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/activeauthentication/ActiveAuthenticationIdentityProviderImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/activeauthentication/ActiveAuthenticationIdentityProviderImpl.java Fri May 16 02:42:46 2014
@@ -16,11 +16,11 @@
*/
package org.apache.jetspeed.security.activeauthentication;
-import java.util.List;
-
import org.apache.jetspeed.cache.CacheElement;
import org.apache.jetspeed.cache.JetspeedCache;
+import java.util.List;
+
/**
* <p>
* AuthenticationCacheBeanImpl
@@ -37,9 +37,9 @@ import org.apache.jetspeed.cache.Jetspee
public class ActiveAuthenticationIdentityProviderImpl implements ActiveAuthenticationIdentityProvider
{
JetspeedCache cache;
- List sessionAttributes;
+ List<String> sessionAttributes;
- public ActiveAuthenticationIdentityProviderImpl(JetspeedCache cache, List sessionAttributes)
+ public ActiveAuthenticationIdentityProviderImpl(JetspeedCache cache, List<String> sessionAttributes)
{
this.cache = cache;
this.sessionAttributes = sessionAttributes;
@@ -70,7 +70,7 @@ public class ActiveAuthenticationIdentit
cache.remove(token);
}
- public List getSessionAttributeNames()
+ public List<String> getSessionAttributeNames()
{
return this.sessionAttributes;
}
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/AuthorizationProviderImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/AuthorizationProviderImpl.java?rev=1595089&r1=1595088&r2=1595089&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/AuthorizationProviderImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/impl/AuthorizationProviderImpl.java Fri May 16 02:42:46 2014
@@ -16,12 +16,12 @@
*/
package org.apache.jetspeed.security.impl;
+import org.apache.jetspeed.security.AuthorizationProvider;
+
import java.security.Policy;
import java.util.Collections;
import java.util.List;
-import org.apache.jetspeed.security.AuthorizationProvider;
-
/**
* @see org.apache.jetspeed.security.AuthorizationProvider
* @author <a href="mailto:[email protected]">David Le Strat </a>
@@ -48,7 +48,7 @@ public class AuthorizationProviderImpl i
/**
* @see org.apache.jetspeed.security.AuthorizationProvider#getPolicies()
*/
- public List getPolicies()
+ public List<Policy> getPolicies()
{
return Collections.EMPTY_LIST;
}
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/JetspeedSerializerImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/JetspeedSerializerImpl.java?rev=1595089&r1=1595088&r2=1595089&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/JetspeedSerializerImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-serializer/src/main/java/org/apache/jetspeed/serializer/JetspeedSerializerImpl.java Fri May 16 02:42:46 2014
@@ -16,6 +16,13 @@
*/
package org.apache.jetspeed.serializer;
+import javolution.xml.XMLBinding;
+import javolution.xml.XMLObjectReader;
+import javolution.xml.XMLObjectWriter;
+import org.apache.jetspeed.serializer.objects.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
@@ -25,64 +32,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javolution.xml.XMLBinding;
-import javolution.xml.XMLObjectReader;
-import javolution.xml.XMLObjectWriter;
-
-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.JSEntityPreferenceCompat;
-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;
-import org.apache.jetspeed.serializer.objects.JSMediaTypes;
-import org.apache.jetspeed.serializer.objects.JSMimeType;
-import org.apache.jetspeed.serializer.objects.JSMimeTypes;
-import org.apache.jetspeed.serializer.objects.JSNVPElement;
-import org.apache.jetspeed.serializer.objects.JSNVPElements;
-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.JSPrincipalAssociation;
-import org.apache.jetspeed.serializer.objects.JSPrincipalAssociations;
-import org.apache.jetspeed.serializer.objects.JSPrincipalRule;
-import org.apache.jetspeed.serializer.objects.JSPrincipalRules;
-import org.apache.jetspeed.serializer.objects.JSPrincipals;
-import org.apache.jetspeed.serializer.objects.JSProfilingRule;
-import org.apache.jetspeed.serializer.objects.JSProfilingRules;
-import org.apache.jetspeed.serializer.objects.JSRole;
-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.JSSecurityAttributes;
-import org.apache.jetspeed.serializer.objects.JSSecurityDomain;
-import org.apache.jetspeed.serializer.objects.JSSecurityDomains;
-import org.apache.jetspeed.serializer.objects.JSSnapshot;
-import org.apache.jetspeed.serializer.objects.JSSSOSite;
-import org.apache.jetspeed.serializer.objects.JSSSOSiteRemoteUser;
-import org.apache.jetspeed.serializer.objects.JSSSOSiteRemoteUsers;
-import org.apache.jetspeed.serializer.objects.JSSSOSites;
-import org.apache.jetspeed.serializer.objects.JSUser;
-import org.apache.jetspeed.serializer.objects.JSUserAttributes;
-import org.apache.jetspeed.serializer.objects.JSUserGroups;
-import org.apache.jetspeed.serializer.objects.JSUserRoles;
-import org.apache.jetspeed.serializer.objects.JSUserUsers;
-import org.apache.jetspeed.serializer.objects.JSUsers;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
/**
* Main JetspeedSerializer implementation delegating the real serializing to JetspeedComponentSerializer instances
* @author <a href="mailto:[email protected]">Ate Douma</a>
@@ -92,11 +41,11 @@ public class JetspeedSerializerImpl impl
{
private static final Logger log = LoggerFactory.getLogger(JetspeedSerializerImpl.class);
- private List serializers;
+ private List<JetspeedComponentSerializer> serializers;
private XMLBinding binding;
- private Map defaultSettings;
+ private Map<String,Object> defaultSettings;
- public JetspeedSerializerImpl(List serializers, Map defaultSettings)
+ public JetspeedSerializerImpl(List<JetspeedComponentSerializer> serializers, Map<String,Object> defaultSettings)
{
this.serializers = Collections.unmodifiableList(serializers);
this.defaultSettings = defaultSettings != null ? Collections.unmodifiableMap(defaultSettings) : Collections.EMPTY_MAP;
@@ -104,12 +53,12 @@ public class JetspeedSerializerImpl impl
setupAliases(binding);
}
- public List getSerializers()
+ public List<JetspeedComponentSerializer> getSerializers()
{
return serializers;
}
- public Map getDefaultSettings()
+ public Map<String,Object> getDefaultSettings()
{
return defaultSettings;
}
@@ -119,9 +68,9 @@ public class JetspeedSerializerImpl impl
importData(filename, null);
}
- public void importData(String filename, Map settings) throws SerializerException
+ public void importData(String filename, Map<String,Object> settings) throws SerializerException
{
- Map processSettings = getProcessSettings(settings);
+ Map<String,Object> processSettings = getProcessSettings(settings);
JSSnapshot snapshot = null;
SerializerException snapshotException = null;
for (int i = 0; ((i < TAG_SNAPSHOT_NAMES.length) && (snapshot == null)); i++)
@@ -162,9 +111,9 @@ public class JetspeedSerializerImpl impl
exportData(name, filename, null);
}
- public void exportData(String name, String filename, Map settings) throws SerializerException
+ public void exportData(String name, String filename, Map<String,Object> settings) throws SerializerException
{
- Map processSettings = getProcessSettings(settings);
+ Map<String,Object> processSettings = getProcessSettings(settings);
JSSnapshot snapshot = new JSSnapshot(name);
snapshot.setDateCreated(new Date(new java.util.Date().getTime()).toString());
snapshot.setSavedVersion(snapshot.getSoftwareVersion());
@@ -172,7 +121,7 @@ public class JetspeedSerializerImpl impl
for (int i = 0, size = serializers.size(); i < size; i++)
{
- ((JetspeedComponentSerializer) serializers.get(i)).processExport(snapshot, processSettings);
+ serializers.get(i).processExport(snapshot, processSettings);
}
writeSnapshot(snapshot, filename, binding, processSettings);
@@ -183,18 +132,18 @@ public class JetspeedSerializerImpl impl
deleteData(null);
}
- public void deleteData(Map settings) throws SerializerException
+ public void deleteData(Map<String,Object> settings) throws SerializerException
{
- Map processSettings = getProcessSettings(settings);
+ Map<String,Object> processSettings = getProcessSettings(settings);
for (int i = 0, size = serializers.size(); i < size; i++)
{
- ((JetspeedComponentSerializer) serializers.get(i)).deleteData(processSettings);
+ serializers.get(i).deleteData(processSettings);
}
}
- protected Map getProcessSettings(Map settings)
+ protected Map<String,Object> getProcessSettings(Map<String,Object> settings)
{
- Map processSettings = new HashMap(defaultSettings);
+ Map<String,Object> processSettings = new HashMap(defaultSettings);
processSettings.put(KEY_LOGGER, log);
if ( settings != null )
{
@@ -319,7 +268,7 @@ public class JetspeedSerializerImpl impl
return snap;
}
- protected void writeSnapshot(JSSnapshot snapshot, String filename, XMLBinding binding, Map settings) throws SerializerException
+ protected void writeSnapshot(JSSnapshot snapshot, String filename, XMLBinding binding, Map<String,Object> settings) throws SerializerException
{
XMLObjectWriter writer = openWriter(filename, settings);
writer.setBinding(binding);
@@ -365,7 +314,7 @@ public class JetspeedSerializerImpl impl
/**
* create or open a given file for writing
*/
- protected XMLObjectWriter openWriter(String filename, Map settings) throws SerializerException
+ protected XMLObjectWriter openWriter(String filename, Map<String,Object> settings) throws SerializerException
{
File f;
@@ -412,7 +361,7 @@ public class JetspeedSerializerImpl impl
* @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-statistics/src/main/java/org/apache/jetspeed/statistics/impl/AggregateStatisticsImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/src/main/java/org/apache/jetspeed/statistics/impl/AggregateStatisticsImpl.java?rev=1595089&r1=1595088&r2=1595089&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/src/main/java/org/apache/jetspeed/statistics/impl/AggregateStatisticsImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/src/main/java/org/apache/jetspeed/statistics/impl/AggregateStatisticsImpl.java Fri May 16 02:42:46 2014
@@ -16,13 +16,13 @@
*/
package org.apache.jetspeed.statistics.impl;
+import org.apache.jetspeed.statistics.AggregateStatistics;
+
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import org.apache.jetspeed.statistics.AggregateStatistics;
-
/**
* AggregateStatisticsImpl
*
@@ -43,14 +43,14 @@ public class AggregateStatisticsImpl imp
private int hitcount;
- private List statlist;
+ private List<Map<String,String>> statlist;
public AggregateStatisticsImpl()
{
- statlist = new ArrayList();
+ statlist = new ArrayList<Map<String,String>>();
}
- public void addRow(Map row)
+ public void addRow(Map<String,String> row)
{
statlist.add(row);
}
@@ -164,7 +164,7 @@ public class AggregateStatisticsImpl imp
/**
* @return Returns the statlist.
*/
- public List getStatlist()
+ public List<Map<String,String>> getStatlist()
{
return statlist;
}
@@ -173,7 +173,7 @@ public class AggregateStatisticsImpl imp
* @param statlist
* The statlist to set.
*/
- public void setStatlist(List statlist)
+ public void setStatlist(List<Map<String,String>> statlist)
{
this.statlist = statlist;
}
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/src/main/java/org/apache/jetspeed/statistics/impl/PortalStatisticsImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/src/main/java/org/apache/jetspeed/statistics/impl/PortalStatisticsImpl.java?rev=1595089&r1=1595088&r2=1595089&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/src/main/java/org/apache/jetspeed/statistics/impl/PortalStatisticsImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/src/main/java/org/apache/jetspeed/statistics/impl/PortalStatisticsImpl.java Fri May 16 02:42:46 2014
@@ -17,6 +17,19 @@
package org.apache.jetspeed.statistics.impl;
+import org.apache.jetspeed.om.page.ContentPage;
+import org.apache.jetspeed.request.RequestContext;
+import org.apache.jetspeed.statistics.AggregateStatistics;
+import org.apache.jetspeed.statistics.InvalidCriteriaException;
+import org.apache.jetspeed.statistics.PortalStatistics;
+import org.apache.jetspeed.statistics.StatisticsQueryCriteria;
+import org.apache.jetspeed.statistics.UserStats;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.naming.NamingException;
+import javax.servlet.http.HttpServletRequest;
+import javax.sql.DataSource;
import java.security.Principal;
import java.sql.Connection;
import java.sql.PreparedStatement;
@@ -35,20 +48,6 @@ import java.util.List;
import java.util.Map;
import java.util.TreeMap;
-import javax.naming.NamingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.sql.DataSource;
-
-import org.apache.jetspeed.om.page.ContentPage;
-import org.apache.jetspeed.request.RequestContext;
-import org.apache.jetspeed.statistics.AggregateStatistics;
-import org.apache.jetspeed.statistics.InvalidCriteriaException;
-import org.apache.jetspeed.statistics.PortalStatistics;
-import org.apache.jetspeed.statistics.StatisticsQueryCriteria;
-import org.apache.jetspeed.statistics.UserStats;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
/**
* <p>
* PortalStatisticsImpl
@@ -110,7 +109,7 @@ public class PortalStatisticsImpl implem
protected int currentUserCount = 0;
- protected Map currentUsers;
+ protected Map<String,Map<String,UserStats>> currentUsers;
/* date formatter */
protected SimpleDateFormat formatter = null;
@@ -142,7 +141,7 @@ public class PortalStatisticsImpl implem
this.maxTimeMsToFlush_Page = maxTimeMsToFlush_Page;
//this.jetspeedDSEntry = jetspeedDSEntry;
this.ds = dataSource;
- currentUsers = Collections.synchronizedMap(new TreeMap());
+ currentUsers = Collections.synchronizedMap(new TreeMap<String,Map<String,UserStats>>());
}
public void springInit() throws NamingException
@@ -372,23 +371,21 @@ public class PortalStatisticsImpl implem
{
UserStats userStats = null;
- Map users = (Map)currentUsers.get(userName);
- if(users != null && users.size() > 0)
+ Map<String,UserStats> statsPerUser = currentUsers.get(userName);
+ if(statsPerUser != null && statsPerUser.size() > 0)
{
- userStats = (UserStats) users.get(ipAddress);
+ userStats = statsPerUser.get(ipAddress);
}
if(userStats != null)
{
// only decrement if user has been logged in
currentUserCount = currentUserCount - 1;
-
- userStats.setNumberOfSession(userStats
- .getNumberOfSessions() - 1);
+ userStats.setNumberOfSession(userStats.getNumberOfSessions() - 1);
if (userStats.getNumberOfSessions() <= 0)
{
- users.remove(ipAddress);
- currentUsers.put(userName, users);
+ statsPerUser.remove(ipAddress);
+ currentUsers.put(userName, statsPerUser);
}
}
}
@@ -449,17 +446,15 @@ public class PortalStatisticsImpl implem
}
synchronized (currentUsers)
{
-
UserStats userStats = null;
-
- Map users = (Map)currentUsers.get(userName);
- if(users != null && users.size() > 0)
+ Map<String,UserStats> statsPerUser = currentUsers.get(userName);
+ if(statsPerUser != null && statsPerUser.size() > 0)
{
- userStats = (UserStats) users.get(ipAddress);
+ userStats = statsPerUser.get(ipAddress);
}
else
{
- users = new TreeMap();
+ statsPerUser = new TreeMap();
}
if(userStats == null)
@@ -470,10 +465,9 @@ public class PortalStatisticsImpl implem
userStats.setInetAddressFromIp(ipAddress);
}
- userStats.setNumberOfSession(userStats
- .getNumberOfSessions() + 1);
- users.put(ipAddress, userStats);
- currentUsers.put(userName, users);
+ userStats.setNumberOfSession(userStats.getNumberOfSessions() + 1);
+ statsPerUser.put(ipAddress, userStats);
+ currentUsers.put(userName, statsPerUser);
}
}
@@ -750,7 +744,7 @@ public class PortalStatisticsImpl implem
while ((rs.next()) && (rowCount < totalRows))
{
- Map row = new HashMap();
+ Map<String,String> row = new HashMap<String,String>();
row.put("count", "" + rs.getInt("itemcount"));
String col = rs.getString(groupColumn);
int maxColLen = 35;
@@ -829,9 +823,9 @@ public class PortalStatisticsImpl implem
*
* @see org.apache.jetspeed.statistics.PortalStatistics#getListOfLoggedInUsers()
*/
- public List getListOfLoggedInUsers()
+ public List<Map<String,UserStats>> getListOfLoggedInUsers()
{
- List list = new ArrayList();
+ List<Map<String,UserStats>> list = new ArrayList<Map<String,UserStats>>();
synchronized (currentUsers)
{
Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/headerresource/HeaderResourceLib.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/headerresource/HeaderResourceLib.java?rev=1595089&r1=1595088&r2=1595089&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/headerresource/HeaderResourceLib.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/headerresource/HeaderResourceLib.java Fri May 16 02:42:46 2014
@@ -16,15 +16,14 @@
*/
package org.apache.jetspeed.headerresource;
+import org.apache.jetspeed.container.url.BasePortalURL;
+import org.apache.jetspeed.request.RequestContext;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.Collection;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.jetspeed.container.url.BasePortalURL;
-import org.apache.jetspeed.request.RequestContext;
/**
* HeaderResourceLib static utility methods
@@ -387,11 +386,11 @@ public class HeaderResourceLib
}
return statementOut.toString();
}
- public static String makeJSONStringArray( Collection stringList )
+ public static String makeJSONStringArray( Collection<String> stringList )
{
return makeJSONStringArray( stringList, null );
}
- public static String makeJSONStringArray( Collection stringList, List compiledUniqueValues )
+ public static String makeJSONStringArray( Collection<String> stringList, List<String> compiledUniqueValues )
{
if ( stringList != null && stringList.size() > 0 )
{
Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/pipeline/Pipeline.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/pipeline/Pipeline.java?rev=1595089&r1=1595088&r2=1595089&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/pipeline/Pipeline.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/pipeline/Pipeline.java Fri May 16 02:42:46 2014
@@ -16,11 +16,11 @@
*/
package org.apache.jetspeed.pipeline;
-import java.io.IOException;
-
import org.apache.jetspeed.pipeline.valve.Valve;
import org.apache.jetspeed.request.RequestContext;
+import java.io.IOException;
+
/**
* Jetspeed Pipeline
*
@@ -67,7 +67,7 @@ public interface Pipeline
* same Pipeline without interfering with each other's control
* flow.</p>
*
- * @param data The run-time information, including the servlet
+ * @param context The run-time information, including the servlet
* request and response we are processing.
*
* @exception IOException an input/output error occurred.
Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/pipeline/PipelineException.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/pipeline/PipelineException.java?rev=1595089&r1=1595088&r2=1595089&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/pipeline/PipelineException.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/pipeline/PipelineException.java Fri May 16 02:42:46 2014
@@ -15,6 +15,7 @@
* limitations under the License.
*/
package org.apache.jetspeed.pipeline;
+
import org.apache.jetspeed.exception.JetspeedException;
/**
Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/pipeline/PipelineMapper.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/pipeline/PipelineMapper.java?rev=1595089&r1=1595088&r2=1595089&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/pipeline/PipelineMapper.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/pipeline/PipelineMapper.java Fri May 16 02:42:46 2014
@@ -27,14 +27,14 @@ public interface PipelineMapper
/**
* Returns pipeline mapped by the specified path.
- * @param path
+ * @param mappedPath
* @return
*/
Pipeline getPipelineByMappedPath(String mappedPath);
/**
* Returns pipeline by the pipeline component ID.
- * @param name
+ * @param id
* @return
*/
Pipeline getPipelineById(String id);
@@ -42,7 +42,7 @@ public interface PipelineMapper
/**
* Returns mapped base path found first for the pipeline ID.
* If nothing found, returns null.
- * @param id
+ * @param pipelineId
* @return
*/
String getMappedPathByPipelineId(String pipelineId);
@@ -50,7 +50,7 @@ public interface PipelineMapper
/**
* Returns all mapped base paths for the pipeline ID.
* If nothing found, returns an empty array.
- * @param id
+ * @param pipelineId
* @return
*/
String [] getMappedPathsByPipelineId(String pipelineId);
Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/pipeline/descriptor/PipelineDescriptorApi.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/pipeline/descriptor/PipelineDescriptorApi.java?rev=1595089&r1=1595088&r2=1595089&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/pipeline/descriptor/PipelineDescriptorApi.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/pipeline/descriptor/PipelineDescriptorApi.java Fri May 16 02:42:46 2014
@@ -19,16 +19,15 @@ package org.apache.jetspeed.pipeline.des
import java.util.List;
-import org.apache.jetspeed.pipeline.descriptor.ValveDescriptorApi;
-
+@Deprecated
public interface PipelineDescriptorApi
{
/**
* Add a ValveDescriptor to the Pipeline
* descriptor
*
- * @param ValveDescriptor
+ * @param valveDescriptor
*/
public void addValveDescriptor(ValveDescriptorApi valveDescriptor);
Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/pipeline/descriptor/ValveDescriptorApi.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/pipeline/descriptor/ValveDescriptorApi.java?rev=1595089&r1=1595088&r2=1595089&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/pipeline/descriptor/ValveDescriptorApi.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/pipeline/descriptor/ValveDescriptorApi.java Fri May 16 02:42:46 2014
@@ -16,13 +16,14 @@
*/
package org.apache.jetspeed.pipeline.descriptor;
+@Deprecated
public interface ValveDescriptorApi
{
/**
* This is the full package/class name of the
* class used for the valve.
*
- * @param s the full package/class name used for the valve
+ * @param className the full package/class name used for the valve
*/
public void setClassName(String className);
Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/pipeline/valve/ValveContext.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/pipeline/valve/ValveContext.java?rev=1595089&r1=1595088&r2=1595089&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/pipeline/valve/ValveContext.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/pipeline/valve/ValveContext.java Fri May 16 02:42:46 2014
@@ -40,13 +40,8 @@ public interface ValveContext
* <p>If there are no more Valves to be executed, execution of
* this method will result in a no op.</p>
*
- * @param data The run-time information, including the servlet
+ * @param request The run-time information, including the servlet
* request and response we are processing.
- *
- * @exception IOException Thrown by a subsequent Valve.
- * @exception SummitException Thrown by a subsequent Valve.
- * @exception SummitException No further Valves configured in the
- * Pipeline currently being processed.
*/
public void invokeNext(RequestContext request)
throws PipelineException;
Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/request/RequestContext.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/request/RequestContext.java?rev=1595089&r1=1595088&r2=1595089&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/request/RequestContext.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/request/RequestContext.java Fri May 16 02:42:46 2014
@@ -16,16 +16,6 @@
*/
package org.apache.jetspeed.request;
-import java.security.Principal;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-import javax.security.auth.Subject;
-import javax.servlet.ServletConfig;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.apache.jetspeed.PortalReservedParameters;
import org.apache.jetspeed.capabilities.CapabilityMap;
import org.apache.jetspeed.container.PortletWindow;
@@ -37,9 +27,19 @@ import org.apache.jetspeed.om.portlet.La
import org.apache.jetspeed.om.portlet.PortletDefinition;
import org.apache.jetspeed.pipeline.Pipeline;
import org.apache.jetspeed.portlet.HeadElement;
+import org.apache.jetspeed.profiler.ProfileLocator;
import org.apache.jetspeed.profiler.Profiler;
import org.apache.jetspeed.util.KeyValue;
+import javax.security.auth.Subject;
+import javax.servlet.ServletConfig;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.security.Principal;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
/**
* Portal Request Context is associated with each request
*
@@ -100,14 +100,14 @@ public interface RequestContext
*
* @return Profile locators by locator name
*/
- public Map getProfileLocators();
+ public Map<String,ProfileLocator> getProfileLocators();
/**
* Sets the target page profile locators for this request
*
* @param locators The target profile locators by locator name
*/
- public void setProfileLocators(Map locators);
+ public void setProfileLocators(Map<String,ProfileLocator> locators);
/**
* Gets the target page for this request
@@ -126,7 +126,7 @@ public interface RequestContext
/**
* Set the capabilityMap. Used by the CapabilityValve
*
- * @param capabilityMap
+ * @param map
*/
public void setCapabilityMap(CapabilityMap map);
@@ -242,7 +242,7 @@ public interface RequestContext
/**
* Sets the locale associated with this request.
*
- * @param The locale associated with this request.
+ * @param locale associated with this request.
*/
void setLocale(Locale locale);
@@ -253,7 +253,7 @@ public interface RequestContext
* in that case it simply passes through to the servlet request.
*
* @param key The parameter unique key
- * @return The object associated with the uniqu
+ * @return The object associated with the unique key
*/
String getRequestParameter(String key);
@@ -366,7 +366,8 @@ public interface RequestContext
/**
- * @param actionFailed The actionFailed to set.
+ * @param window the window to set failed action on
+ * @param actionFailure The actionFailed to set
*/
void setActionFailure(PortletWindow window, Throwable actionFailure);
Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/search/HandlerFactory.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/search/HandlerFactory.java?rev=1595089&r1=1595088&r2=1595089&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/search/HandlerFactory.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/search/HandlerFactory.java Fri May 16 02:42:46 2014
@@ -19,8 +19,6 @@ package org.apache.jetspeed.search;
/**
* @author jford
*
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
*/
public interface HandlerFactory
{
Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/search/ParsedObject.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/search/ParsedObject.java?rev=1595089&r1=1595088&r2=1595089&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/search/ParsedObject.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/search/ParsedObject.java Fri May 16 02:42:46 2014
@@ -68,7 +68,7 @@ public interface ParsedObject
/**
* Sets parsed object key (cannot be null)
*
- * @param type
+ * @param key
*/
public void setKey(String key);
@@ -180,7 +180,7 @@ public interface ParsedObject
public Map getKeywordsMap();
/**
- * @param multiKeywords
+ * @param keywordsMap
*/
public void setKeywordsMap(Map keywordsMap);
Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/security/AuthorizationProvider.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/security/AuthorizationProvider.java?rev=1595089&r1=1595088&r2=1595089&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/security/AuthorizationProvider.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/security/AuthorizationProvider.java Fri May 16 02:42:46 2014
@@ -16,6 +16,7 @@
*/
package org.apache.jetspeed.security;
+import java.security.Policy;
import java.util.List;
/**
@@ -36,7 +37,7 @@ public interface AuthorizationProvider
*
* @return The list of policies.
*/
- List getPolicies();
+ List<Policy> getPolicies();
/**
Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/security/GroupManager.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/security/GroupManager.java?rev=1595089&r1=1595088&r2=1595089&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/security/GroupManager.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/security/GroupManager.java Fri May 16 02:42:46 2014
@@ -39,7 +39,7 @@ public interface GroupManager extends Pr
* </p>
* @param groupName The group name
* @return the new {@link Group}
- * @throws Throws a security exception.
+ * @throws throws a security exception.
*/
Group addGroup(String groupName) throws SecurityException;
@@ -50,7 +50,7 @@ public interface GroupManager extends Pr
* @param groupName The group name
* @param mapped if the new Group should be mapped/replicated to an external security storage manager (if used) or not.
* @return the new {@link Group}
- * @throws Throws a security exception.
+ * @throws throws a security exception.
*/
Group addGroup(String groupName, boolean mapped) throws SecurityException;
@@ -59,7 +59,7 @@ public interface GroupManager extends Pr
* Remove a group.
* </p>
* @param groupName The group name
- * @throws Throws a security exception.
+ * @throws throws a security exception.
*/
void removeGroup(String groupName) throws SecurityException;
@@ -79,7 +79,7 @@ public interface GroupManager extends Pr
*
* @param groupName
* @return The {@link Group}
- * @throws Throws security exception if the group does not exist.
+ * @throws throws security exception if the group does not exist.
*/
Group getGroup(String groupName) throws SecurityException;
@@ -90,7 +90,7 @@ public interface GroupManager extends Pr
*
* @param username The user name.
* @return A list of {@link Group}.
- * @throws Throws security exception if the user does not exist.
+ * @throws throws security exception if the user does not exist.
*/
List<Group> getGroupsForUser(String username) throws SecurityException;
@@ -101,7 +101,7 @@ public interface GroupManager extends Pr
*
* @param roleName The role name
* @return A list of {@link Group}.
- * @throws Throws a security exception if the role does not exist.
+ * @throws throws a security exception if the role does not exist.
*/
List<Group> getGroupsInRole(String roleName) throws SecurityException;
@@ -112,7 +112,7 @@ public interface GroupManager extends Pr
*
* @param username The user name.
* @param groupName The group name
- * @throws Throws a security exception.
+ * @throws throws a security exception.
*/
void addUserToGroup(String username, String groupName) throws SecurityException;
@@ -123,7 +123,7 @@ public interface GroupManager extends Pr
*
* @param username The user name.
* @param groupName The group name
- * @throws Throws a security exception.
+ * @throws throws a security exception.
*/
void removeUserFromGroup(String username, String groupName) throws SecurityException;
@@ -135,7 +135,7 @@ public interface GroupManager extends Pr
* @param username The user name.
* @param groupName The group name
* @return Whether or not a user is in a group.
- * @throws Throws security exception if the user or group does not exist.
+ * @throws throws security exception if the user or group does not exist.
*/
boolean isUserInGroup(String username, String groupName) throws SecurityException;
@@ -176,7 +176,7 @@ public interface GroupManager extends Pr
* </p>
* @param from The group for the from side of the association
* @param to The group for the to side of the association
- * @param associationName The name of the {@link JetspeedAssociationType} to create
+ * @param associationName The name of the {@link JetspeedPrincipalAssociationType} to create
* @throws SecurityException
*/
void addGroupToGroup(Group from, Group to, String associationName) throws SecurityException;
@@ -190,7 +190,7 @@ public interface GroupManager extends Pr
* </p>
* @param from The group for the from side of the association
* @param to The group for the to side of the association
- * @param associationName The name of the {@link JetspeedAssociationType} to create
+ * @param associationName The name of the {@link JetspeedPrincipalAssociationType} to create
* @throws SecurityException
*/
void removeGroupFromGroup(Group from, Group to, String associationName) throws SecurityException;
@@ -218,7 +218,7 @@ public interface GroupManager extends Pr
* Note: this method will only return the directly associated groups, not further derived associations.
* </p>
* @param to The group for the to side of the association
- * @param associationName The name of the {@link JetspeedAssociationType} to create
+ * @param associationName The name of the {@link JetspeedPrincipalAssociationType} to create
*/
List<Group> getGroupsAssociatedTo(Group to, String associationName);
@@ -245,7 +245,7 @@ public interface GroupManager extends Pr
* Note: this method will only return the directly associated group(s), not further derived associations.
* </p>
* @param from The group for the from side of the association
- * @param associationName The name of the {@link JetspeedAssociationType} to create
+ * @param associationName The name of the {@link org.apache.jetspeed.security.JetspeedPrincipalAssociationType} to create
*/
List<Group> getGroupsAssociatedFrom(Group from, String associationName);
}
\ No newline at end of file
Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/security/JetspeedPermission.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/security/JetspeedPermission.java?rev=1595089&r1=1595088&r2=1595089&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/security/JetspeedPermission.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/security/JetspeedPermission.java Fri May 16 02:42:46 2014
@@ -23,7 +23,26 @@ import java.io.Serializable;
*/
public interface JetspeedPermission extends Serializable
{
+ /**
+ * The type of permission. Supported values see:
+ * "folder" - {@link org.apache.jetspeed.security.PermissionFactory#FOLDER_PERMISSION}
+ * "fragment" - {@link org.apache.jetspeed.security.PermissionFactory#FRAGMENT_PERMISSION}
+ * "portlet" - {@link org.apache.jetspeed.security.PermissionFactory#PORTLET_PERMISSION}
+ * "page" - {@link org.apache.jetspeed.security.PermissionFactory#PAGE_PERMISSION}
+ *
+ * @return a valid permission type string
+ */
String getType();
+
+ /**
+ * @return the name of the permission such as a portletName for a PORTLET_PERMISSION, or a page name for a PAGE_PERMISSION
+ */
String getName();
+
+ /**
+ * Typical actions supported: view, minimized, maximized, secure, edit
+ *
+ * @return a comma-separated list of valid actions provided by this permission
+ */
String getActions();
}
Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/security/JetspeedPrincipalManager.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/security/JetspeedPrincipalManager.java?rev=1595089&r1=1595088&r2=1595089&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/security/JetspeedPrincipalManager.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/security/JetspeedPrincipalManager.java Fri May 16 02:42:46 2014
@@ -81,7 +81,7 @@ public interface JetspeedPrincipalManage
* associated <em>from</em> the specified principal by the specified association.
* </p>
* <p>
- * If the association is {@link JetspeedAssociationType#isSingular()} at most one principal will be returned.
+ * If the association is {@link JetspeedPrincipalAssociationType#isSingular()} at most one principal will be returned.
* </p>
*
* @param principalFromName The principal name to find the other principals associated <em>to</em>.
@@ -97,7 +97,7 @@ public interface JetspeedPrincipalManage
* associated <em>to</em> the specified principal by the specified association.
* </p>
* <p>
- * If the association is {@link JetspeedAssociationType#isDominant()} at most one principal will be returned.
+ * If the association is {@link JetspeedPrincipalAssociationType#isDominant()} at most one principal will be returned.
* </p>
*
* @param principalToName The principal name to find the other principals associated <em>from</em>.
@@ -113,7 +113,7 @@ public interface JetspeedPrincipalManage
* associated <em>from</em> the specified principal by the specified association.
* </p>
* <p>
- * If the association is {@link JetspeedAssociationType#isSingular()} at most one principal name will be returned.
+ * If the association is {@link JetspeedPrincipalAssociationType#isSingular()} at most one principal name will be returned.
* </p>
*
* @param principalFromName The principal name to find the other principals associated <em>to</em>.
@@ -129,7 +129,7 @@ public interface JetspeedPrincipalManage
* associated <em>to</em> the specified principal by the specified association.
* </p>
* <p>
- * If the association is {@link JetspeedAssociationType#isDominant()} at most one principal name will be returned.
+ * If the association is {@link JetspeedPrincipalAssociationType#isDominant()} at most one principal name will be returned.
* </p>
*
* @param principalToName The principal name to find the other principals associated <em>from</em>.
Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/security/JetspeedPrincipalResultList.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/security/JetspeedPrincipalResultList.java?rev=1595089&r1=1595088&r2=1595089&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/security/JetspeedPrincipalResultList.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/security/JetspeedPrincipalResultList.java Fri May 16 02:42:46 2014
@@ -41,7 +41,6 @@ public class JetspeedPrincipalResultList
* Creates a result list, <em>totalSize</em> will be set to the lists size.
*
* @param results
- * @param firstResult
*/
public JetspeedPrincipalResultList(List<? extends JetspeedPrincipal> results) {
this.results = results;
Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/security/PrincipalManagerEventListener.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/security/PrincipalManagerEventListener.java?rev=1595089&r1=1595088&r2=1595089&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/security/PrincipalManagerEventListener.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/security/PrincipalManagerEventListener.java Fri May 16 02:42:46 2014
@@ -51,17 +51,17 @@ public interface PrincipalManagerEventLi
* associationAdded - invoked when an association is added
* on principal
*
- * @param principal new managed JetspeedPrincipal
+ * @param fromPrincipal new managed JetspeedPrincipal
* @param associationName Name of association which is added to principal
*/
- void associationAdded(JetspeedPrincipal fromPrincipal,JetspeedPrincipal toPrincipal,String associationName);
+ void associationAdded(JetspeedPrincipal fromPrincipal, JetspeedPrincipal toPrincipal,String associationName);
/**
* associationRemoved - invoked when an association is added
* on principal
*
- * @param principal new managed JetspeedPrincipal
+ * @param fromPrincipal new managed JetspeedPrincipal
* @param associationName Name of association which is removed to principal
*/
- void associationRemoved(JetspeedPrincipal fromPrincipal,JetspeedPrincipal toPrincipal,String associationName);
+ void associationRemoved(JetspeedPrincipal fromPrincipal, JetspeedPrincipal toPrincipal,String associationName);
}
Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/security/RoleManager.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/security/RoleManager.java?rev=1595089&r1=1595088&r2=1595089&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/security/RoleManager.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/security/RoleManager.java Fri May 16 02:42:46 2014
@@ -36,7 +36,7 @@ public interface RoleManager extends Pri
* </p>
* @param roleName The role name
* @return the new {@link Role}
- * @throws Throws a security exception if the role already exists.
+ * @throws throws a security exception if the role already exists.
*/
Role addRole(String roleName) throws SecurityException;
@@ -48,14 +48,14 @@ public interface RoleManager extends Pri
* @param roleName The role name.
* @param mapped if the new Role should be mapped/replicated to an external security storage manager (if used) or not.
* @return the new {@link Role}
- * @throws Throws a security exception if the role already exists.
+ * @throws throws a security exception if the role already exists.
*/
Role addRole(String roleName, boolean mapped) throws SecurityException;
/**
* <p>Remove a given role</p>
* @param roleName
- * @throws Throws a security exception.
+ * @throws throws a security exception.
*/
void removeRole(String roleName) throws SecurityException;
@@ -70,7 +70,7 @@ public interface RoleManager extends Pri
* <p>Get a role {@link Role} for a given role name.
* @param roleName The role name
* @return The {@link Role}.
- * @throws Throws a security exception if the role does not exist.
+ * @throws throws a security exception if the role does not exist.
*/
Role getRole(String roleName) throws SecurityException;
@@ -79,7 +79,7 @@ public interface RoleManager extends Pri
* associated to a specific user.</p>
* @param username The user name.
* @return A List of {@link Role}.
- * @throws Throws a security exception if the user does not exist.
+ * @throws throws a security exception if the user does not exist.
*/
List<Role> getRolesForUser(String username) throws SecurityException;
@@ -88,7 +88,7 @@ public interface RoleManager extends Pri
* associated to a specific group.</p>
* @param groupName The group name
* @return A Collection of {@link Role}.
- * @throws Throws a security exception if the group does not exist.
+ * @throws throws a security exception if the group does not exist.
*/
List<Role> getRolesInGroup(String groupName) throws SecurityException;
@@ -96,7 +96,7 @@ public interface RoleManager extends Pri
* <p>Add a role to a user.</p>
* @param username The user name
* @param roleName The role name
- * @throws Throws a security exception if the role or the user do not exist.
+ * @throws throws a security exception if the role or the user do not exist.
*/
void addRoleToUser(String username, String roleName) throws SecurityException;
@@ -104,7 +104,7 @@ public interface RoleManager extends Pri
* <p>Remove a user from a role.</p>
* @param username The user name.
* @param roleName The role name
- * @throws Throws a security exception.
+ * @throws throws a security exception.
*/
void removeRoleFromUser(String username, String roleName) throws SecurityException;
@@ -113,7 +113,7 @@ public interface RoleManager extends Pri
* @param username The user name.
* @param roleName The role name
* @return Whether or not a user is in a role.
- * @throws Throws a security exception if the role or the user does not exist.
+ * @throws throws a security exception if the role or the user does not exist.
*/
boolean isUserInRole(String username, String roleName) throws SecurityException;
@@ -121,7 +121,7 @@ public interface RoleManager extends Pri
* <p>Add a role to a group.</p>
* @param roleName The role name
* @param groupName The group name
- * @throws Throws a security exception.
+ * @throws throws a security exception.
*/
void addRoleToGroup(String roleName, String groupName) throws SecurityException;
@@ -129,7 +129,7 @@ public interface RoleManager extends Pri
* <p>Remove a role from a group.</p>
* @param roleName The role name
* @param groupName The group name
- * @throws Throws a security exception.
+ * @throws throws a security exception.
*/
void removeRoleFromGroup(String roleName, String groupName) throws SecurityException;
@@ -138,7 +138,7 @@ public interface RoleManager extends Pri
* @param groupName The group name
* @param roleName The role name
* @return Whether or not a role is in a group.
- * @throws Throws a security exception if the role or the group does not exist.
+ * @throws throws a security exception if the role or the group does not exist.
*/
boolean isGroupInRole(String groupName, String roleName) throws SecurityException;
@@ -179,7 +179,7 @@ public interface RoleManager extends Pri
* </p>
* @param from The role for the from side of the association
* @param to The role for the to side of the association
- * @param associationName The name of the {@link JetspeedAssociationType} to create
+ * @param associationName The name of the {@link JetspeedPrincipalAssociationType} to create
* @throws SecurityException
*/
void addRoleToRole(Role from, Role to, String associationName) throws SecurityException;
@@ -193,7 +193,7 @@ public interface RoleManager extends Pri
* </p>
* @param from The role for the from side of the association
* @param to The role for the to side of the association
- * @param associationName The name of the {@link JetspeedAssociationType} to create
+ * @param associationName The name of the {@link JetspeedPrincipalAssociationType} to create
* @throws SecurityException
*/
void removeRoleFromRole(Role from, Role to, String associationName) throws SecurityException;
@@ -221,7 +221,7 @@ public interface RoleManager extends Pri
* Note: this method will only return the directly associated roles, not further derived associations.
* </p>
* @param to The role for the to side of the association
- * @param associationName The name of the {@link JetspeedAssociationType} to create
+ * @param associationName The name of the {@link JetspeedPrincipalAssociationType} to create
*/
List<Role> getRolesAssociatedTo(Role to, String associationName);
@@ -248,7 +248,7 @@ public interface RoleManager extends Pri
* Note: this method will only return the directly associated role(s), not further derived associations.
* </p>
* @param from The role for the from side of the association
- * @param associationName The name of the {@link JetspeedAssociationType} to create
+ * @param associationName The name of the {@link JetspeedPrincipalAssociationType} to create
*/
List<Role> getRolesAssociatedFrom(Role from, String associationName);
}
Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/security/UserManager.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/security/UserManager.java?rev=1595089&r1=1595088&r2=1595089&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/security/UserManager.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/security/UserManager.java Fri May 16 02:42:46 2014
@@ -16,10 +16,8 @@
*/
package org.apache.jetspeed.security;
-import java.util.List;
-import java.util.Map;
-
import javax.security.auth.Subject;
+import java.util.List;
/**
@@ -52,7 +50,7 @@ public interface UserManager extends Pri
* </p>
* @param userName The user name.
* @return the new {@link User}
- * @throws Throws a security exception.
+ * @throws throws a security exception.
*/
User addUser(String userName) throws SecurityException;
@@ -64,7 +62,7 @@ public interface UserManager extends Pri
* @param userName The user name.
* @param mapped if the new User should be mapped/replicated to an external security storage manager (if used) or not.
* @return the new {@link User}
- * @throws Throws a security exception.
+ * @throws throws a security exception.
*/
User addUser(String userName, boolean mapped) throws SecurityException;
@@ -78,7 +76,7 @@ public interface UserManager extends Pri
* </p>
*
* @param userName The user name.
- * @throws Throws a security exception.
+ * @throws throws a security exception.
*/
void removeUser(String userName) throws SecurityException;
@@ -99,7 +97,7 @@ public interface UserManager extends Pri
*
* @param userName The user name.
* @return The {@link User}.
- * @throws Throws a security exception if the user cannot be found.
+ * @throws throws a security exception if the user cannot be found.
*/
User getUser(String userName) throws SecurityException;
@@ -118,7 +116,7 @@ public interface UserManager extends Pri
*
* @param user The user.
* @return The Subject.
- * @throws Throws a security exception if the user cannot be found
+ * @throws throws a security exception if the user cannot be found
*/
Subject getSubject(User user) throws SecurityException;
@@ -129,7 +127,7 @@ public interface UserManager extends Pri
*
* @param user The authenticated user.
* @return The Subject.
- * @throws Throws a security exception if the user cannot be found
+ * @throws throws a security exception if the user cannot be found
*/
Subject getSubject(AuthenticatedUser user) throws SecurityException;
@@ -177,7 +175,7 @@ public interface UserManager extends Pri
*
* @param roleName The role name
* @return A List of {@link User}.
- * @throws Throws a security exception if the role does not exist.
+ * @throws throws a security exception if the role does not exist.
*/
List<User> getUsersInRole(String roleName) throws SecurityException;
@@ -185,7 +183,7 @@ public interface UserManager extends Pri
* <p>Retrieves a a detached and modifiable {@link User} list of all the users in a specific group.</p>
* @param groupName The group name
* @return A list of {@link User}.
- * @throws Throws security exception if the group does not exist.
+ * @throws throws security exception if the group does not exist.
*/
List<User> getUsersInGroup(String groupName) throws SecurityException;
Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/security/activeauthentication/ActiveAuthenticationIdentityProvider.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/security/activeauthentication/ActiveAuthenticationIdentityProvider.java?rev=1595089&r1=1595088&r2=1595089&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/security/activeauthentication/ActiveAuthenticationIdentityProvider.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/security/activeauthentication/ActiveAuthenticationIdentityProvider.java Fri May 16 02:42:46 2014
@@ -62,6 +62,6 @@ public interface ActiveAuthenticationIde
* Get a list of session attribute names that should be saved and restored upon authentication events
* @return list of session attribute names
*/
- List getSessionAttributeNames();
+ List<String> getSessionAttributeNames();
}
Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/serializer/JetspeedSerializer.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/serializer/JetspeedSerializer.java?rev=1595089&r1=1595088&r2=1595089&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/serializer/JetspeedSerializer.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/serializer/JetspeedSerializer.java Fri May 16 02:42:46 2014
@@ -81,8 +81,8 @@ public interface JetspeedSerializer
String DEFAULT_TAG_SNAPSHOT_NAME = "Snapshot";
String [] TAG_SNAPSHOT_NAMES = new String[] {DEFAULT_TAG_SNAPSHOT_NAME, "SecondaryData"};
- List getSerializers();
- Map getDefaultSettings();
+ List<JetspeedComponentSerializer> getSerializers();
+ Map<String, Object> getDefaultSettings();
/**
* Main routine to export the set of data elements and write them to the
@@ -115,15 +115,13 @@ public interface JetspeedSerializer
* @param settings
* optional Map overwriting default export behavior
*/
- void exportData(String name, String exportFileName, Map settings) throws SerializerException;
+ void exportData(String name, String exportFileName, Map<String,Object> settings) throws SerializerException;
/**
* Main routine to import the set of data elements and write them to the
* current environment.
*
* @param importFileName
- * @param settings
- * optional Map overwriting default import behavior
* @return
*/
void importData(String importFileName) throws SerializerException;
@@ -151,8 +149,8 @@ public interface JetspeedSerializer
* optional Map overwriting default import behavior
* @return
*/
- void importData(String importFileName, Map settings) throws SerializerException;
+ void importData(String importFileName, Map<String,Object> settings) throws SerializerException;
void deleteData() throws SerializerException;
- void deleteData(Map settings) throws SerializerException;
+ void deleteData(Map<String,Object> settings) throws SerializerException;
}
Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/spaces/Spaces.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/spaces/Spaces.java?rev=1595089&r1=1595088&r2=1595089&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/spaces/Spaces.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/spaces/Spaces.java Fri May 16 02:42:46 2014
@@ -16,12 +16,12 @@
*/
package org.apache.jetspeed.spaces;
-import java.util.List;
-
import org.apache.jetspeed.om.folder.Folder;
import org.apache.jetspeed.om.page.Link;
import org.apache.jetspeed.om.page.Page;
+import java.util.List;
+
/**
* Spaces Services
*
@@ -46,7 +46,7 @@ public interface Spaces
*
* @param envName the unique name of the environment to create
* @return a new environment object, not yet persisted
- * @throws a SpacesException in case the object could not be persisted
+ * @throws SpacesException in case the object could not be persisted
*/
Environment createEnvironment(String envName, String owner) throws SpacesException;
@@ -54,7 +54,7 @@ public interface Spaces
* Store an environment to the portal
*
* @param env the environment object to be persisted
- * @throws a SpacesException in case the object could not be persisted
+ * @throws SpacesException in case the object could not be persisted
*/
void storeEnvironment(Environment env) throws SpacesException;
@@ -62,7 +62,7 @@ public interface Spaces
* Deletes an environment object given the unique key envName from the persistence store
*
* @param env the environment object to delete
- * @throws a SpacesException in case the object could not be deleted
+ * @throws SpacesException in case the object could not be deleted
*/
void deleteEnvironment(Environment env) throws SpacesException;
@@ -108,7 +108,7 @@ public interface Spaces
*
* @param space the space object to be persisted
* @return the space object with any updated persistence state
- * @throws a SpacesException in case the object could not be persisted
+ * @throws SpacesException in case the object could not be persisted
*/
void storeSpace(Space space) throws SpacesException;
@@ -116,7 +116,7 @@ public interface Spaces
* Deletes a space object given the unique key spaceName from the persistence store
*
* @param space the space object to delete
- * @throws a SpacesException in case the object could not be deleted
+ * @throws SpacesException in case the object could not be deleted
*/
void deleteSpace(Space space) throws SpacesException;
@@ -148,7 +148,7 @@ public interface Spaces
*
* @param space
* @param env
- * @throws a SpacesException in case the object could not be added
+ * @throws SpacesException in case the object could not be added
*/
void addSpaceToEnvironment(Space space, Environment env) throws SpacesException;
@@ -157,7 +157,7 @@ public interface Spaces
*
* @param space
* @param env
- * @throws a SpacesException in case the object could not be added
+ * @throws SpacesException in case the object could not be added
*/
void removeSpaceFromEnvironment(Space space, Environment env) throws SpacesException;
@@ -173,7 +173,7 @@ public interface Spaces
* Deletes a page
*
* @param page the page to be deleted
- * @throws a SpacesException in case the object could not be deleted
+ * @throws SpacesException in case the object could not be deleted
*/
void deletePage(Page page) throws SpacesException;
Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/sso/SSOPrincipal.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/sso/SSOPrincipal.java?rev=1595089&r1=1595088&r2=1595089&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/sso/SSOPrincipal.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/sso/SSOPrincipal.java Fri May 16 02:42:46 2014
@@ -17,11 +17,11 @@
package org.apache.jetspeed.sso;
-import java.util.Collection;
-import java.sql.Timestamp;
-
import org.apache.jetspeed.security.JetspeedPrincipal;
+import java.sql.Timestamp;
+import java.util.Collection;
+
/**
*/
public interface SSOPrincipal {
Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/sso/SSOProvider.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/sso/SSOProvider.java?rev=1595089&r1=1595088&r2=1595089&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/sso/SSOProvider.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/sso/SSOProvider.java Fri May 16 02:42:46 2014
@@ -16,14 +16,11 @@
*/
package org.apache.jetspeed.sso;
+import javax.security.auth.Subject;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
-import javax.security.auth.Subject;
-
-import org.apache.jetspeed.security.JetspeedPrincipal;
-
/**
* <p>Utility component to handle SSO requests</p>
@@ -39,7 +36,7 @@ public interface SSOProvider
* If the SSOSite and the url match only one call will be executed since the
* authentication will be done while getting the result page.
*
- * @param userID
+ * @param user
* @param url
* @param SSOSite
* @param bRefresh if true it refreshes the proxy connection if false a cached proxy will be used
@@ -52,7 +49,7 @@ public interface SSOProvider
* Same as the method above except that the user will be authenticated against all
* SSOSites defined for the user before going to the destination site.
*
- * @param userID
+ * @param subject
* @param url
* @param bRefresh if true it refreshes the proxy connection if false a cached proxy will be used
* @return
@@ -142,7 +139,7 @@ public interface SSOProvider
*/
void removeCredentialsForSite(String fullPath, String site) throws SSOException;
- /* Retrive site information */
+ /* Retrieve site information */
String getSiteURL(String site);
String getSiteName(String site);
Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/statistics/AggregateStatistics.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/statistics/AggregateStatistics.java?rev=1595089&r1=1595088&r2=1595089&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/statistics/AggregateStatistics.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/statistics/AggregateStatistics.java Fri May 16 02:42:46 2014
@@ -30,7 +30,7 @@ import java.util.Map;
public interface AggregateStatistics extends Serializable
{
- public void addRow(Map row);
+ public void addRow(Map<String,String> row);
public int getHitCount();
@@ -48,7 +48,7 @@ public interface AggregateStatistics ext
public void setMaxProcessingTime(float time);
- public List getStatlist();
+ public List<Map<String,String>> getStatlist();
- public void setStatlist(List statlist);
+ public void setStatlist(List<Map<String,String>> statlist);
}
Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/statistics/PortalStatistics.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/statistics/PortalStatistics.java?rev=1595089&r1=1595088&r2=1595089&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/statistics/PortalStatistics.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/statistics/PortalStatistics.java Fri May 16 02:42:46 2014
@@ -16,11 +16,11 @@
*/
package org.apache.jetspeed.statistics;
-import java.util.List;
+import org.apache.jetspeed.request.RequestContext;
import javax.sql.DataSource;
-
-import org.apache.jetspeed.request.RequestContext;
+import java.util.List;
+import java.util.Map;
/**
* The PortletStatistics interface provides an API for logging portlet
@@ -119,10 +119,9 @@ public interface PortalStatistics
* Logs a user logout event. The %s (HTTP status code) field of the log
* entry will be set to 200 (OK).
*
- * @param request
- * current request info object
- * @param msElapsedTime
- * elapsed time that the user was logged in
+ * @param ipAddress the ip address of the request
+ * @param userName the name of the user being tracked
+ * @param msSessionLength time that the user was logged in
*/
public void logUserLogout(String ipAddress, String userName,
long msSessionLength);
@@ -156,7 +155,7 @@ public interface PortalStatistics
*/
public int getNumberOfLoggedInUsers();
- public List getListOfLoggedInUsers();
+ public List<Map<String,UserStats>> getListOfLoggedInUsers();
/**
* Factory to create new statistics query criteria
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.