You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by lu...@apache.org on 2011/02/03 21:14:53 UTC
svn commit: r1066938 - in /turbine/core/trunk/src/java/org/apache/turbine:
services/rundata/ services/schedule/ services/servlet/ util/
Author: ludwig
Date: Thu Feb 3 20:14:53 2011
New Revision: 1066938
URL: http://svn.apache.org/viewvc?rev=1066938&view=rev
Log:
Java 5 to services rundata, schedule, servlet
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java
turbine/core/trunk/src/java/org/apache/turbine/services/rundata/TurbineRunData.java
turbine/core/trunk/src/java/org/apache/turbine/services/rundata/TurbineRunDataService.java
turbine/core/trunk/src/java/org/apache/turbine/services/schedule/JobEntryInterface.java
turbine/core/trunk/src/java/org/apache/turbine/services/schedule/JobQueue.java
turbine/core/trunk/src/java/org/apache/turbine/services/schedule/ScheduleService.java
turbine/core/trunk/src/java/org/apache/turbine/services/schedule/SchedulerTool.java
turbine/core/trunk/src/java/org/apache/turbine/services/schedule/TurbineNonPersistentSchedulerService.java
turbine/core/trunk/src/java/org/apache/turbine/services/schedule/TurbineScheduler.java
turbine/core/trunk/src/java/org/apache/turbine/services/schedule/TurbineSchedulerService.java
turbine/core/trunk/src/java/org/apache/turbine/services/servlet/TurbineServletService.java
turbine/core/trunk/src/java/org/apache/turbine/util/RunData.java
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java?rev=1066938&r1=1066937&r2=1066938&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java Thu Feb 3 20:14:53 2011
@@ -27,6 +27,7 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
+import javax.naming.Context;
import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
@@ -179,10 +180,10 @@ public class DefaultTurbineRunData
private int statusCode = HttpServletResponse.SC_OK;
/** This is a List to hold critical system errors. */
- private List errors = new ArrayList();
+ private List<SystemError> errors = new ArrayList<SystemError>();
/** JNDI Contexts. */
- private Map jndiContexts;
+ private Map<String, Context> jndiContexts;
/** Holds ServerData (basic properties) about this RunData object. */
private ServerData serverData;
@@ -207,7 +208,7 @@ public class DefaultTurbineRunData
* screen. This is great for debugging variable values when an
* exception is thrown.
*/
- private Map debugVariables = new HashMap();
+ private Map<String, Object> debugVariables = new HashMap<String, Object>();
/** Logging */
private static Log log = LogFactory.getLog(DefaultTurbineRunData.class);
@@ -505,6 +506,7 @@ public class DefaultTurbineRunData
* @return true if the page is set.
* @deprecated no replacement planned, ECS is no longer a requirement
*/
+ @Deprecated
public boolean isPageSet()
{
return pageSet;
@@ -516,6 +518,7 @@ public class DefaultTurbineRunData
* @return a document.
* @deprecated no replacement planned, ECS is no longer a requirement
*/
+ @Deprecated
public Document getPage()
{
pageSet = true;
@@ -912,6 +915,7 @@ public class DefaultTurbineRunData
* @return true if out is set.
* @deprecated no replacement planned, response writer will not be cached
*/
+ @Deprecated
public boolean isOutSet()
{
return outSet;
@@ -925,6 +929,7 @@ public class DefaultTurbineRunData
* @throws IOException
* @deprecated no replacement planned, response writer will not be cached
*/
+ @Deprecated
public PrintWriter getOut()
throws IOException
{
@@ -1137,10 +1142,10 @@ public class DefaultTurbineRunData
*
* @return a hashtable.
*/
- public Map getJNDIContexts()
+ public Map<String, Context> getJNDIContexts()
{
if (jndiContexts == null)
- jndiContexts = new HashMap();
+ jndiContexts = new HashMap<String, Context>();
return jndiContexts;
}
@@ -1149,7 +1154,7 @@ public class DefaultTurbineRunData
*
* @param contexts a hashtable.
*/
- public void setJNDIContexts(Map contexts)
+ public void setJNDIContexts(Map<String, Context> contexts)
{
this.jndiContexts = contexts;
}
@@ -1323,7 +1328,8 @@ public class DefaultTurbineRunData
* @return a Map of debug variables.
* @deprecated use {@link #getDebugVariables} instead
*/
- public Map getVarDebug()
+ @Deprecated
+ public Map<String, Object> getVarDebug()
{
return debugVariables;
}
@@ -1346,7 +1352,7 @@ public class DefaultTurbineRunData
*
* @return a Map of debug variables.
*/
- public Map getDebugVariables()
+ public Map<String, Object> getDebugVariables()
{
return this.debugVariables;
}
@@ -1458,6 +1464,7 @@ public class DefaultTurbineRunData
* @param out a print writer.
* @deprecated no replacement planned, response writer will not be cached
*/
+ @Deprecated
protected void setOut(PrintWriter out)
{
this.out = out;
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/rundata/TurbineRunData.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/rundata/TurbineRunData.java?rev=1066938&r1=1066937&r2=1066938&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/rundata/TurbineRunData.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/rundata/TurbineRunData.java Thu Feb 3 20:14:53 2011
@@ -20,16 +20,14 @@ package org.apache.turbine.services.rund
*/
import javax.servlet.ServletConfig;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import org.apache.turbine.util.RunData;
-import org.apache.turbine.util.ServerData;
import org.apache.fulcrum.parser.CookieParser;
import org.apache.fulcrum.parser.ParameterParser;
import org.apache.fulcrum.pool.Recyclable;
+import org.apache.turbine.util.RunData;
+import org.apache.turbine.util.ServerData;
/**
* TurbineRunData is an extension to the RunData interface to be
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/rundata/TurbineRunDataService.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/rundata/TurbineRunDataService.java?rev=1066938&r1=1066937&r2=1066938&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/rundata/TurbineRunDataService.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/rundata/TurbineRunDataService.java Thu Feb 3 20:14:53 2011
@@ -73,7 +73,7 @@ public class TurbineRunDataService
DefaultCookieParser.class.getName();
/** The map of configurations. */
- private Map configurations = new HashMap();
+ private Map<String, Object> configurations = new HashMap<String, Object>();
/** Private reference to the pool service for object recycling */
private PoolService pool = null;
@@ -93,6 +93,8 @@ public class TurbineRunDataService
*
* @throws InitializationException if initialization fails.
*/
+ @SuppressWarnings("unchecked")
+ @Override
public void init()
throws InitializationException
{
@@ -117,9 +119,9 @@ public class TurbineRunDataService
PARAMETER_PARSER_KEY,
COOKIE_PARSER_KEY
};
- for (Iterator i = conf.getKeys(); i.hasNext();)
+ for (Iterator<String> i = conf.getKeys(); i.hasNext();)
{
- key = (String) i.next();
+ key = i.next();
value = conf.getString(key);
for (int j = 0; j < plist.length; j++)
{
@@ -130,7 +132,7 @@ public class TurbineRunDataService
config = (String[]) configurations.get(key);
if (config == null)
{
- config = (String[]) def.clone();
+ config = def.clone();
configurations.put(key, config);
}
config[j] = value;
@@ -196,7 +198,7 @@ public class TurbineRunDataService
IllegalArgumentException
{
// a map to hold information to be added to pipelineData
- Map pipelineDataMap = new HashMap();
+ Map<Class<?>, Object> pipelineDataMap = new HashMap<Class<?>, Object>();
// The RunData object caches all the information that is needed for
// the execution lifetime of a single request. A RunData object
// is created/recycled for each and every request and is passed
@@ -221,9 +223,9 @@ public class TurbineRunDataService
TurbineRunData data;
try
{
- Class runDataClazz = Class.forName(cfg[0]);
- Class parameterParserClazz = Class.forName(cfg[1]);
- Class cookieParserClazz = Class.forName(cfg[2]);
+ Class<?> runDataClazz = Class.forName(cfg[0]);
+ Class<?> parameterParserClazz = Class.forName(cfg[1]);
+ Class<?> cookieParserClazz = Class.forName(cfg[2]);
data = (TurbineRunData) pool.getInstance(runDataClazz);
ParameterParser pp = (ParameterParser) parserService.getParser(parameterParserClazz);
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/schedule/JobEntryInterface.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/schedule/JobEntryInterface.java?rev=1066938&r1=1066937&r2=1066938&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/schedule/JobEntryInterface.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/schedule/JobEntryInterface.java Thu Feb 3 20:14:53 2011
@@ -35,7 +35,7 @@ import org.apache.turbine.util.TurbineEx
* @author <a href="mailto:quintonm@bellsouth.net">Quinton McCombs</a>
* @version $Id$
*/
-public interface JobEntryInterface extends Comparable, Persistent
+public interface JobEntryInterface extends Comparable<JobEntry>, Persistent
{
/**
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/schedule/JobQueue.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/schedule/JobQueue.java?rev=1066938&r1=1066937&r2=1066938&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/schedule/JobQueue.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/schedule/JobQueue.java Thu Feb 3 20:14:53 2011
@@ -38,14 +38,14 @@ public class JobQueue
/**
* The queue of <code>JobEntry</code> objects.
*/
- private Vector queue = null;
+ private Vector<JobEntry> queue = null;
/**
* Creates a new instance.
*/
public JobQueue()
{
- queue = new Vector(10);
+ queue = new Vector<JobEntry>(10);
}
/**
@@ -58,7 +58,7 @@ public class JobQueue
{
if (queue.size() > 0)
{
- return (JobEntry) queue.elementAt(0);
+ return queue.elementAt(0);
}
else
{
@@ -87,7 +87,7 @@ public class JobQueue
}
else
{
- return (JobEntry) queue.elementAt(index);
+ return queue.elementAt(index);
}
}
@@ -96,11 +96,12 @@ public class JobQueue
*
* @return A Vector of <code>JobEntry</code> objects.
*/
- public Vector list()
+ @SuppressWarnings("unchecked")
+ public Vector<JobEntry> list()
{
if (queue != null && queue.size() > 0)
{
- return (Vector) queue.clone();
+ return (Vector<JobEntry>) queue.clone();
}
else
{
@@ -125,7 +126,7 @@ public class JobQueue
*
* @param jobEntries A list of the <code>JobEntry</code> objects to load.
*/
- public synchronized void batchLoad(List jobEntries)
+ public synchronized void batchLoad(List<JobEntry> jobEntries)
{
if (jobEntries != null)
{
@@ -179,12 +180,12 @@ public class JobQueue
*/
private void sortQueue()
{
- Comparator aComparator = new Comparator()
+ Comparator<JobEntry> aComparator = new Comparator<JobEntry>()
{
- public int compare(Object o1, Object o2)
+ public int compare(JobEntry o1, JobEntry o2)
{
- Long time1 = new Long(((JobEntry) o1).getNextRuntime());
- Long time2 = new Long(((JobEntry) o2).getNextRuntime());
+ Long time1 = new Long(o1.getNextRuntime());
+ Long time2 = new Long(o2.getNextRuntime());
return (time1.compareTo(time2));
}
};
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/schedule/ScheduleService.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/schedule/ScheduleService.java?rev=1066938&r1=1066937&r2=1066938&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/schedule/ScheduleService.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/schedule/ScheduleService.java Thu Feb 3 20:14:53 2011
@@ -87,7 +87,7 @@ public interface ScheduleService
*
* @return A List of jobs.
*/
- List listJobs();
+ List<JobEntry> listJobs();
/**
* Determines if the scheduler service is currently active.
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/schedule/SchedulerTool.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/schedule/SchedulerTool.java?rev=1066938&r1=1066937&r2=1066938&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/schedule/SchedulerTool.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/schedule/SchedulerTool.java Thu Feb 3 20:14:53 2011
@@ -65,7 +65,7 @@ public class SchedulerTool implements Ap
*
* @return List of JobEntry objects.
*/
- public List getScheduledJobs()
+ public List<JobEntry> getScheduledJobs()
{
return TurbineScheduler.listJobs();
}
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/schedule/TurbineNonPersistentSchedulerService.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/schedule/TurbineNonPersistentSchedulerService.java?rev=1066938&r1=1066937&r2=1066938&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/schedule/TurbineNonPersistentSchedulerService.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/schedule/TurbineNonPersistentSchedulerService.java Thu Feb 3 20:14:53 2011
@@ -94,6 +94,8 @@ public class TurbineNonPersistentSchedul
* (sorted in ascending order by runtime) and start the scheduler
* thread.
*/
+ @SuppressWarnings("unchecked")
+ @Override
public void init()
throws InitializationException
{
@@ -104,15 +106,15 @@ public class TurbineNonPersistentSchedul
scheduleQueue = new JobQueue();
mainLoop = new MainLoop();
- List jobProps = conf.getList("scheduler.jobs");
- List jobs = new Vector();
+ List<String> jobProps = conf.getList("scheduler.jobs");
+ List<JobEntry> jobs = new Vector<JobEntry>();
// If there are scheduler.jobs defined then set up a job vector
// for the scheduleQueue
if (!jobProps.isEmpty())
{
for (int i = 0; i < jobProps.size(); i++)
{
- String jobName = (String) jobProps.get(i);
+ String jobName = jobProps.get(i);
String jobPrefix = "scheduler.job." + jobName;
String jobId = conf.getString(jobPrefix + ".ID", null);
@@ -170,6 +172,8 @@ public class TurbineNonPersistentSchedul
* @param config A ServletConfig.
* @deprecated use init() instead.
*/
+ @Deprecated
+ @Override
public void init(ServletConfig config)
throws InitializationException
{
@@ -183,6 +187,7 @@ public class TurbineNonPersistentSchedul
* @return A JobEntry.
* @exception TurbineException could not retrieve job
*/
+ @Override
public JobEntry getJob(int oid)
throws TurbineException
{
@@ -197,6 +202,7 @@ public class TurbineNonPersistentSchedul
* @param je A JobEntry with the job to add.
* @throws TurbineException job could not be added
*/
+ @Override
public void addJob(JobEntry je)
throws TurbineException
{
@@ -208,6 +214,7 @@ public class TurbineNonPersistentSchedul
*
* @param je A JobEntry with the job to remove.
*/
+ @Override
public void removeJob(JobEntry je)
{
// Remove from the queue.
@@ -221,6 +228,7 @@ public class TurbineNonPersistentSchedul
* @param je A JobEntry with the job to modify
* @throws TurbineException job could not be updated
*/
+ @Override
public void updateJob(JobEntry je)
throws TurbineException
{
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/schedule/TurbineScheduler.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/schedule/TurbineScheduler.java?rev=1066938&r1=1066937&r2=1066938&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/schedule/TurbineScheduler.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/schedule/TurbineScheduler.java Thu Feb 3 20:14:53 2011
@@ -91,7 +91,7 @@ public abstract class TurbineScheduler
*
* @return A Vector of jobs.
*/
- public static List listJobs()
+ public static List<JobEntry> listJobs()
{
return getService().listJobs();
}
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/schedule/TurbineSchedulerService.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/schedule/TurbineSchedulerService.java?rev=1066938&r1=1066937&r2=1066938&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/schedule/TurbineSchedulerService.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/schedule/TurbineSchedulerService.java Thu Feb 3 20:14:53 2011
@@ -75,6 +75,7 @@ public class TurbineSchedulerService
* @throws InitializationException Something went wrong in the init
* stage
*/
+ @Override
public void init()
throws InitializationException
{
@@ -85,14 +86,14 @@ public class TurbineSchedulerService
mainLoop = new MainLoop();
// Load all from cold storage.
- List jobs = JobEntryPeer.doSelect(new Criteria());
+ List<JobEntry> jobs = JobEntryPeer.doSelect(new Criteria());
if (jobs != null && jobs.size() > 0)
{
- Iterator it = jobs.iterator();
+ Iterator<JobEntry> it = jobs.iterator();
while (it.hasNext())
{
- ((JobEntry) it.next()).calcRunTime();
+ it.next().calcRunTime();
}
scheduleQueue.batchLoad(jobs);
@@ -119,6 +120,7 @@ public class TurbineSchedulerService
* @param config A ServletConfig.
* @deprecated use init() instead.
*/
+ @Deprecated
public void init(ServletConfig config) throws InitializationException
{
init();
@@ -129,6 +131,7 @@ public class TurbineSchedulerService
*
* This methods interrupts the housekeeping thread.
*/
+ @Override
public void shutdown()
{
if (getThread() != null)
@@ -241,7 +244,7 @@ public class TurbineSchedulerService
*
* @return A List of jobs.
*/
- public List listJobs()
+ public List<JobEntry> listJobs()
{
return scheduleQueue.list();
}
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/servlet/TurbineServletService.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/servlet/TurbineServletService.java?rev=1066938&r1=1066937&r2=1066938&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/servlet/TurbineServletService.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/servlet/TurbineServletService.java Thu Feb 3 20:14:53 2011
@@ -64,6 +64,7 @@ public class TurbineServletService
* a zero parameter variant which queries the Turbine Servlet
* for its config.
*/
+ @Override
public void init()
{
this.servletConfig = Turbine.getTurbineServletConfig();
Modified: turbine/core/trunk/src/java/org/apache/turbine/util/RunData.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/RunData.java?rev=1066938&r1=1066937&r2=1066938&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/util/RunData.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/util/RunData.java Thu Feb 3 20:14:53 2011
@@ -25,6 +25,8 @@ import java.io.IOException;
import java.io.PrintWriter;
import java.util.Locale;
import java.util.Map;
+
+import javax.naming.Context;
import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
@@ -34,11 +36,10 @@ import javax.servlet.http.HttpSession;
import org.apache.ecs.Document;
import org.apache.ecs.Element;
import org.apache.ecs.StringElement;
-
-import org.apache.turbine.om.security.User;
-import org.apache.turbine.pipeline.PipelineData;
import org.apache.fulcrum.parser.CookieParser;
import org.apache.fulcrum.parser.ParameterParser;
+import org.apache.turbine.om.security.User;
+import org.apache.turbine.pipeline.PipelineData;
import org.apache.turbine.util.security.AccessControlList;
import org.apache.turbine.util.template.TemplateInfo;
@@ -127,6 +128,7 @@ public interface RunData extends Pipelin
* @return true if the page is set.
* @deprecated no replacement planned, ECS is no longer a requirement
*/
+ @Deprecated
boolean isPageSet();
/**
@@ -135,6 +137,7 @@ public interface RunData extends Pipelin
* @return a document.
* @deprecated no replacement planned, ECS is no longer a requirement
*/
+ @Deprecated
Document getPage();
/**
@@ -389,6 +392,7 @@ public interface RunData extends Pipelin
* @return true if out is set.
* @deprecated no replacement planned, response writer will not be cached
*/
+ @Deprecated
boolean isOutSet();
/**
@@ -399,6 +403,7 @@ public interface RunData extends Pipelin
* @throws IOException
* @deprecated no replacement planned, response writer will not be cached
*/
+ @Deprecated
PrintWriter getOut()
throws IOException;
@@ -515,14 +520,14 @@ public interface RunData extends Pipelin
*
* @return a hashtable.
*/
- Map getJNDIContexts();
+ Map<String, Context> getJNDIContexts();
/**
* Sets JNDI Contexts.
*
* @param contexts a hashtable.
*/
- void setJNDIContexts(Map contexts);
+ void setJNDIContexts(Map<String, Context> contexts);
/**
* Gets the cached server scheme.
@@ -627,7 +632,8 @@ public interface RunData extends Pipelin
* @return a Map of debug variables.
* @deprecated use {@link #getDebugVariables} instead
*/
- Map getVarDebug();
+ @Deprecated
+ Map<String, Object> getVarDebug();
/**
* Sets a name/value pair in an internal Map that is accessible from the
@@ -644,5 +650,5 @@ public interface RunData extends Pipelin
*
* @return a Map of debug variables.
*/
- Map getDebugVariables();
+ Map<String, Object> getDebugVariables();
}