You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by tv...@apache.org on 2016/12/09 13:20:00 UTC
svn commit: r1773378 [2/2] - in /turbine/core/trunk/src:
java/org/apache/turbine/ java/org/apache/turbine/modules/
java/org/apache/turbine/modules/actions/
java/org/apache/turbine/modules/actions/sessionvalidator/
java/org/apache/turbine/modules/layout...
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/TurbineAssemblerBrokerService.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/TurbineAssemblerBrokerService.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/TurbineAssemblerBrokerService.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/TurbineAssemblerBrokerService.java Fri Dec 9 13:19:59 2016
@@ -75,6 +75,9 @@ public class TurbineAssemblerBrokerServi
* Get a list of AssemblerFactories of a certain type
*
* @param type type of Assembler
+ *
+ * @param <T> the type of the assembler
+ *
* @return list of AssemblerFactories
*/
@SuppressWarnings("unchecked")
@@ -91,7 +94,7 @@ public class TurbineAssemblerBrokerServi
* Utility method to register all factories for a given type.
*
* @param type type of Assembler
- * @throws TurbineException
+ * @throws TurbineException if the factory for the given type could not be registered
*/
private void registerFactories(String type)
throws TurbineException
@@ -133,7 +136,7 @@ public class TurbineAssemblerBrokerServi
* Initializes the AssemblerBroker and loads the AssemblerFactory
* classes registered in TurbineResources.Properties.
*
- * @throws InitializationException
+ * @throws InitializationException if problems occur while registering the factories
*/
@SuppressWarnings("unchecked") // as long as commons-collections does not use generics
@Override
@@ -183,7 +186,11 @@ public class TurbineAssemblerBrokerServi
* Register a new AssemblerFactory
*
* @param factory factory to register
+ *
+ * @param <T> the type of the assembler
+ *
*/
+ @Override
public <T extends Assembler> void registerFactory(AssemblerFactory<T> factory)
{
getFactoryGroup(factory.getManagedClass()).add(factory);
@@ -197,9 +204,13 @@ public class TurbineAssemblerBrokerServi
*
* @param type type of Assembler
* @param name name of the requested Assembler
+ *
+ * @param <T> the type of the assembler
+ *
* @return an Assembler or null
- * @throws TurbineException
+ * @throws TurbineException if the assembler could not be loaded
*/
+ @Override
@SuppressWarnings("unchecked")
public <T extends Assembler> T getAssembler(Class<T> type, String name)
throws TurbineException
@@ -252,8 +263,12 @@ public class TurbineAssemblerBrokerServi
* Get a Loader for the given assembler type
*
* @param type The Type of the Assembler
+ *
+ * @param <T> the type of the assembler
+ *
* @return A Loader instance for the requested type
*/
+ @Override
@SuppressWarnings("unchecked")
public <T extends Assembler> Loader<T> getLoader(Class<T> type)
{
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/intake/IntakeTool.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/intake/IntakeTool.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/intake/IntakeTool.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/intake/IntakeTool.java Fri Dec 9 13:19:59 2016
@@ -256,7 +256,7 @@ public class IntakeTool
/**
* Protected constructor to force use of factory method.
*
- * @param groupName
+ * @param groupName the group name
*/
protected PullHelper(String groupName)
{
@@ -267,7 +267,7 @@ public class IntakeTool
* Populates the object with the default values from the XML File
*
* @return a Group object with the default values
- * @throws IntakeException
+ * @throws IntakeException if getting the group fails
*/
public Group getDefault()
throws IntakeException
@@ -278,9 +278,9 @@ public class IntakeTool
/**
* Calls setKey(key,true)
*
- * @param key
+ * @param key the group key
* @return an Intake Group
- * @throws IntakeException
+ * @throws IntakeException if getting the group fails
*/
public Group setKey(String key)
throws IntakeException
@@ -289,11 +289,12 @@ public class IntakeTool
}
/**
+ * Return the group identified by its key
*
- * @param key
- * @param create
+ * @param key the group key
+ * @param create true if a non-existing group should be created
* @return an Intake Group
- * @throws IntakeException
+ * @throws IntakeException if getting the group fails
*/
public Group setKey(String key, boolean create)
throws IntakeException
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/jsp/TurbineJspService.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/jsp/TurbineJspService.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/jsp/TurbineJspService.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/jsp/TurbineJspService.java Fri Dec 9 13:19:59 2016
@@ -272,7 +272,7 @@ public class TurbineJspService
* required by <a href="http://java.sun.com/products/servlet/2.3/javadoc/javax/servlet/ServletContext.html#getRequestDispatcher(java.lang.String)">
* javax.servlet.RequestDispatcher</a>
*
- * @param template
+ * @param template the name of the template
* @return String
*/
@Override
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/jsp/util/JspNavigation.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/jsp/util/JspNavigation.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/jsp/util/JspNavigation.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/jsp/util/JspNavigation.java Fri Dec 9 13:19:59 2016
@@ -34,9 +34,9 @@ import org.apache.turbine.util.RunData;
* set the navigation template they'd like to place in their templates.<br>
* Here's how it's used in a JSP template:<br>
* <code>
- * <%useBean id="navigation" class="JspNavigation" scope="request"/%>
+ * <%useBean id="navigation" class="JspNavigation" scope="request" %>
* ...
- * <%= navigation.setTemplate("admin_navigation.jsp") %>
+ * <%= navigation.setTemplate("admin_navigation.jsp") %>
* </code>
* @author <a href="john.mcnally@clearink.com">John D. McNally</a>
* @author <a href="mbryson@mont.mindspring.com">Dave Bryson</a>
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/jsp/util/JspScreenPlaceholder.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/jsp/util/JspScreenPlaceholder.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/jsp/util/JspScreenPlaceholder.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/jsp/util/JspScreenPlaceholder.java Fri Dec 9 13:19:59 2016
@@ -36,10 +36,10 @@ import org.apache.turbine.util.RunData;
* place the screen template within the layout.<br>
* Here's how it's used in a JSP template:<br>
* <code>
- * <%useBean id="screen_placeholder" class="JspScreenPlaceholder" scope="request"/%>
+ * <%useBean id="screen_placeholder" class="JspScreenPlaceholder" scope="request" %>
* ...
- * <%= screen_placeholder %>
- *</code>
+ * <%= screen_placeholder %>
+ * </code>
*
* @author <a href="john.mcnally@clearink.com">John D. McNally</a>
* @author <a href="mailto:hps@intermeta.de">Henning P. Schmiedehausen</a>
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/localization/LocalizationTool.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/localization/LocalizationTool.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/localization/LocalizationTool.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/localization/LocalizationTool.java Fri Dec 9 13:19:59 2016
@@ -103,6 +103,8 @@ public class LocalizationTool implements
*
* @param data The inputs passed from {@link #init(Object)}.
* (ignored by this implementation).
+ *
+ * @return the name of the bundle to use
*/
protected String getBundleName(Object data)
{
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/pull/PipelineDataApplicationTool.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/pull/PipelineDataApplicationTool.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/pull/PipelineDataApplicationTool.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/pull/PipelineDataApplicationTool.java Fri Dec 9 13:19:59 2016
@@ -47,7 +47,7 @@ public interface PipelineDataApplication
* <code>tools.per.request.refresh</code> is set to <code>true</code>
* in <code>TurbineResources.properties</code>. You will then be able to
* get a <code>User</code> object from the instance of
- * <code>RunData</object>.
+ * <code>PipelineData</code>.
*
* @param data initialization data
*/
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/pull/RunDataApplicationTool.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/pull/RunDataApplicationTool.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/pull/RunDataApplicationTool.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/pull/RunDataApplicationTool.java Fri Dec 9 13:19:59 2016
@@ -48,7 +48,7 @@ public interface RunDataApplicationTool
* <code>tools.per.request.refresh</code> is set to <code>true</code>
* in <code>TurbineResources.properties</code>. You will then be able to
* get a <code>User</code> object from the instance of
- * <code>RunData</object>.
+ * <code>RunData</code>.
*
* @param data initialization data
*/
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/pull/TurbinePullService.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/pull/TurbinePullService.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/pull/TurbinePullService.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/pull/TurbinePullService.java Fri Dec 9 13:19:59 2016
@@ -48,7 +48,7 @@ import org.apache.velocity.context.Conte
* These are tools that are placed in the context by the service
* These tools will be made available to all your
* templates. You list the tools in the following way:
- * <p>
+ * </p>
* <pre>
* tool.<scope>.<id> = <classname>
*
@@ -76,7 +76,7 @@ import org.apache.velocity.context.Conte
*
* configures the value of "skin" for the "ui" tool.
*
- * Tools are accessible in all templates by the <id> given
+ * Tools are accessible in all templates by the <id> given
* to the tool. So for the above listings the UIManager would
* be available as $ui, the MessageManager as $mm, the TemplateLink
* as $link and the TemplatePageAttributes as $page.
@@ -225,7 +225,7 @@ public class TurbinePullService
/**
* Initialize the pull service
*
- * @exception Exception A problem happened when starting up
+ * @throws Exception A problem happened when starting up
*/
private void initPullService()
throws Exception
@@ -261,7 +261,7 @@ public class TurbinePullService
* tools may call the methods of this service via the
* static facade class TurbinePull.
*
- * @exception Exception A problem happened when starting up
+ * @throws Exception A problem happened when starting up
*/
private void initPullTools()
throws Exception
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/pull/tools/TemplateLink.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/pull/tools/TemplateLink.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/pull/tools/TemplateLink.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/pull/tools/TemplateLink.java Fri Dec 9 13:19:59 2016
@@ -479,18 +479,15 @@ public class TemplateLink
* encoded using HttpServletResponse.encodeUrl(). The resulting
* URL is absolute; it starts with http/https...
*
- * <p>
- * <code><pre>
+ * <pre>
* TemplateURI tui = new TemplateURI (data, "UserScreen");
* tui.addPathInfo("user","jon");
* tui.getAbsoluteLink();
- * </pre></code>
- *
- * The above call to absoluteLink() would return the String:
+ * </pre>
*
+ * The above call to absoluteLink() would return the String:
* <p>
* http://www.server.com/servlets/Turbine/screen/UserScreen/user/jon
- *
* <p>
* After rendering the URI, it clears the
* pathInfo and QueryString portions of the TemplateURI. So you can
@@ -517,18 +514,15 @@ public class TemplateLink
* encoded using HttpServletResponse.encodeUrl(). The resulting
* URL is relative to the webserver root.
*
- * <p>
- * <code><pre>
+ * <pre>
* TemplateURI tui = new TemplateURI (data, "UserScreen");
* tui.addPathInfo("user","jon");
* tui.getRelativeLink();
- * </pre></code>
- *
- * The above call to absoluteLink() would return the String:
+ * </pre>
*
+ * The above call to absoluteLink() would return the String:
* <p>
* /servlets/Turbine/screen/UserScreen/user/jon
- *
* <p>
* After rendering the URI, it clears the
* pathInfo and QueryString portions of the TemplateURI. So you can
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/pull/util/DateFormatter.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/pull/util/DateFormatter.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/pull/util/DateFormatter.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/pull/util/DateFormatter.java Fri Dec 9 13:19:59 2016
@@ -53,9 +53,10 @@ public class DateFormatter
* Initialize the application tool. The data parameter holds a different
* type depending on how the tool is being instantiated:
* <ul>
- * <li>For global tools data will be null
- * <li>For request tools data will be of type RunData
- * <li>For session and persistent tools data will be of type User
+ * <li>For global tools data will be null</li>
+ * <li>For request tools data will be of type RunData</li>
+ * <li>For session and persistent tools data will be of type User</li>
+ * </ul>
*
* @param data initialization data
*/
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=1773378&r1=1773377&r2=1773378&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 Fri Dec 9 13:19:59 2016
@@ -164,6 +164,9 @@ public class DefaultTurbineRunData
* not exist, it returns null.
*
* @param session An HttpSession.
+ *
+ * @param <T> a type extending {@link User}
+ *
* @return A User.
*/
public static <T extends User> T getUserFromSession(HttpSession session)
@@ -818,6 +821,8 @@ public class DefaultTurbineRunData
/**
* Gets the user.
*
+ * @param <T> a type extending {@link User}
+ *
* @return a user.
*/
@Override
@@ -881,7 +886,7 @@ public class DefaultTurbineRunData
* will set the print writer via the response.
*
* @return a print writer.
- * @throws IOException
+ * @throws IOException on failure getting the PrintWriter
*/
@Override
public PrintWriter getOut()
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/schedule/AbstractJobEntry.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/schedule/AbstractJobEntry.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/schedule/AbstractJobEntry.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/schedule/AbstractJobEntry.java Fri Dec 9 13:19:59 2016
@@ -89,7 +89,7 @@ public abstract class AbstractJobEntry i
* @param wd Value for entry "week days".
* @param day_mo Value for entry "month days".
* @param task Task to execute.
- * @exception TurbineException a generic exception.
+ * @throws TurbineException a generic exception.
*/
public AbstractJobEntry(int sec,
int min,
@@ -201,7 +201,7 @@ public abstract class AbstractJobEntry i
* 3. Calculate the diff in time between the current time and the
* next run time.<br>
*
- * @exception TurbineException a generic exception.
+ * @throws TurbineException a generic exception.
*/
@Override
public void calcRunTime()
@@ -299,7 +299,7 @@ public abstract class AbstractJobEntry i
*
* @return A number specifying the type of schedule. See
* calcRunTime().
- * @exception TurbineException a generic exception.
+ * @throws TurbineException a generic exception.
*/
private ScheduleType evaluateJobType()
throws TurbineException
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/schedule/AbstractSchedulerService.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/schedule/AbstractSchedulerService.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/schedule/AbstractSchedulerService.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/schedule/AbstractSchedulerService.java Fri Dec 9 13:19:59 2016
@@ -92,7 +92,7 @@ public abstract class AbstractSchedulerS
* Load all jobs from configuration storage
*
* @return the list of pre-configured jobs
- * @throws TurbineException
+ * @throws TurbineException if jobs could not be loaded
*/
protected abstract List<? extends JobEntry> loadJobs() throws TurbineException;
@@ -122,7 +122,7 @@ public abstract class AbstractSchedulerS
* @param oid
* The int id for the job.
* @return A JobEntry.
- * @exception TurbineException
+ * @throws TurbineException
* job could not be retrieved.
*/
@Override
@@ -147,7 +147,7 @@ public abstract class AbstractSchedulerS
*
* @param je
* A JobEntry with the job to remove.
- * @exception TurbineException
+ * @throws TurbineException
* job could not be removed
*/
@Override
@@ -178,7 +178,7 @@ public abstract class AbstractSchedulerS
/**
* Sets the enabled status of the scheduler
*
- * @param enabled
+ * @param enabled true to enable the scheduler
*
*/
protected void setEnabled(boolean enabled)
@@ -277,7 +277,7 @@ public abstract class AbstractSchedulerS
* Return the next Job to execute, or null if thread is interrupted.
*
* @return A JobEntry.
- * @exception TurbineException
+ * @throws TurbineException
* a generic exception.
*/
protected synchronized JobEntry nextJob() throws TurbineException
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/schedule/JobEntry.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/schedule/JobEntry.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/schedule/JobEntry.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/schedule/JobEntry.java Fri Dec 9 13:19:59 2016
@@ -118,7 +118,7 @@ public interface JobEntry extends Compar
* 3. Calculate the diff in time between the current time and the next run
* time. <br>
*
- * @exception TurbineException
+ * @throws TurbineException
* a generic exception.
*/
void calcRunTime() throws TurbineException;
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/schedule/JobEntryNonPersistent.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/schedule/JobEntryNonPersistent.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/schedule/JobEntryNonPersistent.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/schedule/JobEntryNonPersistent.java Fri Dec 9 13:19:59 2016
@@ -74,7 +74,7 @@ public class JobEntryNonPersistent exten
* @param wd Value for entry "week days".
* @param day_mo Value for entry "month days".
* @param task Task to execute.
- * @exception TurbineException a generic exception.
+ * @throws TurbineException a generic exception.
*/
public JobEntryNonPersistent(int sec,
int min,
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=1773378&r1=1773377&r2=1773378&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 Fri Dec 9 13:19:59 2016
@@ -166,7 +166,7 @@ public class JobQueue<J extends JobEntry
* Update the job for its next run time.
*
* @param je A JobEntry to be updated.
- * @exception TurbineException a generic exception.
+ * @throws TurbineException a generic exception.
*/
public synchronized void updateQueue(J je)
throws TurbineException
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/schedule/QuartzSchedulerService.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/schedule/QuartzSchedulerService.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/schedule/QuartzSchedulerService.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/schedule/QuartzSchedulerService.java Fri Dec 9 13:19:59 2016
@@ -169,7 +169,7 @@ public class QuartzSchedulerService
*
* @param oid The int id for the job.
* @return A JobEntry.
- * @exception TurbineException job could not be retrieved.
+ * @throws TurbineException job could not be retrieved.
*/
@Override
public JobEntry getJob(int oid)
@@ -212,7 +212,7 @@ public class QuartzSchedulerService
* Remove a job from the queue.
*
* @param je A JobEntry with the job to remove.
- * @exception TurbineException job could not be removed
+ * @throws TurbineException job could not be removed
*/
@Override
public void removeJob(JobEntry je)
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=1773378&r1=1773377&r2=1773378&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 Fri Dec 9 13:19:59 2016
@@ -76,7 +76,7 @@ public interface ScheduleService
* @param task Task to execute.
*
* @return A JobEntry.
- * @exception TurbineException could not create job
+ * @throws TurbineException could not create job
*/
JobEntry newJob(int sec,
int min,
@@ -90,7 +90,7 @@ public interface ScheduleService
*
* @param oid The int id for the job.
* @return A JobEntry.
- * @exception TurbineException could not retrieve job
+ * @throws TurbineException could not retrieve job
*/
JobEntry getJob(int oid)
throws TurbineException;
@@ -117,7 +117,7 @@ public interface ScheduleService
* Remove a job from the queue.
*
* @param je A JobEntry with the job to remove.
- * @exception TurbineException job could not be removed
+ * @throws TurbineException job could not be removed
*/
void removeJob(JobEntry je)
throws TurbineException;
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/schedule/TorqueSchedulerService.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/schedule/TorqueSchedulerService.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/schedule/TorqueSchedulerService.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/schedule/TorqueSchedulerService.java Fri Dec 9 13:19:59 2016
@@ -87,7 +87,7 @@ public class TorqueSchedulerService exte
* @param oid
* The int id for the job.
* @return A JobEntry.
- * @exception TurbineException
+ * @throws TurbineException
* job could not be retrieved.
*/
@Override
@@ -109,7 +109,7 @@ public class TorqueSchedulerService exte
*
* @param je
* A JobEntry with the job to remove.
- * @exception TurbineException
+ * @throws TurbineException
* job could not be removed
*/
@Override
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=1773378&r1=1773377&r2=1773378&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 Fri Dec 9 13:19:59 2016
@@ -129,7 +129,7 @@ public class TurbineNonPersistentSchedul
*
* @param oid The int id for the job.
* @return A JobEntry.
- * @exception TurbineException could not retrieve job
+ * @throws TurbineException could not retrieve job
*/
@Override
public JobEntry getJob(int oid)
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/security/DefaultSecurityService.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/security/DefaultSecurityService.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/security/DefaultSecurityService.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/security/DefaultSecurityService.java Fri Dec 9 13:19:59 2016
@@ -459,9 +459,9 @@ public class DefaultSecurityService
* LastLogin, AccessCounter, persistent pull tools, and any data stored
* in the permData hashmap that is not mapped to a column will be saved.
*
- * @exception UnknownEntityException if the user's account does not
+ * @throws UnknownEntityException if the user's account does not
* exist in the database.
- * @exception DataBackendException if there is a problem accessing the
+ * @throws DataBackendException if there is a problem accessing the
* storage.
*/
@Override
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/security/DefaultUserManager.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/security/DefaultUserManager.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/security/DefaultUserManager.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/security/DefaultUserManager.java Fri Dec 9 13:19:59 2016
@@ -205,9 +205,9 @@ public class DefaultUserManager implemen
*
* @param username the name of the user.
* @return an User object.
- * @exception UnknownEntityException if the user's record does not
+ * @throws UnknownEntityException if the user's record does not
* exist in the database.
- * @exception DataBackendException if there is a problem accessing the
+ * @throws DataBackendException if there is a problem accessing the
* storage.
*/
@Override
@@ -257,11 +257,11 @@ public class DefaultUserManager implemen
* @param username the name of the user.
* @param password the user supplied password.
* @return an User object.
- * @exception PasswordMismatchException if the supplied password was
+ * @throws PasswordMismatchException if the supplied password was
* incorrect.
- * @exception UnknownEntityException if the user's record does not
+ * @throws UnknownEntityException if the user's record does not
* exist in the database.
- * @exception DataBackendException if there is a problem accessing the
+ * @throws DataBackendException if there is a problem accessing the
* storage.
*/
@Override
@@ -278,9 +278,9 @@ public class DefaultUserManager implemen
* required to exist in the storage.
*
* @param user an User object to store.
- * @exception UnknownEntityException if the user's record does not
+ * @throws UnknownEntityException if the user's record does not
* exist in the database.
- * @exception DataBackendException if there is a problem accessing the
+ * @throws DataBackendException if there is a problem accessing the
* storage.
*/
@Override
@@ -306,9 +306,9 @@ public class DefaultUserManager implemen
* LastLogin, AccessCounter, persistent pull tools, and any data stored
* in the permData hashtable that is not mapped to a column will be saved.
*
- * @exception UnknownEntityException if the user's account does not
+ * @throws UnknownEntityException if the user's account does not
* exist in the database.
- * @exception DataBackendException if there is a problem accessing the
+ * @throws DataBackendException if there is a problem accessing the
* storage.
*/
@Override
@@ -325,11 +325,11 @@ public class DefaultUserManager implemen
*
* @param user an User object to authenticate.
* @param password the user supplied password.
- * @exception PasswordMismatchException if the supplied password was
+ * @throws PasswordMismatchException if the supplied password was
* incorrect.
- * @exception UnknownEntityException if the user's record does not
+ * @throws UnknownEntityException if the user's record does not
* exist in the database.
- * @exception DataBackendException if there is a problem accessing the
+ * @throws DataBackendException if there is a problem accessing the
* storage.
*/
@Override
@@ -376,11 +376,11 @@ public class DefaultUserManager implemen
* @param user an User to change password for.
* @param oldPassword the current password supplied by the user.
* @param newPassword the current password requested by the user.
- * @exception PasswordMismatchException if the supplied password was
+ * @throws PasswordMismatchException if the supplied password was
* incorrect.
- * @exception UnknownEntityException if the user's record does not
+ * @throws UnknownEntityException if the user's record does not
* exist in the database.
- * @exception DataBackendException if there is a problem accessing the
+ * @throws DataBackendException if there is a problem accessing the
* storage.
*/
@Override
@@ -404,9 +404,9 @@ public class DefaultUserManager implemen
*
* @param user an User to change password for.
* @param password the new password.
- * @exception UnknownEntityException if the user's record does not
+ * @throws UnknownEntityException if the user's record does not
* exist in the database.
- * @exception DataBackendException if there is a problem accessing the
+ * @throws DataBackendException if there is a problem accessing the
* storage.
*/
@Override
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/security/SecurityService.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/security/SecurityService.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/security/SecurityService.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/security/SecurityService.java Fri Dec 9 13:19:59 2016
@@ -288,9 +288,9 @@ public interface SecurityService
*
* @param user the user object
*
- * @exception UnknownEntityException if the user's account does not
+ * @throws UnknownEntityException if the user's account does not
* exist in the database.
- * @exception DataBackendException if there is a problem accessing the
+ * @throws DataBackendException if there is a problem accessing the
* storage.
*/
void saveOnSessionUnbind(User user)
@@ -333,11 +333,11 @@ public interface SecurityService
* @param user an User to change password for.
* @param oldPassword the current password supplied by the user.
* @param newPassword the current password requested by the user.
- * @exception PasswordMismatchException if the supplied password was
+ * @throws PasswordMismatchException if the supplied password was
* incorrect.
- * @exception UnknownEntityException if the user's record does not
+ * @throws UnknownEntityException if the user's record does not
* exist in the database.
- * @exception DataBackendException if there is a problem accessing the
+ * @throws DataBackendException if there is a problem accessing the
* storage.
*/
void changePassword(User user, String oldPassword,
@@ -355,9 +355,9 @@ public interface SecurityService
*
* @param user an User to change password for.
* @param password the new password.
- * @exception UnknownEntityException if the user's record does not
+ * @throws UnknownEntityException if the user's record does not
* exist in the database.
- * @exception DataBackendException if there is a problem accessing the
+ * @throws DataBackendException if there is a problem accessing the
* storage.
*/
void forcePassword(User user, String password)
@@ -503,9 +503,9 @@ public interface SecurityService
*
* @return an object representing the Group with specified name.
*
- * @exception UnknownEntityException if the permission does not
+ * @throws UnknownEntityException if the permission does not
* exist in the database.
- * @exception DataBackendException if there is a problem accessing the
+ * @throws DataBackendException if there is a problem accessing the
* storage.
*/
<G extends Group> G getGroupById(int id)
@@ -531,9 +531,9 @@ public interface SecurityService
*
* @return an object representing the Role with specified name.
*
- * @exception UnknownEntityException if the permission does not
+ * @throws UnknownEntityException if the permission does not
* exist in the database.
- * @exception DataBackendException if there is a problem accessing the
+ * @throws DataBackendException if there is a problem accessing the
* storage.
*/
<R extends Role> R getRoleById(int id)
@@ -559,9 +559,9 @@ public interface SecurityService
*
* @return an object representing the Permission with specified name.
*
- * @exception UnknownEntityException if the permission does not
+ * @throws UnknownEntityException if the permission does not
* exist in the database.
- * @exception DataBackendException if there is a problem accessing the
+ * @throws DataBackendException if there is a problem accessing the
* storage.
*/
<P extends Permission> P getPermissionById(int id)
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/security/UserManager.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/security/UserManager.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/security/UserManager.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/security/UserManager.java Fri Dec 9 13:19:59 2016
@@ -152,9 +152,9 @@ public interface UserManager
*
* @param user the user in the session
*
- * @exception UnknownEntityException if the user's account does not
+ * @throws UnknownEntityException if the user's account does not
* exist in the database.
- * @exception DataBackendException if there is a problem accessing the
+ * @throws DataBackendException if there is a problem accessing the
* storage.
*/
void saveOnSessionUnbind(User user)
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/security/passive/PassiveUserManager.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/security/passive/PassiveUserManager.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/security/passive/PassiveUserManager.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/security/passive/PassiveUserManager.java Fri Dec 9 13:19:59 2016
@@ -94,9 +94,9 @@ public class PassiveUserManager implemen
*
* @param username the name of the user.
* @return an User object.
- * @exception UnknownEntityException if the user's record does not
+ * @throws UnknownEntityException if the user's record does not
* exist in the database.
- * @exception DataBackendException if there is a problem accessing the
+ * @throws DataBackendException if there is a problem accessing the
* storage.
*/
@Override
@@ -136,11 +136,11 @@ public class PassiveUserManager implemen
* @param username the name of the user.
* @param password the user supplied password.
* @return an User object.
- * @exception PasswordMismatchException if the supplied password was
+ * @throws PasswordMismatchException if the supplied password was
* incorrect.
- * @exception UnknownEntityException if the user's record does not
+ * @throws UnknownEntityException if the user's record does not
* exist in the database.
- * @exception DataBackendException if there is a problem accessing the
+ * @throws DataBackendException if there is a problem accessing the
* storage.
*/
@Override
@@ -156,9 +156,9 @@ public class PassiveUserManager implemen
* required to exist in the storage.
*
* @param user an User object to store.
- * @exception UnknownEntityException if the user's record does not
+ * @throws UnknownEntityException if the user's record does not
* exist in the database.
- * @exception DataBackendException if there is a problem accessing the
+ * @throws DataBackendException if there is a problem accessing the
* storage.
*/
@Override
@@ -175,9 +175,9 @@ public class PassiveUserManager implemen
* LastLogin, AccessCounter, persistent pull tools, and any data stored
* in the permData hashmap that is not mapped to a column will be saved.
*
- * @exception UnknownEntityException if the user's account does not
+ * @throws UnknownEntityException if the user's account does not
* exist in the database.
- * @exception DataBackendException if there is a problem accessing the
+ * @throws DataBackendException if there is a problem accessing the
* storage.
*/
@Override
@@ -194,11 +194,11 @@ public class PassiveUserManager implemen
*
* @param user an User object to authenticate.
* @param password the user supplied password.
- * @exception PasswordMismatchException if the supplied password was
+ * @throws PasswordMismatchException if the supplied password was
* incorrect.
- * @exception UnknownEntityException if the user's record does not
+ * @throws UnknownEntityException if the user's record does not
* exist in the database.
- * @exception DataBackendException if there is a problem accessing the
+ * @throws DataBackendException if there is a problem accessing the
* storage.
*/
@Override
@@ -246,11 +246,11 @@ public class PassiveUserManager implemen
* @param user an User to change password for.
* @param oldPassword the current password supplied by the user.
* @param newPassword the current password requested by the user.
- * @exception PasswordMismatchException if the supplied password was
+ * @throws PasswordMismatchException if the supplied password was
* incorrect.
- * @exception UnknownEntityException if the user's record does not
+ * @throws UnknownEntityException if the user's record does not
* exist in the database.
- * @exception DataBackendException if there is a problem accessing the
+ * @throws DataBackendException if there is a problem accessing the
* storage.
*/
@Override
@@ -272,9 +272,9 @@ public class PassiveUserManager implemen
*
* @param user an User to change password for.
* @param password the new password.
- * @exception UnknownEntityException if the user's record does not
+ * @throws UnknownEntityException if the user's record does not
* exist in the database.
- * @exception DataBackendException if there is a problem accessing the
+ * @throws DataBackendException if there is a problem accessing the
* storage.
*/
@Override
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=1773378&r1=1773377&r2=1773378&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 Fri Dec 9 13:19:59 2016
@@ -35,15 +35,15 @@ import org.apache.turbine.services.Turbi
* via your web application's <code>web.xml</code> deployment
* descriptor as follows for the container to call it:
*
- * <blockquote><code><pre>
+ * <pre>
* <listener>
* <listener-class>
* org.apache.turbine.session.SessionListener
* </listener-class>
* </listener>
- * </pre></code></blockquote>
+ * </pre>
*
- * <code><listener></code> elemements can occur between
+ * <code><listener></code> elements can occur between
* <code><context-param></code> and <code><servlet></code>
* elements in your deployment descriptor.
*
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=1773378&r1=1773377&r2=1773378&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 Fri Dec 9 13:19:59 2016
@@ -38,13 +38,13 @@ import org.apache.turbine.services.Turbi
* be configured via your web application's <code>web.xml</code>
* deployment descriptor as follows:
*
- * <blockquote><code><pre>
+ * <pre>
* <listener>
* <listener-class>
* org.apache.turbine.session.SessionListener
* </listener-class>
* </listener>
- * </pre></code></blockquote>
+ * </pre>
*
* @author <a href="mailto:quintonm@bellsouth.net">Quinton McCombs</a>
* @author <a href="mailto:dlr@collab.net">Daniel Rall</a>
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/template/TemplateService.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/template/TemplateService.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/template/TemplateService.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/template/TemplateService.java Fri Dec 9 13:19:59 2016
@@ -212,7 +212,7 @@ public interface TemplateService
*
* @param template The screen template name.
* @return The found screen module name.
- * @exception Exception, a generic exception.
+ * @throws Exception a generic exception.
*/
String getScreenName(String template)
throws Exception;
@@ -223,7 +223,7 @@ public interface TemplateService
*
* @param template The layout template name.
* @return The found layout module name.
- * @exception Exception, a generic exception.
+ * @throws Exception a generic exception.
*/
String getLayoutName(String template)
throws Exception;
@@ -234,7 +234,7 @@ public interface TemplateService
*
* @param template The navigation template name.
* @return The found navigation module name.
- * @exception Exception, a generic exception.
+ * @throws Exception a generic exception.
*/
String getNavigationName(String template)
throws Exception;
@@ -245,7 +245,7 @@ public interface TemplateService
*
* @param template The template name parameter.
* @return The found screen template name.
- * @exception Exception, a generic exception.
+ * @throws Exception a generic exception.
*/
String getScreenTemplateName(String template)
throws Exception;
@@ -256,7 +256,7 @@ public interface TemplateService
*
* @param template The template name parameter.
* @return The found screen template name.
- * @exception Exception, a generic exception.
+ * @throws Exception a generic exception.
*/
String getLayoutTemplateName(String template)
throws Exception;
@@ -267,7 +267,7 @@ public interface TemplateService
*
* @param template The template name parameter.
* @return The found navigation template name.
- * @exception Exception, a generic exception.
+ * @throws Exception a generic exception.
*/
String getNavigationTemplateName(String template)
throws Exception;
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/template/TurbineTemplateService.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/template/TurbineTemplateService.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/template/TurbineTemplateService.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/template/TurbineTemplateService.java Fri Dec 9 13:19:59 2016
@@ -97,24 +97,24 @@ import org.apache.turbine.util.uri.URICo
* this template.
*
* If you request e.g. the template screen
- *
+ * <pre>
* about,directions,Driving.vm
- *
+ * </pre>
* then the following class names are searched (on the module search
* path):
- *
+ * <pre>
* 1. about.directions.Driving <- direct matching the template to the class name
* 2. about.directions.Default <- matching the package, class name is Default
* 3. about.Default <- stepping up in the package hierarchy, looking for Default
* 4. Default <- Class called "Default" without package
* 5. VelocityScreen <- The class configured by the Service (VelocityService) to
- *
+ * </pre>
* And if you have the following module packages configured:
- *
+ * <pre>
* module.packages = org.apache.turbine.modules, com.mycorp.modules
- *
+ * </pre>
* then the class loader will look for
- *
+ * <pre>
* org.apache.turbine.modules.screens.about.directions.Driving
* com.mycorp.modules.screens.about.directions.Driving
* org.apache.turbine.modules.screens.about.directions.Default
@@ -125,41 +125,43 @@ import org.apache.turbine.util.uri.URICo
* com.mycorp.modules.screens.Default
* org.apache.turbine.modules.screens.VelocityScreen
* com.mycorp.modules.screens.VelocityScreen
- *
+ * </pre>
* Most of the times, you don't have any backing Java class for a
* template screen, so the first match will be
* org.apache.turbine.modules.screens.VelocityScreen
* which then renders your screen.
- *
+ * <p>
* Please note, that your Screen Template (Driving.vm) must exist!
* If it does not exist, the Template Service will report an error.
- *
+ * <p>
* Once the screen is found, the template service will look for
* the Layout and Navigation templates of your Screen. Here, the
* template service looks for matching template names!
- *
- * Consider our example: about,directions,Driving.vm (Screen Name)
- *
+ * <p>
+ * Consider our example:
+ * <pre>
+ * about,directions,Driving.vm (Screen Name)
+ * </pre>
* Now the template service will look for the following Navigation
* and Layout templates:
- *
+ * <pre>
* 1. about,directions,Driving.vm <- exact match
* 2. about,directions,Default.vm <- package match, Default name
* 3. about,Default.vm <- stepping up in the hierarchy
* 4. Default.vm <- The name configured as default.layout.template
* in the Velocity service.
- *
+ * </pre>
* And now Hennings' two golden rules for using templates:
- *
+ * <p>
* Many examples and docs from older Turbine code show template pathes
* with a slashes. Repeat after me: "TEMPLATE NAMES NEVER CONTAIN SLASHES!"
- *
+ * <p>
* Many examples and docs from older Turbine code show templates that start
* with "/". This is not only a violation of the rule above but actively breaks
* things like loading templates from a jar with the velocity jar loader. Repeat
* after me: "TEMPLATE NAMES ARE NOT PATHES. THEY'RE NOT ABSOLUTE AND HAVE NO
* LEADING /".
- *
+ * <p>
* If you now wonder how a template name is mapped to a file name: This is
* scope of the templating engine. Velocity e.g. has this wonderful option to
* load templates from jar archives. There is no single file but you tell
@@ -222,8 +224,9 @@ public class TurbineTemplateService
* The default file extension used as a registry key when a
* template's file extension cannot be determined.
*
- * @deprecated. Use TemplateService.DEFAULT_EXTENSION_VALUE.
+ * @deprecated Use TemplateService.DEFAULT_EXTENSION_VALUE.
*/
+ @Deprecated
protected static final String NO_FILE_EXT = TemplateService.DEFAULT_EXTENSION_VALUE;
@@ -262,7 +265,7 @@ public class TurbineTemplateService
/**
* Called the first time the Service is used.
*
- * @exception InitializationException Something went wrong when
+ * @throws InitializationException Something went wrong when
* setting up the Template Service.
*/
@Override
@@ -528,7 +531,7 @@ public class TurbineTemplateService
*
* @param template The screen template name.
* @return The found screen module name.
- * @exception Exception, a generic exception.
+ * @throws Exception a generic exception.
*/
@Override
public String getScreenName(String template)
@@ -543,7 +546,7 @@ public class TurbineTemplateService
*
* @param template The layout template name.
* @return The found layout module name.
- * @exception Exception, a generic exception.
+ * @throws Exception a generic exception.
*/
@Override
public String getLayoutName(String template)
@@ -558,7 +561,7 @@ public class TurbineTemplateService
*
* @param template The navigation template name.
* @return The found navigation module name.
- * @exception Exception, a generic exception.
+ * @throws Exception a generic exception.
*/
@Override
public String getNavigationName(String template)
@@ -574,7 +577,7 @@ public class TurbineTemplateService
*
* @param template The template name parameter.
* @return The found screen template name.
- * @exception Exception, a generic exception.
+ * @throws Exception a generic exception.
*/
@Override
public String getScreenTemplateName(String template)
@@ -589,7 +592,7 @@ public class TurbineTemplateService
*
* @param template The template name parameter.
* @return The found screen template name.
- * @exception Exception, a generic exception.
+ * @throws Exception a generic exception.
*/
@Override
public String getLayoutTemplateName(String template)
@@ -605,7 +608,7 @@ public class TurbineTemplateService
*
* @param template The template name parameter.
* @return The found navigation template name.
- * @exception Exception, a generic exception.
+ * @throws Exception a generic exception.
*/
@Override
public String getNavigationTemplateName(String template)
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/DirectMapper.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/DirectMapper.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/DirectMapper.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/DirectMapper.java Fri Dec 9 13:19:59 2016
@@ -48,7 +48,7 @@ public class DirectMapper
/**
* Strip off a possible extension, replace all "," with "."
*
- * about,directions,Driving.vm --> about.directions.Driving
+ * about,directions,Driving.vm --< about.directions.Driving
*
* @param template The template name.
* @return A class name for the given template.
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/velocity/TurbineVelocityService.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/velocity/TurbineVelocityService.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/velocity/TurbineVelocityService.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/velocity/TurbineVelocityService.java Fri Dec 9 13:19:59 2016
@@ -468,7 +468,7 @@ public class TurbineVelocityService
* @param filename The file name of the unrenderable template.
* @param e The error.
*
- * @exception TurbineException Thrown every time. Adds additional
+ * @throws TurbineException Thrown every time. Adds additional
* information to <code>e</code>.
*/
private static final void renderingError(String filename, Exception e)
@@ -483,7 +483,7 @@ public class TurbineVelocityService
* Setup the velocity runtime by using a subset of the
* Turbine configuration which relates to velocity.
*
- * @exception Exception An Error occurred.
+ * @throws Exception An Error occurred.
*/
private synchronized void initVelocity()
throws Exception
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/velocity/VelocityService.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/velocity/VelocityService.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/velocity/VelocityService.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/velocity/VelocityService.java Fri Dec 9 13:19:59 2016
@@ -70,7 +70,7 @@ public interface VelocityService
* @param context A Context.
* @param template A String with the filename of the template.
* @return The process template as a String.
- * @exception Exception a generic exception.
+ * @throws Exception a generic exception.
*/
String handleRequest(Context context, String template)
throws Exception;
Modified: turbine/core/trunk/src/java/org/apache/turbine/util/InputFilterUtils.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/InputFilterUtils.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/util/InputFilterUtils.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/util/InputFilterUtils.java Fri Dec 9 13:19:59 2016
@@ -27,7 +27,6 @@ import org.apache.commons.lang.StringUti
/**
* Some filter methods that have been orphaned in the Screen class.
*
- *
* @author <a href="mailto:mbryson@mont.mindspring.com">Dave Bryson</a>
* @author <a href="mailto:hps@intermeta.de">Henning P. Schmiedehausen</a>
* @version $Id$
@@ -38,7 +37,7 @@ public abstract class InputFilterUtils
/**
* This function can/should be used in any screen that will output
* User entered text. This will help prevent users from entering
- * html (<SCRIPT>) tags that will get executed by the browser.
+ * html (<SCRIPT>) tags that will get executed by the browser.
*
* @param s The string to prepare.
* @return A string with the input already prepared.
@@ -51,7 +50,7 @@ public abstract class InputFilterUtils
/**
* This function can/should be used in any screen that will output
* User entered text. This will help prevent users from entering
- * html (<SCRIPT>) tags that will get executed by the browser.
+ * html (<SCRIPT>) tags that will get executed by the browser.
*
* @param s The string to prepare.
* @return A string with the input already prepared.
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=1773378&r1=1773377&r2=1773378&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 Fri Dec 9 13:19:59 2016
@@ -25,7 +25,7 @@ public abstract class ObjectUtils
*
* @return A byte[] with the converted Map.
*
- * @exception Exception A generic exception.
+ * @throws Exception A generic exception.
*/
public static byte[] serializeMap(Map<String, Object> map)
throws Exception
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=1773378&r1=1773377&r2=1773378&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 Fri Dec 9 13:19:59 2016
@@ -109,6 +109,8 @@ public interface RunData extends Pipelin
* Gets the access control list.
*
* @return the access control list.
+ *
+ * @param <A> a type extending {@link AccessControlList}
*/
<A extends AccessControlList> A getACL();
@@ -324,6 +326,8 @@ public interface RunData extends Pipelin
/**
* Gets the user.
*
+ * @param <T> a type extending {@link User}
+ *
* @return a user.
*/
<T extends User> T getUser();
@@ -332,6 +336,8 @@ public interface RunData extends Pipelin
* Sets the user.
*
* @param user a user.
+ *
+ * @param <T> a type extending {@link User}
*/
<T extends User> void setUser(T user);
@@ -340,6 +346,8 @@ public interface RunData extends Pipelin
* not exist, it returns null.
*
* @return a user.
+ *
+ * @param <T> a type extending {@link User}
*/
<T extends User> T getUserFromSession();
@@ -364,7 +372,7 @@ public interface RunData extends Pipelin
* will set the print writer via the response.
*
* @return a print writer.
- * @throws IOException
+ * @throws IOException on failure getting the PrintWriter
*/
PrintWriter getOut()
throws IOException;
Modified: turbine/core/trunk/src/java/org/apache/turbine/util/SecurityCheck.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/SecurityCheck.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/util/SecurityCheck.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/util/SecurityCheck.java Fri Dec 9 13:19:59 2016
@@ -35,12 +35,12 @@ import org.apache.turbine.services.Turbi
*
* Sample usage:<br>
*
- * <pre><code>
+ * <pre>
* SecurityCheck mycheck =
* new SecurityCheck(data, "Unauthorized to do this!", "WrongPermission");
* if (!mycheck.hasPermission("add_user");
* return;
- *</code></pre>
+ *</pre>
*
* @author <a href="mailto:mbryson@mindspring.com">Dave Bryson</a>
* @author <a href="jh@byteaction.de">Jürgen Hoffmann</a>
@@ -104,7 +104,7 @@ public class SecurityCheck
*
* @param role A Role.
* @return True if the user has this role.
- * @exception Exception, a generic exception.
+ * @throws Exception a generic exception.
*/
public boolean hasRole(Role role)
throws Exception
@@ -130,7 +130,7 @@ public class SecurityCheck
* @param role
* A String.
* @return True if the user has this role.
- * @exception Exception,
+ * @throws Exception
* a generic exception.
*/
public boolean hasRole(String role) throws Exception
@@ -164,7 +164,7 @@ public class SecurityCheck
*
* @param permission A Permission.
* @return True if the user has this permission.
- * @exception Exception, a generic exception.
+ * @throws Exception a generic exception.
*/
public boolean hasPermission(Permission permission)
throws Exception
@@ -195,7 +195,7 @@ public class SecurityCheck
* @param permission
* A String.
* @return True if the user has this permission.
- * @exception Exception,
+ * @throws Exception
* a generic exception.
*/
public boolean hasPermission(String permission)
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=1773378&r1=1773377&r2=1773378&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 Fri Dec 9 13:19:59 2016
@@ -51,9 +51,9 @@ import org.apache.turbine.Turbine;
* If you need to use Turbine outside of a servlet container, you can
* use this class for initialization of the Turbine servlet.
* <p>
- * <blockquote><code><pre>
+ * <pre>
* TurbineConfig config = new TurbineConfig(".", "conf/TurbineResources.properties");
- * </pre></code></blockquote>
+ * </pre>
* <p>
* All paths referenced in TurbineResources.properties and the path to
* the properties file itself (the second argument) will be resolved
@@ -342,7 +342,7 @@ public class TurbineConfig
*
* @param s the path to the resource
* @return a URL pointing to the resource
- * @exception MalformedURLException
+ * @throws MalformedURLException
*/
@Override
public URL getResource(String s)
Modified: turbine/core/trunk/src/java/org/apache/turbine/util/TurbineException.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/TurbineException.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/util/TurbineException.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/util/TurbineException.java Fri Dec 9 13:19:59 2016
@@ -34,7 +34,7 @@ package org.apache.turbine.util;
* the information about all exceptions thrown and caught on
* the way.
* <p> Running the following program
- * <p><blockquote><pre>
+ * <p><pre>
* 1 import org.apache.turbine.util.TurbineException;
* 2
* 3 public class Test {
@@ -66,9 +66,9 @@ package org.apache.turbine.util;
* 29 throw new Exception("baz");
* 30 }
* 31 }
- * </pre></blockquote>
+ * </pre>
* <p>Yields the following stacktrace:
- * <p><blockquote><pre>
+ * <p><pre>
* java.lang.Exception: baz: bar: foo
* at Test.c(Test.java:29)
* at Test.b(Test.java:22)
@@ -78,7 +78,7 @@ package org.apache.turbine.util;
* rethrown as TurbineException: foo
* at Test.a(Test.java:16)
* at Test.main(Test.java:6)
- * </pre></blockquote><br>
+ * </pre><br>
*
* @author <a href="mailto:Rafal.Krzewski@e-point.pl">Rafal Krzewski</a>
* @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
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=1773378&r1=1773377&r2=1773378&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 Fri Dec 9 13:19:59 2016
@@ -29,9 +29,9 @@ import java.util.Map;
* If you need to use Turbine outside of a servlet container, you can
* use this class for initialization of the Turbine servlet.
* <p>
- * <blockquote><code><pre>
+ * <pre>
* TurbineXmlConfig config = new TurbineXmlConfig(".", "conf/TurbineResources.properties");
- * </pre></code></blockquote>
+ * </pre>
* <p>
* All paths referenced in TurbineResources.properties and the path to
* the properties file itself (the second argument) will be resolved
Modified: turbine/core/trunk/src/java/org/apache/turbine/util/template/TemplateSecurityCheck.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/template/TemplateSecurityCheck.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/util/template/TemplateSecurityCheck.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/util/template/TemplateSecurityCheck.java Fri Dec 9 13:19:59 2016
@@ -35,14 +35,14 @@ import org.apache.turbine.util.RunData;
* Utility class to help check for proper authorization when using
* template screens. Sample usages:
*
- * <p><pre><code>
+ * <p><pre>
* TemplateSecurityCheck secCheck = new TemplateSecurityCheck( data );
* secCheck.setMessage( "Sorry, you do not have permission to " +
* "access this area." );
* secCheck.setFailTemplate("login.wm");
* if ( !secCheck.hasRole("ADMIN") )
* return;
- * </pre></code>
+ * </pre>
*
* @author <a href="mbryson@mont.mindspring.com">Dave Bryson</a>
* @author <a href="mailto:hps@intermeta.de">Henning P. Schmiedehausen</a>
@@ -85,7 +85,7 @@ public class TemplateSecurityCheck
*
* @param role The role to be checked.
* @return Whether the user has the role.
- * @exception Exception Trouble validating.
+ * @throws Exception Trouble validating.
*/
public boolean hasRole(Role role)
throws Exception
@@ -112,7 +112,7 @@ public class TemplateSecurityCheck
*
* @param permission The permission to be checked.
* @return Whether the user has the permission.
- * @exception Exception Trouble validating.
+ * @throws Exception Trouble validating.
*/
public boolean hasPermission(Permission permission)
throws Exception
@@ -134,7 +134,7 @@ public class TemplateSecurityCheck
* Check that the user has logged in.
*
* @return True if user has logged in.
- * @exception Exception, a generic exception.
+ * @throws Exception a generic exception.
*/
public boolean checkLogin()
throws Exception
Modified: turbine/core/trunk/src/java/org/apache/turbine/util/uri/DataURI.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/uri/DataURI.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/util/uri/DataURI.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/util/uri/DataURI.java Fri Dec 9 13:19:59 2016
@@ -108,11 +108,11 @@ public class DataURI
* URL is absolute; it starts with http/https...
*
* <p>
- * <code><pre>
+ * <pre>
* TurbineURI tui = new TurbineURI (data, "UserScreen");
* tui.addPathInfo("user","jon");
* tui.getAbsoluteLink();
- * </pre></code>
+ * </pre>
*
* The above call to getAbsoluteLink() would return the String:
*
@@ -146,11 +146,11 @@ public class DataURI
* URL is relative to the webserver root.
*
* <p>
- * <code><pre>
+ * <pre>
* TurbineURI tui = new TurbineURI (data, "UserScreen");
* tui.addPathInfo("user","jon");
* tui.getRelativeLink();
- * </pre></code>
+ * </pre>
*
* The above call to getRelativeLink() would return the String:
*
@@ -184,6 +184,7 @@ public class DataURI
* @return This URI as a String
*
*/
+ @Override
public String toString()
{
return getAbsoluteLink();
Modified: turbine/core/trunk/src/java/org/apache/turbine/util/uri/TurbineURI.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/uri/TurbineURI.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/util/uri/TurbineURI.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/util/uri/TurbineURI.java Fri Dec 9 13:19:59 2016
@@ -588,11 +588,11 @@ public class TurbineURI
* URL is absolute; it starts with http/https...
*
* <p>
- * <code><pre>
+ * <pre>
* TurbineURI tui = new TurbineURI (data, "UserScreen");
* tui.addPathInfo("user","jon");
* tui.getAbsoluteLink();
- * </pre></code>
+ * </pre>
*
* The above call to absoluteLink() would return the String:
*
@@ -621,11 +621,11 @@ public class TurbineURI
* URL is relative to the webserver root.
*
* <p>
- * <code><pre>
+ * <pre>
* TurbineURI tui = new TurbineURI (data, "UserScreen");
* tui.addPathInfo("user","jon");
* tui.getRelativeLink();
- * </pre></code>
+ * </pre>
*
* The above call to relativeLink() would return the String:
*
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=1773378&r1=1773377&r2=1773378&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 Fri Dec 9 13:19:59 2016
@@ -71,7 +71,7 @@ public abstract class VelocityActionEven
* doPerform() method instead.
*
* @param pipelineData A Turbine RunData object.
- * @exception Exception a generic exception.
+ * @throws Exception a generic exception.
*/
@Override
public void doPerform(PipelineData pipelineData)
Modified: turbine/core/trunk/src/java/org/apache/turbine/util/velocity/VelocityHtmlEmail.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/velocity/VelocityHtmlEmail.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/util/velocity/VelocityHtmlEmail.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/util/velocity/VelocityHtmlEmail.java Fri Dec 9 13:19:59 2016
@@ -185,7 +185,7 @@ public class VelocityHtmlEmail extends H
/**
* Actually send the mail.
*
- * @exception EmailException thrown if mail cannot be sent.
+ * @throws EmailException thrown if mail cannot be sent.
*/
@Override
public String send() throws EmailException
@@ -222,14 +222,14 @@ public class VelocityHtmlEmail extends H
*
* <p>Example of template:
*
- * <code><pre width="80">
+ * <pre>
* <html>
* <!-- $mail.embed("http://server/border.gif","border.gif"); -->
* <img src=$mail.getCid("border.gif")>
* <p>This is your content
* <img src=$mail.getCid("border.gif")>
* </html>
- * </pre></code>
+ * </pre>
*
* @param surl A String.
* @param name A String.
Modified: turbine/core/trunk/src/test/org/apache/turbine/modules/actions/Turbine2LegacyAction.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/modules/actions/Turbine2LegacyAction.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
--- turbine/core/trunk/src/test/org/apache/turbine/modules/actions/Turbine2LegacyAction.java (original)
+++ turbine/core/trunk/src/test/org/apache/turbine/modules/actions/Turbine2LegacyAction.java Fri Dec 9 13:19:59 2016
@@ -40,7 +40,7 @@ public class Turbine2LegacyAction extend
*
* @param data Current RunData information
* @param context Context to populate
- * @exception Exception Thrown on error
+ * @throws Exception Thrown on error
*/
@Override
public void doPerform(RunData data, Context context) throws Exception
Modified: turbine/core/trunk/src/test/org/apache/turbine/modules/actions/VelocityActionDoesNothing.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/modules/actions/VelocityActionDoesNothing.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
--- turbine/core/trunk/src/test/org/apache/turbine/modules/actions/VelocityActionDoesNothing.java (original)
+++ turbine/core/trunk/src/test/org/apache/turbine/modules/actions/VelocityActionDoesNothing.java Fri Dec 9 13:19:59 2016
@@ -46,7 +46,7 @@ public class VelocityActionDoesNothing e
*
* @param pipelineData Current RunData information
* @param context Context to populate
- * @exception Exception Thrown on error
+ * @throws Exception Thrown on error
*/
@Override
public void doPerform(PipelineData pipelineData, Context context) throws Exception
@@ -63,7 +63,7 @@ public class VelocityActionDoesNothing e
*
* @param pipelineData Current RunData information
* @param context Context to populate
- * @exception Exception Thrown on error
+ * @throws Exception Thrown on error
*/
@TurbineActionEvent("annotatedEvent") // subject to URL folding
public void arbitraryMethodName(PipelineData pipelineData, Context context) throws Exception
Modified: turbine/core/trunk/src/test/org/apache/turbine/modules/actions/VelocityActionThrowsException.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/modules/actions/VelocityActionThrowsException.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
--- turbine/core/trunk/src/test/org/apache/turbine/modules/actions/VelocityActionThrowsException.java (original)
+++ turbine/core/trunk/src/test/org/apache/turbine/modules/actions/VelocityActionThrowsException.java Fri Dec 9 13:19:59 2016
@@ -41,7 +41,7 @@ public class VelocityActionThrowsExcepti
*
* @param data Current PipelineData information
* @param context Context to populate
- * @exception Exception Thrown on error
+ * @throws Exception Thrown on error
*/
@Override
public void doPerform(PipelineData data, Context context) throws Exception
Modified: turbine/core/trunk/src/test/org/apache/turbine/modules/actions/VelocityActionWithServiceInjection.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/modules/actions/VelocityActionWithServiceInjection.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
--- turbine/core/trunk/src/test/org/apache/turbine/modules/actions/VelocityActionWithServiceInjection.java (original)
+++ turbine/core/trunk/src/test/org/apache/turbine/modules/actions/VelocityActionWithServiceInjection.java Fri Dec 9 13:19:59 2016
@@ -51,7 +51,7 @@ public class VelocityActionWithServiceIn
*
* @param pipelineData Current RunData information
* @param context Context to populate
- * @exception Exception Thrown on error
+ * @throws Exception Thrown on error
*/
@Override
public void doPerform(PipelineData pipelineData, Context context) throws Exception
Modified: turbine/core/trunk/src/test/org/apache/turbine/modules/actions/VelocitySecureActionDoesNothing.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/modules/actions/VelocitySecureActionDoesNothing.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
--- turbine/core/trunk/src/test/org/apache/turbine/modules/actions/VelocitySecureActionDoesNothing.java (original)
+++ turbine/core/trunk/src/test/org/apache/turbine/modules/actions/VelocitySecureActionDoesNothing.java Fri Dec 9 13:19:59 2016
@@ -44,7 +44,7 @@ public class VelocitySecureActionDoesNot
*
* @param pipelineData Current RunData information
* @param context Context to populate
- * @exception Exception Thrown on error
+ * @throws Exception Thrown on error
*/
@Override
public void doPerform(PipelineData pipelineData, Context context) throws Exception