Author: ludwig
Date: Thu Feb 3 19:44:37 2011
New Revision: 1066925
URL: http://svn.apache.org/viewvc?rev=1066925&view=rev
Log:
Java 5 for services Session, UI and UniqueId
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/session/SessionListener.java
turbine/core/trunk/src/java/org/apache/turbine/services/session/SessionService.java
turbine/core/trunk/src/java/org/apache/turbine/services/session/SessionTool.java
turbine/core/trunk/src/java/org/apache/turbine/services/session/TurbineSession.java
turbine/core/trunk/src/java/org/apache/turbine/services/session/TurbineSessionService.java
turbine/core/trunk/src/java/org/apache/turbine/services/ui/TurbineUIService.java
turbine/core/trunk/src/java/org/apache/turbine/services/uniqueid/TurbineUniqueIdService.java
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/session/SessionListener.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/session/SessionListener.java?rev=1066925&r1=1066924&r2=1066925&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/services/session/SessionListener.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/services/session/SessionListener.java
Thu Feb 3 19:44:37 2011
@@ -61,6 +61,11 @@ public class SessionListener
// ---- HttpSessionListener implementation -----------------------------
/**
+ * Serial version.
+ */
+ private static final long serialVersionUID = -8083730704842809870L;
+
+ /**
* Called by the servlet container when a new session is created
*
* @param event Session creation event.
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/session/SessionService.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/session/SessionService.java?rev=1066925&r1=1066924&r2=1066925&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/services/session/SessionService.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/services/session/SessionService.java
Thu Feb 3 19:44:37 2011
@@ -50,7 +50,7 @@ public interface SessionService extends
*
* @return Collection of HttpSession objects
*/
- Collection getActiveSessions();
+ Collection<HttpSession> getActiveSessions();
/**
* Adds a session to the current list. This method should only be
@@ -88,7 +88,7 @@ public interface SessionService extends
*
* @return collection of org.apache.turbine.om.security.User objects
*/
- Collection getActiveUsers();
+ Collection<User> getActiveUsers();
/**
* Gets the User object of the the specified HttpSession.
@@ -113,6 +113,6 @@ public interface SessionService extends
* @param user the user
* @return Collection of HtttSession objects
*/
- Collection getSessionsForUser(User user);
+ Collection<HttpSession> getSessionsForUser(User user);
}
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/session/SessionTool.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/session/SessionTool.java?rev=1066925&r1=1066924&r2=1066925&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/services/session/SessionTool.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/services/session/SessionTool.java
Thu Feb 3 19:44:37 2011
@@ -22,6 +22,7 @@ package org.apache.turbine.services.sess
import java.util.Collection;
+
import javax.servlet.http.HttpSession;
import org.apache.turbine.om.security.User;
@@ -49,7 +50,7 @@ public class SessionTool
*
* @return List of HttpSession objects
*/
- public Collection getActiveSessions()
+ public Collection<HttpSession> getActiveSessions()
{
return TurbineSession.getActiveSessions();
}
@@ -99,7 +100,7 @@ public class SessionTool
*
* @return collection of org.apache.turbine.om.security.User objects
*/
- public Collection getActiveUsers()
+ public Collection<User> getActiveUsers()
{
return TurbineSession.getActiveUsers();
}
@@ -122,7 +123,7 @@ public class SessionTool
* @param user the user
* @return Collection of HtttSession objects
*/
- public Collection getSessionsForUser(User user)
+ public Collection<HttpSession> getSessionsForUser(User user)
{
return TurbineSession.getSessionsForUser(user);
}
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/session/TurbineSession.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/session/TurbineSession.java?rev=1066925&r1=1066924&r2=1066925&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/services/session/TurbineSession.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/services/session/TurbineSession.java
Thu Feb 3 19:44:37 2011
@@ -43,7 +43,7 @@ public abstract class TurbineSession
*
* @return List of HttpSession objects
*/
- public static Collection getActiveSessions()
+ public static Collection<HttpSession> getActiveSessions()
{
return getService().getActiveSessions();
}
@@ -93,7 +93,7 @@ public abstract class TurbineSession
*
* @return collection of org.apache.turbine.om.security.User objects
*/
- public static Collection getActiveUsers()
+ public static Collection<User> getActiveUsers()
{
return getService().getActiveUsers();
}
@@ -139,7 +139,7 @@ public abstract class TurbineSession
* @param user the user
* @return Collection of HtttSession objects
*/
- public static Collection getSessionsForUser(User user)
+ public static Collection<HttpSession> getSessionsForUser(User user)
{
return getService().getSessionsForUser(user);
}
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/session/TurbineSessionService.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/session/TurbineSessionService.java?rev=1066925&r1=1066924&r2=1066925&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/services/session/TurbineSessionService.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/services/session/TurbineSessionService.java
Thu Feb 3 19:44:37 2011
@@ -58,20 +58,20 @@ public class TurbineSessionService
implements SessionService
{
/** Map of active sessions */
- private Map activeSessions;
+ private Map<String, HttpSession> activeSessions;
/**
* Gets a list of the active sessions.
*
* @return A copy of the list of <code>HttpSession</code> objects.
*/
- public Collection getActiveSessions()
+ public Collection<HttpSession> getActiveSessions()
{
// Sync externally to allow ArrayList's ctor to iterate
// activeSessions' values in a thread-safe fashion.
synchronized (activeSessions)
{
- return new ArrayList(activeSessions.values());
+ return new ArrayList<HttpSession>(activeSessions.values());
}
}
@@ -120,17 +120,17 @@ public class TurbineSessionService
*
* @return A set of {@link org.apache.turbine.om.security.User} objects.
*/
- public Collection getActiveUsers()
+ public Collection<User> getActiveUsers()
{
- Collection users;
+ Collection<User> users;
synchronized (activeSessions)
{
// Pre-allocate a list which won't need expansion more
// than once.
- users = new ArrayList((int) (activeSessions.size() * 0.7));
- for (Iterator i = activeSessions.values().iterator(); i.hasNext();)
+ users = new ArrayList<User>((int) (activeSessions.size() * 0.7));
+ for (Iterator<HttpSession> i = activeSessions.values().iterator();
i.hasNext();)
{
- User u = getUserFromSession((HttpSession) i.next());
+ User u = getUserFromSession(i.next());
if (u != null && u.hasLoggedIn())
{
users.add(u);
@@ -170,7 +170,7 @@ public class TurbineSessionService
*/
public HttpSession getSession(String sessionId)
{
- return (HttpSession) this.activeSessions.get(sessionId);
+ return this.activeSessions.get(sessionId);
}
/**
@@ -180,14 +180,14 @@ public class TurbineSessionService
* @param user the user
* @return Collection of HtttSession objects
*/
- public Collection getSessionsForUser(User user)
+ public Collection<HttpSession> getSessionsForUser(User user)
{
- Collection sessions = new ArrayList();
+ Collection<HttpSession> sessions = new ArrayList<HttpSession>();
synchronized (activeSessions)
{
- for (Iterator i = activeSessions.values().iterator(); i.hasNext();)
+ for (Iterator<HttpSession> i = activeSessions.values().iterator();
i.hasNext();)
{
- HttpSession session = (HttpSession) i.next();
+ HttpSession session = i.next();
User u = this.getUserFromSession(session);
if (user.equals(u))
{
@@ -205,9 +205,10 @@ public class TurbineSessionService
/**
* Initializes the service
*/
+ @Override
public void init()
{
- this.activeSessions = new Hashtable();
+ this.activeSessions = new Hashtable<String, HttpSession>();
setInit(true);
}
@@ -215,6 +216,7 @@ public class TurbineSessionService
/**
* Returns to uninitialized state.
*/
+ @Override
public void shutdown()
{
this.activeSessions = null;
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/ui/TurbineUIService.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/ui/TurbineUIService.java?rev=1066925&r1=1066924&r2=1066925&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/services/ui/TurbineUIService.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/services/ui/TurbineUIService.java
Thu Feb 3 19:44:37 2011
@@ -144,7 +144,7 @@ public class TurbineUIService
/**
* The skin Properties store.
*/
- private HashMap skins = new HashMap();
+ private HashMap<String, Properties> skins = new HashMap<String,
Properties>();
/**
* Refresh the service by clearing all skins.
@@ -179,7 +179,7 @@ public class TurbineUIService
*/
private Properties getSkinProperties(String skinName)
{
- Properties skinProperties = (Properties) skins.get(skinName);
+ Properties skinProperties = skins.get(skinName);
return null != skinProperties ? skinProperties : loadSkin(skinName);
}
@@ -238,7 +238,7 @@ public class TurbineUIService
{
synchronized (skins)
{
- skins = new HashMap();
+ skins = new HashMap<String, Properties>();
}
log.debug("All skins were cleared.");
}
@@ -492,6 +492,7 @@ public class TurbineUIService
/**
* Initializes the service.
*/
+ @Override
public void init() throws InitializationException
{
Configuration cfg = Turbine.getConfiguration();
@@ -516,6 +517,7 @@ public class TurbineUIService
/**
* Returns to uninitialized state.
*/
+ @Override
public void shutdown()
{
clearSkins();
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/uniqueid/TurbineUniqueIdService.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/uniqueid/TurbineUniqueIdService.java?rev=1066925&r1=1066924&r2=1066925&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/services/uniqueid/TurbineUniqueIdService.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/services/uniqueid/TurbineUniqueIdService.java
Thu Feb 3 19:44:37 2011
@@ -59,6 +59,7 @@ public class TurbineUniqueIdService
* <p> Initializes the service upon first Turbine.doGet()
* invocation.
*/
+ @Override
public void init()
throws InitializationException
{
@@ -90,6 +91,7 @@ public class TurbineUniqueIdService
/**
* <p> Writes a message to the log upon system shutdown.
*/
+ @Override
public void shutdown()
{
log.info("Turbine instance running at " + turbineURL + " shutting
down.");
