Author: tv
Date: Mon Feb 21 22:18:45 2011
New Revision: 1073174
URL: http://svn.apache.org/viewvc?rev=1073174&view=rev
Log:
Generify Turbine, step 2
Modified:
turbine/core/trunk/src/java/org/apache/turbine/om/security/User.java
turbine/core/trunk/src/java/org/apache/turbine/services/security/torque/TorqueObject.java
turbine/core/trunk/src/java/org/apache/turbine/services/security/torque/TorqueSecurityService.java
turbine/core/trunk/src/java/org/apache/turbine/services/security/torque/TorqueUser.java
turbine/core/trunk/src/java/org/apache/turbine/services/session/SessionTool.java
turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/BaseMapper.java
turbine/core/trunk/src/java/org/apache/turbine/util/FormMessage.java
turbine/core/trunk/src/java/org/apache/turbine/util/FormMessages.java
turbine/core/trunk/src/java/org/apache/turbine/util/ObjectUtils.java
turbine/core/trunk/src/java/org/apache/turbine/util/ServletUtils.java
turbine/core/trunk/src/java/org/apache/turbine/util/TurbineConfig.java
turbine/core/trunk/src/java/org/apache/turbine/util/TurbineXmlConfig.java
turbine/core/trunk/src/java/org/apache/turbine/util/security/AccessControlException.java
turbine/core/trunk/src/java/org/apache/turbine/util/security/DataBackendException.java
turbine/core/trunk/src/java/org/apache/turbine/util/security/EntityExistsException.java
turbine/core/trunk/src/java/org/apache/turbine/util/security/GroupSet.java
turbine/core/trunk/src/java/org/apache/turbine/util/security/PasswordMismatchException.java
turbine/core/trunk/src/java/org/apache/turbine/util/security/PermissionSet.java
turbine/core/trunk/src/java/org/apache/turbine/util/security/RoleSet.java
turbine/core/trunk/src/java/org/apache/turbine/util/security/SecuritySet.java
turbine/core/trunk/src/java/org/apache/turbine/util/security/TurbineAccessControlList.java
turbine/core/trunk/src/java/org/apache/turbine/util/security/TurbineSecurityException.java
turbine/core/trunk/src/java/org/apache/turbine/util/security/UnknownEntityException.java
turbine/core/trunk/src/java/org/apache/turbine/util/template/HtmlPageAttributes.java
turbine/core/trunk/src/java/org/apache/turbine/util/template/TemplateInfo.java
turbine/core/trunk/src/java/org/apache/turbine/util/velocity/VelocityActionEvent.java
Modified: turbine/core/trunk/src/java/org/apache/turbine/om/security/User.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/om/security/User.java?rev=1073174&r1=1073173&r2=1073174&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/om/security/User.java
(original)
+++ turbine/core/trunk/src/java/org/apache/turbine/om/security/User.java Mon
Feb 21 22:18:45 2011
@@ -20,7 +20,6 @@ package org.apache.turbine.om.security;
*/
import java.io.Serializable;
-
import java.util.Hashtable;
import javax.servlet.http.HttpSessionBindingListener;
@@ -150,7 +149,7 @@ public interface User
*
* @return A Hashtable.
*/
- Hashtable getPermStorage();
+ Hashtable<String, Object> getPermStorage();
/**
* This should only be used in the case where we want to save the
@@ -158,7 +157,7 @@ public interface User
*
* @return A Hashtable.
*/
- Hashtable getTempStorage();
+ Hashtable<String, Object> getTempStorage();
/**
* Get an object from temporary storage.
@@ -286,7 +285,7 @@ public interface User
*
* @param storage A Hashtable.
*/
- void setPermStorage(Hashtable storage);
+ void setPermStorage(Hashtable<String, Object> storage);
/**
* This should only be used in the case where we want to save the
@@ -294,7 +293,7 @@ public interface User
*
* @param storage A Hashtable.
*/
- void setTempStorage(Hashtable storage);
+ void setTempStorage(Hashtable<String, Object> storage);
/**
* Put an object into temporary storage.
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/security/torque/TorqueObject.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/security/torque/TorqueObject.java?rev=1073174&r1=1073173&r2=1073174&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/services/security/torque/TorqueObject.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/services/security/torque/TorqueObject.java
Mon Feb 21 22:18:45 2011
@@ -20,12 +20,10 @@ package org.apache.turbine.services.secu
*/
import java.io.Serializable;
-
import java.sql.Connection;
import org.apache.torque.om.ObjectKey;
import org.apache.torque.om.Persistent;
-
import org.apache.turbine.om.security.SecurityEntity;
import org.apache.turbine.util.security.TurbineSecurityException;
@@ -56,6 +54,7 @@ public abstract class TorqueObject
*/
public TorqueObject()
{
+ // empty
}
/**
@@ -258,6 +257,7 @@ public abstract class TorqueObject
* @param obj The object to compare to.
* @return Whether equal to the object specified.
*/
+ @Override
public boolean equals(Object obj)
{
if (obj != null && obj instanceof TorqueObject)
@@ -302,6 +302,7 @@ public abstract class TorqueObject
*
* @return an <code>int</code> value
*/
+ @Override
public int hashCode()
{
ObjectKey ok = getPrimaryKey();
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/security/torque/TorqueSecurityService.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/security/torque/TorqueSecurityService.java?rev=1073174&r1=1073173&r2=1073174&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/services/security/torque/TorqueSecurityService.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/services/security/torque/TorqueSecurityService.java
Mon Feb 21 22:18:45 2011
@@ -70,6 +70,7 @@ public class TorqueSecurityService
* @exception InitializationException A problem occured during
initialization
*/
+ @Override
public void init()
throws InitializationException
{
@@ -111,8 +112,8 @@ public class TorqueSecurityService
}
try
{
- Hashtable roles = new Hashtable();
- Hashtable permissions = new Hashtable();
+ Hashtable<Group, RoleSet> roles = new Hashtable<Group, RoleSet>();
+ Hashtable<Group, PermissionSet> permissions = new Hashtable<Group,
PermissionSet>();
// notify the state modifiers (writers) that we want to create
// the snapshot.
lockShared();
@@ -120,10 +121,8 @@ public class TorqueSecurityService
// construct the snapshot:
// foreach group in the system
- for (Iterator groupsIterator = getAllGroups().iterator();
- groupsIterator.hasNext();)
+ for (Group group : getAllGroups())
{
- Group group = (Group) groupsIterator.next();
// get roles of user in the group
RoleSet groupRoles = RolePeerManager.retrieveSet(user, group);
// put the Set into roles(group)
@@ -131,10 +130,8 @@ public class TorqueSecurityService
// collect all permissions in this group
PermissionSet groupPermissions = new PermissionSet();
// foreach role in Set
- for (Iterator rolesIterator = groupRoles.iterator();
- rolesIterator.hasNext();)
+ for (Role role : groupRoles)
{
- Role role = (Role) rolesIterator.next();
// get permissions of the role
PermissionSet rolePermissions =
PermissionPeerManager.retrieveSet(role);
@@ -597,7 +594,7 @@ public class TorqueSecurityService
throw new DataBackendException(
"getPermissions(Object) failed", e);
}
-
+
return new PermissionSet(permissions);
}
else
@@ -1189,6 +1186,7 @@ public class TorqueSecurityService
* @throws DataBackendException if there was an error accessing the
* data backend.
*/
+ @Override
public GroupSet getAllGroups() throws DataBackendException
{
return getGroups(new Criteria());
@@ -1202,6 +1200,7 @@ public class TorqueSecurityService
* @throws DataBackendException if there was an error accessing the
* data backend.
*/
+ @Override
public PermissionSet getAllPermissions() throws DataBackendException
{
return getPermissions(new Criteria());
@@ -1215,6 +1214,7 @@ public class TorqueSecurityService
* @throws DataBackendException if there was an error accessing the
* data backend.
*/
+ @Override
public RoleSet getAllRoles() throws DataBackendException
{
return getRoles(new Criteria());
@@ -1235,7 +1235,7 @@ public class TorqueSecurityService
* @throws DataBackendException if there is a problem accessing the
* storage.
*/
- public List getUserList(Object criteria) throws DataBackendException
+ public List<User> getUserList(Object criteria) throws DataBackendException
{
return getUserManager().retrieveList(criteria);
}
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/security/torque/TorqueUser.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/security/torque/TorqueUser.java?rev=1073174&r1=1073173&r2=1073174&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/services/security/torque/TorqueUser.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/services/security/torque/TorqueUser.java
Mon Feb 21 22:18:45 2011
@@ -59,10 +59,10 @@ public class TorqueUser
private Date lastAccessDate = null;
/** This is data that will survive a servlet engine restart. */
- private Hashtable permStorage = null;
+ private Hashtable<String, Object> permStorage = null;
/** This is data that will not survive a servlet engine restart. */
- private Hashtable tempStorage = null;
+ private Hashtable<String, Object> tempStorage = null;
/**
* Constructor.
@@ -72,7 +72,7 @@ public class TorqueUser
{
super();
setCreateDate(new Date());
- tempStorage = new Hashtable(10);
+ tempStorage = new Hashtable<String, Object>(10);
setHasLoggedIn(Boolean.FALSE);
}
@@ -90,7 +90,7 @@ public class TorqueUser
// Do not set creation date. This is only called on retrieval from
// storage!
- tempStorage = new Hashtable(10);
+ tempStorage = new Hashtable<String, Object>(10);
setHasLoggedIn(Boolean.FALSE);
}
@@ -103,6 +103,7 @@ public class TorqueUser
*
*/
+ @Override
public Persistent getPersistentObj()
{
if (obj == null)
@@ -120,6 +121,7 @@ public class TorqueUser
*
* @exception Exception This method might throw an exceptions
*/
+ @Override
public void save(String torqueName)
throws Exception
{
@@ -138,6 +140,7 @@ public class TorqueUser
*
* @exception Exception This method might throw an exceptions
*/
+ @Override
public void save(Connection con)
throws Exception
{
@@ -151,6 +154,7 @@ public class TorqueUser
* @throws TurbineSecurityException if there is a problem while
* saving data.
*/
+ @Override
public void save()
throws TurbineSecurityException
{
@@ -181,6 +185,7 @@ public class TorqueUser
*
* @return The name of the object.
*/
+ @Override
public String getName()
{
return UserPeerManager.getName(getPersistentObj());
@@ -191,6 +196,7 @@ public class TorqueUser
*
* @param name The name of the object
*/
+ @Override
public void setName(String name)
{
setUserName(name);
@@ -232,6 +238,7 @@ public class TorqueUser
* @return The name of the user.
* @deprecated Use getName() instead.
*/
+ @Deprecated
public String getUserName()
{
return getName();
@@ -550,7 +557,7 @@ public class TorqueUser
*
* @return A Hashtable.
*/
- public Hashtable getPermStorage()
+ public Hashtable<String, Object> getPermStorage()
{
if (permStorage == null)
{
@@ -558,12 +565,12 @@ public class TorqueUser
if (objectdata != null)
{
- permStorage = (Hashtable) ObjectUtils.deserialize(objectdata);
+ permStorage = (Hashtable<String, Object>)
ObjectUtils.deserialize(objectdata);
}
if (permStorage == null)
{
- permStorage = new Hashtable();
+ permStorage = new Hashtable<String, Object>();
}
}
@@ -576,7 +583,7 @@ public class TorqueUser
*
* @param storage A Hashtable.
*/
- public void setPermStorage(Hashtable permStorage)
+ public void setPermStorage(Hashtable<String, Object> permStorage)
{
if (permStorage != null)
{
@@ -590,11 +597,11 @@ public class TorqueUser
*
* @return A Hashtable.
*/
- public Hashtable getTempStorage()
+ public Hashtable<String, Object> getTempStorage()
{
if (tempStorage == null)
{
- tempStorage = new Hashtable();
+ tempStorage = new Hashtable<String, Object>();
}
return tempStorage;
}
@@ -605,7 +612,7 @@ public class TorqueUser
*
* @param storage A Hashtable.
*/
- public void setTempStorage(Hashtable tempStorage)
+ public void setTempStorage(Hashtable<String, Object> tempStorage)
{
if (tempStorage != null)
{
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=1073174&r1=1073173&r2=1073174&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
Mon Feb 21 22:18:45 2011
@@ -39,10 +39,12 @@ public class SessionTool
{
public void init(Object o)
{
+ // empty
}
public void refresh()
{
+ // empty
}
/**
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/BaseMapper.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/BaseMapper.java?rev=1073174&r1=1073173&r2=1073174&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/BaseMapper.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/BaseMapper.java
Mon Feb 21 22:18:45 2011
@@ -25,9 +25,8 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.commons.lang.StringUtils;
-
-import org.apache.turbine.services.template.TurbineTemplate;
import org.apache.turbine.services.template.TemplateEngineService;
+import org.apache.turbine.services.template.TurbineTemplate;
/**
* A base class for the various mappers which contains common
@@ -46,7 +45,7 @@ public abstract class BaseMapper
private int cacheSize = 5;
/** The internal template -> name mapping cache */
- private Map templateCache = null;
+ private Map<String, String> templateCache = null;
/** The name of the default property to pull from the Template Engine
Service if the default is requested */
protected String defaultProperty;
@@ -65,6 +64,7 @@ public abstract class BaseMapper
*/
public BaseMapper()
{
+ // empty
}
/**
@@ -146,7 +146,7 @@ public abstract class BaseMapper
{
if (useCache)
{
- templateCache = new HashMap(cacheSize);
+ templateCache = new HashMap<String, String>(cacheSize);
}
}
@@ -199,7 +199,7 @@ public abstract class BaseMapper
if (useCache && templateCache.containsKey(template))
{
- return (String) templateCache.get(template);
+ return templateCache.get(template);
}
String res = doMapping(template);
Modified: turbine/core/trunk/src/java/org/apache/turbine/util/FormMessage.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/FormMessage.java?rev=1073174&r1=1073173&r2=1073174&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/util/FormMessage.java
(original)
+++ turbine/core/trunk/src/java/org/apache/turbine/util/FormMessage.java Mon
Feb 21 22:18:45 2011
@@ -35,14 +35,14 @@ public class FormMessage
{
private String message;
private String formName;
- private Vector fieldNames;
+ private final Vector<String> fieldNames;
/**
* Constructor.
*/
public FormMessage()
{
- fieldNames = new Vector();
+ fieldNames = new Vector<String>();
}
/**
@@ -150,6 +150,7 @@ public class FormMessage
* Write out the contents of the message in a friendly manner.
*
*/
+ @Override
public String toString()
{
StringBuffer sb = new StringBuffer("formName:" + getFormName() + ",
fieldNames:");
Modified: turbine/core/trunk/src/java/org/apache/turbine/util/FormMessages.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/FormMessages.java?rev=1073174&r1=1073173&r2=1073174&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/util/FormMessages.java
(original)
+++ turbine/core/trunk/src/java/org/apache/turbine/util/FormMessages.java Mon
Feb 21 22:18:45 2011
@@ -36,20 +36,20 @@ import java.util.Vector;
*/
public class FormMessages
{
- private Hashtable forms_messages;
- private Hashtable fields_messages;
- private Hashtable messages_fields;
- private Hashtable forms_fields;
+ private final Hashtable<String, Vector<String>> forms_messages;
+ private final Hashtable<String, Vector<String>> fields_messages;
+ private final Hashtable<String, Vector<String>> messages_fields;
+ private final Hashtable<String, Vector<String>> forms_fields;
/**
* Constructor.
*/
public FormMessages()
{
- forms_messages = new Hashtable();
- fields_messages = new Hashtable();
- messages_fields = new Hashtable();
- forms_fields = new Hashtable();
+ forms_messages = new Hashtable<String, Vector<String>>();
+ fields_messages = new Hashtable<String, Vector<String>>();
+ messages_fields = new Hashtable<String, Vector<String>>();
+ forms_fields = new Hashtable<String, Vector<String>>();
}
/**
@@ -90,25 +90,25 @@ public class FormMessages
* Adds a pair key/value to a table, making sure not to add
* duplicate keys.
*
- * @param table A Hastable.
+ * @param table A Hashtable.
* @param key A String with the key.
* @param value A String with value.
*/
- private void addValue(Hashtable table,
+ private void addValue(Hashtable<String, Vector<String>> table,
String key,
String value)
{
- Vector values;
+ Vector<String> values;
if (!table.containsKey(key))
{
- values = new Vector();
+ values = new Vector<String>();
values.addElement(value);
table.put(key, values);
}
else
{
- values = ((Vector) table.get(key));
+ values = table.get(key);
if (!values.contains(value))
values.addElement(value);
}
@@ -117,13 +117,13 @@ public class FormMessages
/**
* Gets a pair key/value from a table.
*
- * @param table A Hastable.
+ * @param table A Hashtable.
* @param key A String with the key.
* @return A Vector with the pair key/value, or null.
*/
- private final Vector getValues(Hashtable table, String key)
+ private final Vector<String> getValues(Hashtable<String, Vector<String>>
table, String key)
{
- return (Vector) table.get(key);
+ return table.get(key);
}
/**
@@ -134,7 +134,7 @@ public class FormMessages
*/
public FormMessage[] getFormMessages(String formName)
{
- Vector messages, fields;
+ Vector<String> messages, fields;
String messageName, fieldName;
messages = getValues(forms_messages, formName);
if (messages != null)
@@ -143,12 +143,12 @@ public class FormMessages
for (int i = 0; i < messages.size(); i++)
{
result[i] = new FormMessage(formName);
- messageName = (String) messages.elementAt(i);
+ messageName = messages.elementAt(i);
result[i].setMessage(messageName);
fields = getValues(messages_fields, messageName);
for (int j = 0; j < fields.size(); j++)
{
- fieldName = (String) fields.elementAt(j);
+ fieldName = fields.elementAt(j);
if (formHasField(formName, fieldName))
{
result[i].setFieldName(fieldName);
@@ -171,7 +171,7 @@ public class FormMessages
{
String key = formName + "-" + fieldName;
- Vector messages = getValues(fields_messages, key);
+ Vector<String> messages = getValues(fields_messages, key);
String messageName;
if (messages != null)
@@ -180,7 +180,7 @@ public class FormMessages
for (int i = 0; i < messages.size(); i++)
{
result[i] = new FormMessage(formName, fieldName);
- messageName = (String) messages.elementAt(i);
+ messageName = messages.elementAt(i);
result[i].setMessage(messageName);
}
return result;
Modified: turbine/core/trunk/src/java/org/apache/turbine/util/ObjectUtils.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/ObjectUtils.java?rev=1073174&r1=1073173&r2=1073174&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/util/ObjectUtils.java
(original)
+++ turbine/core/trunk/src/java/org/apache/turbine/util/ObjectUtils.java Mon
Feb 21 22:18:45 2011
@@ -29,9 +29,8 @@ import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.Serializable;
-import java.util.Enumeration;
import java.util.Hashtable;
-import java.util.List;
+import java.util.Map;
/**
* This is where common Object manipulation routines should go.
@@ -51,23 +50,22 @@ public abstract class ObjectUtils
*
* @exception Exception A generic exception.
*/
- public static byte[] serializeHashtable(Hashtable hash)
+ public static byte[] serializeHashtable(Hashtable<String, Object> hash)
throws Exception
{
- Hashtable saveData = new Hashtable(hash.size());
+ Hashtable<String, Serializable> saveData =
+ new Hashtable<String, Serializable>(hash.size());
String key = null;
Object value = null;
byte[] byteArray = null;
- Enumeration keys = hash.keys();
-
- while (keys.hasMoreElements())
+ for (Map.Entry<String, Object> entry : hash.entrySet())
{
- key = (String) keys.nextElement();
- value = hash.get(key);
+ key = entry.getKey();
+ value = entry.getValue();
if (value instanceof Serializable)
{
- saveData.put (key, value);
+ saveData.put (key, (Serializable)value);
}
}
@@ -133,6 +131,7 @@ public abstract class ObjectUtils
}
catch (Exception e)
{
+ // ignore
}
finally
{
@@ -142,17 +141,13 @@ public abstract class ObjectUtils
{
in.close();
}
- if (bufin != null)
- {
- bufin.close();
- }
- if (bin != null)
- {
- bin.close();
- }
+
+ bufin.close();
+ bin.close();
}
catch (IOException e)
{
+ // ignore
}
}
}
Modified: turbine/core/trunk/src/java/org/apache/turbine/util/ServletUtils.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/ServletUtils.java?rev=1073174&r1=1073173&r2=1073174&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/util/ServletUtils.java
(original)
+++ turbine/core/trunk/src/java/org/apache/turbine/util/ServletUtils.java Mon
Feb 21 22:18:45 2011
@@ -22,14 +22,12 @@ package org.apache.turbine.util;
import java.util.StringTokenizer;
+
import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
import org.apache.commons.lang.StringUtils;
-
import org.apache.turbine.Turbine;
-import org.apache.turbine.util.uri.URIConstants;
/**
* This is where common Servlet manipulation routines should go.
Modified: turbine/core/trunk/src/java/org/apache/turbine/util/TurbineConfig.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/TurbineConfig.java?rev=1073174&r1=1073173&r2=1073174&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/util/TurbineConfig.java
(original)
+++ turbine/core/trunk/src/java/org/apache/turbine/util/TurbineConfig.java Mon
Feb 21 22:18:45 2011
@@ -33,15 +33,16 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Set;
import java.util.Vector;
+
import javax.servlet.RequestDispatcher;
import javax.servlet.Servlet;
import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.activity.Initializable;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.turbine.Turbine;
/**
@@ -102,16 +103,16 @@ public class TurbineConfig
protected File root;
/** Servlet container (or emulator) attributes. */
- protected Map attributes;
+ protected Map<String, Object> attributes;
/** Turbine servlet initialization parameters. */
- protected Map initParams;
+ protected Map<String, String> initParams;
/** The Turbine servlet instance used for initialization. */
private Turbine turbine;
/** Logging */
- private Log log = LogFactory.getLog(this.getClass());
+ private final Log log = LogFactory.getLog(this.getClass());
/**
* Constructs a new TurbineConfig.
@@ -127,7 +128,8 @@ public class TurbineConfig
* @param attributes Servlet container (or emulator) attributes.
* @param initParams initialization parameters.
*/
- public TurbineConfig(String path, Map attributes, Map initParams)
+ public TurbineConfig(String path, Map<String, Object> attributes,
+ Map<String, String> initParams)
{
root = new File(path);
this.attributes = attributes;
@@ -137,31 +139,29 @@ public class TurbineConfig
/**
* @see #TurbineConfig(String path, Map attributes, Map initParams)
*/
- public TurbineConfig(String path, Map initParams)
+ public TurbineConfig(String path, Map<String, String> initParams)
{
- this(path, new HashMap(0), initParams);
+ this(path, new HashMap<String, Object>(0), initParams);
}
/**
* Constructs a TurbineConfig.
*
* This is a specialized constructor that allows to configure
- * Turbine easiliy in the common setups.
+ * Turbine easily in the common setups.
*
* @param path The web application root (i.e. the path for file lookup).
* @param properties the relative path to TurbineResources.properties file
*/
public TurbineConfig(String path, String properties)
{
- this(path, new HashMap(1));
+ this(path, new HashMap<String, String>(1));
initParams.put(PROPERTIES_PATH_KEY, properties);
}
/**
* Causes this class to initialize itself which in turn initializes
* all of the Turbine Services that need to be initialized.
- *
- * @see org.apache.stratum.lifecycle.Initializable
*/
public void initialize()
{
@@ -266,7 +266,7 @@ public class TurbineConfig
*/
public String getInitParameter(String name)
{
- return (String) initParams.get(name);
+ return initParams.get(name);
}
/**
@@ -276,7 +276,7 @@ public class TurbineConfig
*/
public Enumeration getInitParameterNames()
{
- return new Vector(initParams.keySet()).elements();
+ return new Vector<String>(initParams.keySet()).elements();
}
/**
@@ -310,7 +310,7 @@ public class TurbineConfig
*
* @return the context path
*/
- public String getContextPath()
+ public String getContextPath()
{
return "/turbine";
}
@@ -357,6 +357,7 @@ public class TurbineConfig
* @param m a message.
* @deprecated use log(String,Throwable) instead
*/
+ @Deprecated
public void log(Exception e, String m)
{
log.info(m, e);
@@ -398,7 +399,7 @@ public class TurbineConfig
*/
public Enumeration getAttributeNames()
{
- return new Vector(attributes.keySet()).elements();
+ return new Vector<String>(attributes.keySet()).elements();
}
// Unimplemented methods follow
@@ -504,6 +505,7 @@ public class TurbineConfig
* throw <code>UnsuportedOperationException</code> upon invocation
* @deprecated As of Java Servlet API 2.1, with no direct replacement.
*/
+ @Deprecated
public Servlet getServlet(String s)
{
throw new UnsupportedOperationException();
@@ -516,6 +518,7 @@ public class TurbineConfig
* throw <code>UnsuportedOperationException</code> upon invocation
* @deprecated As of Java Servlet API 2.1, with no replacement.
*/
+ @Deprecated
public Enumeration getServletNames()
{
throw new UnsupportedOperationException();
@@ -528,6 +531,7 @@ public class TurbineConfig
* throw <code>UnsuportedOperationException</code> upon invocation
* @deprecated As of Java Servlet API 2.0, with no replacement.
*/
+ @Deprecated
public Enumeration getServlets()
{
throw new UnsupportedOperationException();
Modified:
turbine/core/trunk/src/java/org/apache/turbine/util/TurbineXmlConfig.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/TurbineXmlConfig.java?rev=1073174&r1=1073173&r2=1073174&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/util/TurbineXmlConfig.java
(original)
+++ turbine/core/trunk/src/java/org/apache/turbine/util/TurbineXmlConfig.java
Mon Feb 21 22:18:45 2011
@@ -67,7 +67,8 @@ public class TurbineXmlConfig
* @param attributes Servlet container (or emulator) attributes.
* @param initParams initialization parameters.
*/
- public TurbineXmlConfig(String path, Map attributes, Map initParams)
+ public TurbineXmlConfig(String path, Map<String, Object> attributes,
+ Map<String, String> initParams)
{
super(path, attributes, initParams);
}
@@ -75,9 +76,9 @@ public class TurbineXmlConfig
/**
* @see #TurbineXmlConfig(String path, Map attributes, Map initParams)
*/
- public TurbineXmlConfig(String path, Map initParams)
+ public TurbineXmlConfig(String path, Map<String, String> initParams)
{
- this(path, new HashMap(0), initParams);
+ this(path, new HashMap<String, Object>(0), initParams);
}
/**
@@ -91,7 +92,7 @@ public class TurbineXmlConfig
*/
public TurbineXmlConfig(String path, String config)
{
- this(path, new HashMap(1));
+ this(path, new HashMap<String, String>(1));
initParams.put(CONFIGURATION_PATH_KEY, config);
}
}
Modified:
turbine/core/trunk/src/java/org/apache/turbine/util/security/AccessControlException.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/security/AccessControlException.java?rev=1073174&r1=1073173&r2=1073174&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/util/security/AccessControlException.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/util/security/AccessControlException.java
Mon Feb 21 22:18:45 2011
@@ -31,6 +31,9 @@ package org.apache.turbine.util.security
public class AccessControlException
extends TurbineSecurityException
{
+ /** TODO serialVersionUID */
+ private static final long serialVersionUID = -594555809858627271L;
+
/**
* Construct an AccessControlException with specified detail message.
*
Modified:
turbine/core/trunk/src/java/org/apache/turbine/util/security/DataBackendException.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/security/DataBackendException.java?rev=1073174&r1=1073173&r2=1073174&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/util/security/DataBackendException.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/util/security/DataBackendException.java
Mon Feb 21 22:18:45 2011
@@ -32,6 +32,9 @@ package org.apache.turbine.util.security
public class DataBackendException
extends TurbineSecurityException
{
+ /** TODO serialVersionUID */
+ private static final long serialVersionUID = 3069718405955172641L;
+
/**
* Construct an DataBackendException with specified detail message.
*
Modified:
turbine/core/trunk/src/java/org/apache/turbine/util/security/EntityExistsException.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/security/EntityExistsException.java?rev=1073174&r1=1073173&r2=1073174&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/util/security/EntityExistsException.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/util/security/EntityExistsException.java
Mon Feb 21 22:18:45 2011
@@ -32,6 +32,9 @@ package org.apache.turbine.util.security
public class EntityExistsException
extends TurbineSecurityException
{
+ /** TODO serialVersionUID */
+ private static final long serialVersionUID = -1599279419997911108L;
+
/**
* Construct an EntityExistsException with specified detail message.
*
Modified:
turbine/core/trunk/src/java/org/apache/turbine/util/security/GroupSet.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/security/GroupSet.java?rev=1073174&r1=1073173&r2=1073174&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/util/security/GroupSet.java
(original)
+++ turbine/core/trunk/src/java/org/apache/turbine/util/security/GroupSet.java
Mon Feb 21 22:18:45 2011
@@ -189,6 +189,7 @@ public class GroupSet
* @returns The Group Set as String
*
*/
+ @Override
public String toString()
{
StringBuffer sb = new StringBuffer();
Modified:
turbine/core/trunk/src/java/org/apache/turbine/util/security/PasswordMismatchException.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/security/PasswordMismatchException.java?rev=1073174&r1=1073173&r2=1073174&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/util/security/PasswordMismatchException.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/util/security/PasswordMismatchException.java
Mon Feb 21 22:18:45 2011
@@ -31,6 +31,9 @@ package org.apache.turbine.util.security
public class PasswordMismatchException
extends TurbineSecurityException
{
+ /** TODO serialVersionUID */
+ private static final long serialVersionUID = -4679484661449307344L;
+
/**
* Construct an PasswordMismatchException with specified detail message.
*
Modified:
turbine/core/trunk/src/java/org/apache/turbine/util/security/PermissionSet.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/security/PermissionSet.java?rev=1073174&r1=1073173&r2=1073174&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/util/security/PermissionSet.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/util/security/PermissionSet.java
Mon Feb 21 22:18:45 2011
@@ -191,6 +191,7 @@ public class PermissionSet
* @returns The Permission Set as String
*
*/
+ @Override
public String toString()
{
StringBuffer sb = new StringBuffer();
Modified:
turbine/core/trunk/src/java/org/apache/turbine/util/security/RoleSet.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/security/RoleSet.java?rev=1073174&r1=1073173&r2=1073174&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/util/security/RoleSet.java
(original)
+++ turbine/core/trunk/src/java/org/apache/turbine/util/security/RoleSet.java
Mon Feb 21 22:18:45 2011
@@ -189,6 +189,7 @@ public class RoleSet
* @returns The Role Set as String
*
*/
+ @Override
public String toString()
{
StringBuffer sb = new StringBuffer();
Modified:
turbine/core/trunk/src/java/org/apache/turbine/util/security/SecuritySet.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/security/SecuritySet.java?rev=1073174&r1=1073173&r2=1073174&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/util/security/SecuritySet.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/util/security/SecuritySet.java
Mon Feb 21 22:18:45 2011
@@ -156,6 +156,7 @@ public abstract class SecuritySet<T>
*
* @return The string representation of this Set.
*/
+ @Override
public String toString()
{
StringBuffer sbuf = new StringBuffer(12 * size());
Modified:
turbine/core/trunk/src/java/org/apache/turbine/util/security/TurbineAccessControlList.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/security/TurbineAccessControlList.java?rev=1073174&r1=1073173&r2=1073174&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/util/security/TurbineAccessControlList.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/util/security/TurbineAccessControlList.java
Mon Feb 21 22:18:45 2011
@@ -21,7 +21,6 @@ package org.apache.turbine.util.security
*/
-import java.util.Iterator;
import java.util.Map;
import org.apache.turbine.om.security.Group;
@@ -45,11 +44,14 @@ import org.apache.turbine.services.secur
public class TurbineAccessControlList
implements AccessControlList
{
+ /** Serial version */
+ private static final long serialVersionUID = 2678947159949477950L;
+
/** The sets of roles that the user has in different groups */
- private Map roleSets;
+ private final Map<Group, RoleSet> roleSets;
/** The sets of permissions that the user has in different groups */
- private Map permissionSets;
+ private final Map<Group, PermissionSet> permissionSets;
/** The name of this ACL. Needed for the SecurityEntity Interface */
private String name;
@@ -69,7 +71,7 @@ public class TurbineAccessControlList
* @param roleSets a hashtable containing RoleSet objects keyed with Group
objects
* @param permissionSets a hashtable containing PermissionSet objects
keyed with Group objects
*/
- public TurbineAccessControlList(Map roleSets, Map permissionSets)
+ public TurbineAccessControlList(Map<Group, RoleSet> roleSets, Map<Group,
PermissionSet> permissionSets)
{
this.roleSets = roleSets;
this.permissionSets = permissionSets;
@@ -109,7 +111,7 @@ public class TurbineAccessControlList
{
return null;
}
- return (RoleSet) roleSets.get(group);
+ return roleSets.get(group);
}
/**
@@ -134,7 +136,7 @@ public class TurbineAccessControlList
{
return null;
}
- return (PermissionSet) permissionSets.get(group);
+ return permissionSets.get(group);
}
/**
@@ -179,9 +181,8 @@ public class TurbineAccessControlList
{
return false;
}
- for (Iterator groups = groupset.iterator(); groups.hasNext();)
+ for (Group group : groupset)
{
- Group group = (Group) groups.next();
RoleSet roles = getRoles(group);
if (roles != null)
{
@@ -238,9 +239,8 @@ public class TurbineAccessControlList
{
return false;
}
- for (Iterator groups = groupset.iterator(); groups.hasNext();)
+ for (Group group : groupset)
{
- Group group = (Group) groups.next();
RoleSet roles = getRoles(group);
if (roles != null)
{
@@ -314,9 +314,8 @@ public class TurbineAccessControlList
{
return false;
}
- for (Iterator groups = groupset.iterator(); groups.hasNext();)
+ for (Group group : groupset)
{
- Group group = (Group) groups.next();
PermissionSet permissions = getPermissions(group);
if (permissions != null)
{
@@ -393,9 +392,9 @@ public class TurbineAccessControlList
{
return false;
}
- for (Iterator groups = groupset.iterator(); groups.hasNext();)
+ for (Object element : groupset)
{
- Group group = (Group) groups.next();
+ Group group = (Group) element;
PermissionSet permissions = getPermissions(group);
if (permissions != null)
{
Modified:
turbine/core/trunk/src/java/org/apache/turbine/util/security/TurbineSecurityException.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/security/TurbineSecurityException.java?rev=1073174&r1=1073173&r2=1073174&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/util/security/TurbineSecurityException.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/util/security/TurbineSecurityException.java
Mon Feb 21 22:18:45 2011
@@ -33,6 +33,9 @@ import org.apache.turbine.util.TurbineEx
public class TurbineSecurityException
extends TurbineException
{
+ /** TODO serialVersionUID */
+ private static final long serialVersionUID = 3932095155241924973L;
+
/**
* Construct an SecurityException with specified detail message.
*
Modified:
turbine/core/trunk/src/java/org/apache/turbine/util/security/UnknownEntityException.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/security/UnknownEntityException.java?rev=1073174&r1=1073173&r2=1073174&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/util/security/UnknownEntityException.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/util/security/UnknownEntityException.java
Mon Feb 21 22:18:45 2011
@@ -32,6 +32,9 @@ package org.apache.turbine.util.security
public class UnknownEntityException
extends TurbineSecurityException
{
+ /** TODO serialVersionUID */
+ private static final long serialVersionUID = 292295293154904822L;
+
/**
* Construct an UnknownEntityException with specified detail message.
*
Modified:
turbine/core/trunk/src/java/org/apache/turbine/util/template/HtmlPageAttributes.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/template/HtmlPageAttributes.java?rev=1073174&r1=1073173&r2=1073174&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/util/template/HtmlPageAttributes.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/util/template/HtmlPageAttributes.java
Mon Feb 21 22:18:45 2011
@@ -21,18 +21,13 @@ package org.apache.turbine.util.template
*/
-import java.util.HashMap;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import java.util.ArrayList;
import org.apache.commons.configuration.Configuration;
-
import org.apache.commons.lang.StringUtils;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import org.apache.turbine.Turbine;
import org.apache.turbine.TurbineConstants;
import org.apache.turbine.services.pull.ApplicationTool;
@@ -103,29 +98,26 @@ import org.apache.turbine.util.RunData;
public class HtmlPageAttributes
implements ApplicationTool
{
- /** Logging */
- private static Log log = LogFactory.getLog(HtmlPageAttributes.class);
-
/** The title */
private String title;
/** Body Attributes */
- private Map bodyAttributes = new HashMap();
+ private final Map<String, String> bodyAttributes = new
LinkedHashMap<String, String>();
/** Script references */
- private List scripts = new ArrayList();
+ private final List<String> scripts = new ArrayList<String>();
/** External references */
- private List linkTags = new ArrayList();
+ private final List<LinkTag> linkTags = new ArrayList<LinkTag>();
/** Inline styles */
- private List styles = new ArrayList();
+ private final List<String> styles = new ArrayList<String>();
/** Meta tags for the HEAD */
- private Map metaTags = new HashMap();
+ private final Map<String, String> metaTags = new LinkedHashMap<String,
String>();
/** http-equiv tags */
- private Map httpEquivs = new HashMap();
+ private final Map<String, String> httpEquivs = new LinkedHashMap<String,
String>();
/** Doctype */
private String doctype = null;
@@ -135,6 +127,7 @@ public class HtmlPageAttributes
*/
public HtmlPageAttributes()
{
+ // empty
}
/**
@@ -497,6 +490,7 @@ public class HtmlPageAttributes
*
* @return An empty String ("").
*/
+ @Override
public String toString()
{
return "";
Modified:
turbine/core/trunk/src/java/org/apache/turbine/util/template/TemplateInfo.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/template/TemplateInfo.java?rev=1073174&r1=1073173&r2=1073174&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/util/template/TemplateInfo.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/util/template/TemplateInfo.java
Mon Feb 21 22:18:45 2011
@@ -21,8 +21,8 @@ package org.apache.turbine.util.template
*/
-import java.util.Map;
import java.util.HashMap;
+import java.util.Map;
import org.apache.turbine.services.template.TurbineTemplate;
import org.apache.turbine.util.RunData;
@@ -51,7 +51,7 @@ public class TemplateInfo
private RunData data = null;
/* Place to store information about templates. */
- private Map tempStorage = null;
+ private Map<String, Object> tempStorage = null;
/**
* Constructor
@@ -61,7 +61,7 @@ public class TemplateInfo
public TemplateInfo(RunData data)
{
this.data = data;
- tempStorage = new HashMap(10);
+ tempStorage = new HashMap<String, Object>(10);
}
/**
Modified:
turbine/core/trunk/src/java/org/apache/turbine/util/velocity/VelocityActionEvent.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/velocity/VelocityActionEvent.java?rev=1073174&r1=1073173&r2=1073174&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/util/velocity/VelocityActionEvent.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/util/velocity/VelocityActionEvent.java
Mon Feb 21 22:18:45 2011
@@ -68,6 +68,8 @@ public abstract class VelocityActionEven
* @param data A Turbine RunData object.
* @exception Exception a generic exception.
*/
+ @Deprecated
+ @Override
public abstract void doPerform(RunData data)
throws Exception;
@@ -77,10 +79,11 @@ public abstract class VelocityActionEven
* @param data Turbine information.
* @exception Exception a generic exception.
*/
- public void doPerform(PipelineData pipelineData)
+ @Override
+ public void doPerform(PipelineData pipelineData)
throws Exception
{
- RunData data = (RunData) getRunData(pipelineData);
+ RunData data = getRunData(pipelineData);
doPerform(data);
}
/**
@@ -100,6 +103,8 @@ public abstract class VelocityActionEven
* @param data A Turbine RunData object.
* @exception Exception a generic exception.
*/
+ @Deprecated
+ @Override
protected void perform(RunData data)
throws Exception
{
@@ -125,16 +130,17 @@ public abstract class VelocityActionEven
* @param data A Turbine RunData object.
* @exception Exception a generic exception.
*/
+ @Override
protected void perform(PipelineData pipelineData)
throws Exception
{
- RunData data = (RunData) getRunData(pipelineData);
try
{
if (!initialized)
{
initialize();
}
+
executeEvents(pipelineData,
TurbineVelocity.getContext(pipelineData));
}
catch (NoSuchMethodException e)
@@ -149,6 +155,7 @@ public abstract class VelocityActionEven
* @param context Velocity context information.
* @exception Exception a generic exception.
*/
+ @Deprecated
public void executeEvents(RunData data, Context context)
throws Exception
{
@@ -228,7 +235,7 @@ public abstract class VelocityActionEven
public void executeEvents(PipelineData pipelineData, Context context)
throws Exception
{
- RunData data = (RunData) getRunData(pipelineData);
+ RunData data = getRunData(pipelineData);
// Name of the button.
String theButton = null;
