Author: tv
Date: Fri Dec 9 13:19:59 2016
New Revision: 1773378
URL: http://svn.apache.org/viewvc?rev=1773378&view=rev
Log:
Fix JavaDoc
Modified:
turbine/core/trunk/src/java/org/apache/turbine/Turbine.java
turbine/core/trunk/src/java/org/apache/turbine/modules/Action.java
turbine/core/trunk/src/java/org/apache/turbine/modules/ActionEvent.java
turbine/core/trunk/src/java/org/apache/turbine/modules/ActionLoader.java
turbine/core/trunk/src/java/org/apache/turbine/modules/Assembler.java
turbine/core/trunk/src/java/org/apache/turbine/modules/GenericLoader.java
turbine/core/trunk/src/java/org/apache/turbine/modules/Layout.java
turbine/core/trunk/src/java/org/apache/turbine/modules/LayoutLoader.java
turbine/core/trunk/src/java/org/apache/turbine/modules/Navigation.java
turbine/core/trunk/src/java/org/apache/turbine/modules/NavigationLoader.java
turbine/core/trunk/src/java/org/apache/turbine/modules/Page.java
turbine/core/trunk/src/java/org/apache/turbine/modules/PageLoader.java
turbine/core/trunk/src/java/org/apache/turbine/modules/ScheduledJobLoader.java
turbine/core/trunk/src/java/org/apache/turbine/modules/Screen.java
turbine/core/trunk/src/java/org/apache/turbine/modules/ScreenLoader.java
turbine/core/trunk/src/java/org/apache/turbine/modules/actions/AccessController.java
turbine/core/trunk/src/java/org/apache/turbine/modules/actions/InitContextsAction.java
turbine/core/trunk/src/java/org/apache/turbine/modules/actions/LegacyVelocityAction.java
turbine/core/trunk/src/java/org/apache/turbine/modules/actions/LoginUser.java
turbine/core/trunk/src/java/org/apache/turbine/modules/actions/LogoutUser.java
turbine/core/trunk/src/java/org/apache/turbine/modules/actions/sessionvalidator/TemplateSessionValidator.java
turbine/core/trunk/src/java/org/apache/turbine/modules/layouts/DirectResponseLayout.java
turbine/core/trunk/src/java/org/apache/turbine/modules/layouts/VelocityXslLayout.java
turbine/core/trunk/src/java/org/apache/turbine/modules/navigations/LegacyVelocityNavigation.java
turbine/core/trunk/src/java/org/apache/turbine/modules/navigations/VelocityNavigation.java
turbine/core/trunk/src/java/org/apache/turbine/modules/package.html
turbine/core/trunk/src/java/org/apache/turbine/modules/pages/DefaultPage.java
turbine/core/trunk/src/java/org/apache/turbine/modules/pages/TemplatePage.java
turbine/core/trunk/src/java/org/apache/turbine/modules/pages/VelocityPage.java
turbine/core/trunk/src/java/org/apache/turbine/modules/screens/BaseJspScreen.java
turbine/core/trunk/src/java/org/apache/turbine/modules/screens/JSONSecureScreen.java
turbine/core/trunk/src/java/org/apache/turbine/modules/screens/JspErrorScreen.java
turbine/core/trunk/src/java/org/apache/turbine/modules/screens/LegacyVelocityScreen.java
turbine/core/trunk/src/java/org/apache/turbine/modules/screens/LegacyVelocitySecureScreen.java
turbine/core/trunk/src/java/org/apache/turbine/modules/screens/RawScreen.java
turbine/core/trunk/src/java/org/apache/turbine/modules/screens/TemplateScreen.java
turbine/core/trunk/src/java/org/apache/turbine/modules/screens/VelocityCachedScreen.java
turbine/core/trunk/src/java/org/apache/turbine/modules/screens/VelocityDirectScreen.java
turbine/core/trunk/src/java/org/apache/turbine/modules/screens/VelocityErrorScreen.java
turbine/core/trunk/src/java/org/apache/turbine/modules/screens/VelocityScreen.java
turbine/core/trunk/src/java/org/apache/turbine/modules/screens/VelocitySecureScreen.java
turbine/core/trunk/src/java/org/apache/turbine/modules/screens/error/InvalidState.java
turbine/core/trunk/src/java/org/apache/turbine/om/security/DefaultUserImpl.java
turbine/core/trunk/src/java/org/apache/turbine/om/security/User.java
turbine/core/trunk/src/java/org/apache/turbine/pipeline/AbstractValve.java
turbine/core/trunk/src/java/org/apache/turbine/pipeline/CleanUpValve.java
turbine/core/trunk/src/java/org/apache/turbine/pipeline/DefaultLoginValve.java
turbine/core/trunk/src/java/org/apache/turbine/pipeline/DetermineRedirectRequestedValve.java
turbine/core/trunk/src/java/org/apache/turbine/pipeline/ExecutePageValve.java
turbine/core/trunk/src/java/org/apache/turbine/pipeline/Pipeline.java
turbine/core/trunk/src/java/org/apache/turbine/pipeline/PipelineData.java
turbine/core/trunk/src/java/org/apache/turbine/pipeline/Valve.java
turbine/core/trunk/src/java/org/apache/turbine/pipeline/ValveContext.java
turbine/core/trunk/src/java/org/apache/turbine/services/BaseInitable.java
turbine/core/trunk/src/java/org/apache/turbine/services/BaseInitableBroker.java
turbine/core/trunk/src/java/org/apache/turbine/services/BaseServiceBroker.java
turbine/core/trunk/src/java/org/apache/turbine/services/Initable.java
turbine/core/trunk/src/java/org/apache/turbine/services/InitableBroker.java
turbine/core/trunk/src/java/org/apache/turbine/services/ServiceBroker.java
turbine/core/trunk/src/java/org/apache/turbine/services/TurbineBaseService.java
turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/AssemblerBrokerService.java
turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/TurbineAssemblerBrokerService.java
turbine/core/trunk/src/java/org/apache/turbine/services/intake/IntakeTool.java
turbine/core/trunk/src/java/org/apache/turbine/services/jsp/TurbineJspService.java
turbine/core/trunk/src/java/org/apache/turbine/services/jsp/util/JspNavigation.java
turbine/core/trunk/src/java/org/apache/turbine/services/jsp/util/JspScreenPlaceholder.java
turbine/core/trunk/src/java/org/apache/turbine/services/localization/LocalizationTool.java
turbine/core/trunk/src/java/org/apache/turbine/services/pull/PipelineDataApplicationTool.java
turbine/core/trunk/src/java/org/apache/turbine/services/pull/RunDataApplicationTool.java
turbine/core/trunk/src/java/org/apache/turbine/services/pull/TurbinePullService.java
turbine/core/trunk/src/java/org/apache/turbine/services/pull/tools/TemplateLink.java
turbine/core/trunk/src/java/org/apache/turbine/services/pull/util/DateFormatter.java
turbine/core/trunk/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java
turbine/core/trunk/src/java/org/apache/turbine/services/schedule/AbstractJobEntry.java
turbine/core/trunk/src/java/org/apache/turbine/services/schedule/AbstractSchedulerService.java
turbine/core/trunk/src/java/org/apache/turbine/services/schedule/JobEntry.java
turbine/core/trunk/src/java/org/apache/turbine/services/schedule/JobEntryNonPersistent.java
turbine/core/trunk/src/java/org/apache/turbine/services/schedule/JobQueue.java
turbine/core/trunk/src/java/org/apache/turbine/services/schedule/QuartzSchedulerService.java
turbine/core/trunk/src/java/org/apache/turbine/services/schedule/ScheduleService.java
turbine/core/trunk/src/java/org/apache/turbine/services/schedule/TorqueSchedulerService.java
turbine/core/trunk/src/java/org/apache/turbine/services/schedule/TurbineNonPersistentSchedulerService.java
turbine/core/trunk/src/java/org/apache/turbine/services/security/DefaultSecurityService.java
turbine/core/trunk/src/java/org/apache/turbine/services/security/DefaultUserManager.java
turbine/core/trunk/src/java/org/apache/turbine/services/security/SecurityService.java
turbine/core/trunk/src/java/org/apache/turbine/services/security/UserManager.java
turbine/core/trunk/src/java/org/apache/turbine/services/security/passive/PassiveUserManager.java
turbine/core/trunk/src/java/org/apache/turbine/services/session/SessionListener.java
turbine/core/trunk/src/java/org/apache/turbine/services/session/TurbineSessionService.java
turbine/core/trunk/src/java/org/apache/turbine/services/template/TemplateService.java
turbine/core/trunk/src/java/org/apache/turbine/services/template/TurbineTemplateService.java
turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/DirectMapper.java
turbine/core/trunk/src/java/org/apache/turbine/services/velocity/TurbineVelocityService.java
turbine/core/trunk/src/java/org/apache/turbine/services/velocity/VelocityService.java
turbine/core/trunk/src/java/org/apache/turbine/util/InputFilterUtils.java
turbine/core/trunk/src/java/org/apache/turbine/util/ObjectUtils.java
turbine/core/trunk/src/java/org/apache/turbine/util/RunData.java
turbine/core/trunk/src/java/org/apache/turbine/util/SecurityCheck.java
turbine/core/trunk/src/java/org/apache/turbine/util/TurbineConfig.java
turbine/core/trunk/src/java/org/apache/turbine/util/TurbineException.java
turbine/core/trunk/src/java/org/apache/turbine/util/TurbineXmlConfig.java
turbine/core/trunk/src/java/org/apache/turbine/util/template/TemplateSecurityCheck.java
turbine/core/trunk/src/java/org/apache/turbine/util/uri/DataURI.java
turbine/core/trunk/src/java/org/apache/turbine/util/uri/TurbineURI.java
turbine/core/trunk/src/java/org/apache/turbine/util/velocity/VelocityActionEvent.java
turbine/core/trunk/src/java/org/apache/turbine/util/velocity/VelocityHtmlEmail.java
turbine/core/trunk/src/test/org/apache/turbine/modules/actions/Turbine2LegacyAction.java
turbine/core/trunk/src/test/org/apache/turbine/modules/actions/VelocityActionDoesNothing.java
turbine/core/trunk/src/test/org/apache/turbine/modules/actions/VelocityActionThrowsException.java
turbine/core/trunk/src/test/org/apache/turbine/modules/actions/VelocityActionWithServiceInjection.java
turbine/core/trunk/src/test/org/apache/turbine/modules/actions/VelocitySecureActionDoesNothing.java
Modified: turbine/core/trunk/src/java/org/apache/turbine/Turbine.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/Turbine.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/Turbine.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/Turbine.java Fri Dec 9
13:19:59 2016
@@ -183,7 +183,7 @@ public class Turbine
*
* This method is called by init(ServletConfig config)
*
- * @exception ServletException a servlet exception.
+ * @throws ServletException a servlet exception.
*/
@Override
public void init() throws ServletException
@@ -764,8 +764,8 @@ public class Turbine
*
* @param req Servlet request.
* @param res Servlet response.
- * @exception IOException a servlet exception.
- * @exception ServletException a servlet exception.
+ * @throws IOException a servlet exception.
+ * @throws ServletException a servlet exception.
*/
@Override
public void doGet(HttpServletRequest req, HttpServletResponse res)
@@ -843,8 +843,8 @@ public class Turbine
*
* @param req Servlet request.
* @param res Servlet response.
- * @exception IOException a servlet exception.
- * @exception ServletException a servlet exception.
+ * @throws IOException a servlet exception.
+ * @throws ServletException a servlet exception.
*/
@Override
public void doPost(HttpServletRequest req, HttpServletResponse res)
Modified: turbine/core/trunk/src/java/org/apache/turbine/modules/Action.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/Action.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/modules/Action.java
(original)
+++ turbine/core/trunk/src/java/org/apache/turbine/modules/Action.java Fri Dec
9 13:19:59 2016
@@ -56,7 +56,7 @@ public abstract class Action extends Ass
* Action can also set the screen that is associated with {@link
PipelineData}.
*
* @param pipelineData Turbine information.
- * @exception Exception a generic exception.
+ * @throws Exception a generic exception.
*/
public abstract void doPerform(PipelineData pipelineData) throws Exception;
@@ -66,7 +66,7 @@ public abstract class Action extends Ass
* use ActionLoader to perform an Action.
*
* @param pipelineData Turbine information.
- * @exception Exception a generic exception.
+ * @throws Exception a generic exception.
*/
protected void perform(PipelineData pipelineData) throws Exception
{
Modified:
turbine/core/trunk/src/java/org/apache/turbine/modules/ActionEvent.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/ActionEvent.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/modules/ActionEvent.java
(original)
+++ turbine/core/trunk/src/java/org/apache/turbine/modules/ActionEvent.java Fri
Dec 9 13:19:59 2016
@@ -102,14 +102,14 @@ public abstract class ActionEvent extend
protected static final int LENGTH = BUTTON.length();
/**
- * If true, the eventSubmit_do<xxx> variable must contain
+ * If true, the eventSubmit_do<xxx> variable must contain
* a not null value to be executed.
*/
@TurbineConfiguration( TurbineConstants.ACTION_EVENTSUBMIT_NEEDSVALUE_KEY )
private boolean submitValueKey =
TurbineConstants.ACTION_EVENTSUBMIT_NEEDSVALUE_DEFAULT;
/**
- * If true, then exceptions raised in eventSubmit_do<xxx> methods
+ * If true, then exceptions raised in eventSubmit_do<xxx> methods
* as well as in doPerform methods are bubbled up to the Turbine
* servlet's handleException method.
*/
@@ -178,7 +178,7 @@ public abstract class ActionEvent extend
* doPerform() method instead.
*
* @param pipelineData Turbine information.
- * @exception Exception a generic exception.
+ * @throws Exception a generic exception.
*/
@Override
public void doPerform(PipelineData pipelineData)
@@ -195,7 +195,7 @@ public abstract class ActionEvent extend
* @param signature the signature of the method to call
* @param parameters the parameters for the method to call
*
- * @exception Exception a generic exception.
+ * @throws Exception a generic exception.
*/
protected void executeEvents(ParameterParser pp, Class<?>[] signature,
Object[] parameters)
throws Exception
@@ -328,7 +328,7 @@ public abstract class ActionEvent extend
{
// If the action.eventsubmit.needsvalue key is true,
// events with a "0" or empty value are ignored.
- // This can be used if you have multiple
eventSubmit_do<xxx>
+ // This can be used if you have multiple
eventSubmit_do<xxx>
// fields in your form which are selected by client
side code,
// e.g. JavaScript.
//
Modified:
turbine/core/trunk/src/java/org/apache/turbine/modules/ActionLoader.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/ActionLoader.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/modules/ActionLoader.java
(original)
+++ turbine/core/trunk/src/java/org/apache/turbine/modules/ActionLoader.java
Fri Dec 9 13:19:59 2016
@@ -52,7 +52,7 @@ public class ActionLoader
*
* @param pipelineData Turbine information.
* @param name Name of object that will execute the action.
- * @exception Exception a generic exception.
+ * @throws Exception a generic exception.
*/
@Override
public void exec(PipelineData pipelineData, String name)
@@ -67,7 +67,7 @@ public class ActionLoader
*
* @param name Name of object instance.
* @return An Action with the specified name, or null.
- * @exception Exception a generic exception.
+ * @throws Exception a generic exception.
*/
@Override
public Action getAssembler(String name)
Modified: turbine/core/trunk/src/java/org/apache/turbine/modules/Assembler.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/Assembler.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/modules/Assembler.java
(original)
+++ turbine/core/trunk/src/java/org/apache/turbine/modules/Assembler.java Fri
Dec 9 13:19:59 2016
@@ -21,10 +21,11 @@ package org.apache.turbine.modules;
import org.apache.turbine.pipeline.PipelineData;
import org.apache.turbine.util.RunData;
+
/**
- * This is an interface that defines what an Assembler is. All the
- * current modules extend off of this class. It is currently empty and
- * future use is yet to be determined.
+ * This is an interface that defines what an Assembler is. All the current
+ * modules extend off of this class. It is currently empty and future use is
yet
+ * to be determined.
*
* @author <a href="mailto:[email protected]";>Dave Bryson</a>
* @author <a href="mailto:[email protected]";>Peter Courcoux</a>
@@ -34,20 +35,23 @@ public abstract class Assembler
{
/**
* This can go once RunData is replaced...
- * @param pipelineData
- * @return RunData
+ *
+ * @param pipelineData Turbine request data
+ * @return RunData extracted from PipelineData
*/
public final RunData getRunData(PipelineData pipelineData)
{
- if(!(pipelineData instanceof RunData)){
+ if (!(pipelineData instanceof RunData))
+ {
throw new RuntimeException("Can't cast to rundata from pipeline
data.");
}
- return (RunData)pipelineData;
+ return (RunData) pipelineData;
}
-
+
/**
- * Abstract method to provide the prefix for module related classes and
templates
- *
+ * Abstract method to provide the prefix for module related classes and
+ * templates
+ *
* @return the prefix
*/
public abstract String getPrefix();
Modified:
turbine/core/trunk/src/java/org/apache/turbine/modules/GenericLoader.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/GenericLoader.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/modules/GenericLoader.java
(original)
+++ turbine/core/trunk/src/java/org/apache/turbine/modules/GenericLoader.java
Fri Dec 9 13:19:59 2016
@@ -66,7 +66,7 @@ public abstract class GenericLoader<T ex
* set.
* @param pipelineData the Turbine request
* @param name the name of the assembler module
- * @exception Exception a generic exception.
+ * @throws Exception a generic exception.
*/
public abstract void exec(PipelineData pipelineData, String name)
throws Exception;
@@ -149,7 +149,7 @@ public abstract class GenericLoader<T ex
* @param type Type of the assembler.
* @param name Name of object instance.
* @return A Screen with the specified name, or null.
- * @exception Exception a generic exception.
+ * @throws Exception a generic exception.
*/
protected T getAssembler(Class<T> type, String name)
throws Exception
Modified: turbine/core/trunk/src/java/org/apache/turbine/modules/Layout.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/Layout.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/modules/Layout.java
(original)
+++ turbine/core/trunk/src/java/org/apache/turbine/modules/Layout.java Fri Dec
9 13:19:59 2016
@@ -56,7 +56,7 @@ public abstract class Layout
* A subclass must override this method to perform itself. The
* Action can also set the screen that is associated with PipelineData.
* @param pipelineData Turbine information.
- * @exception Exception a generic exception.
+ * @throws Exception a generic exception.
*/
protected abstract void doBuild(PipelineData pipelineData) throws
Exception;
@@ -66,7 +66,7 @@ public abstract class Layout
* use ActionLoader to perform an Action.
*
* @param pipelineData Turbine information.
- * @exception Exception a generic exception.
+ * @throws Exception a generic exception.
*/
protected void build(PipelineData pipelineData) throws Exception
{
Modified:
turbine/core/trunk/src/java/org/apache/turbine/modules/LayoutLoader.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/LayoutLoader.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/modules/LayoutLoader.java
(original)
+++ turbine/core/trunk/src/java/org/apache/turbine/modules/LayoutLoader.java
Fri Dec 9 13:19:59 2016
@@ -52,7 +52,7 @@ public class LayoutLoader
*
* @param pipelineData Turbine information.
* @param name Name of object that will execute the layout.
- * @exception Exception a generic exception.
+ * @throws Exception a generic exception.
*/
@Override
public void exec(PipelineData pipelineData, String name)
@@ -67,7 +67,7 @@ public class LayoutLoader
*
* @param name Name of object instance.
* @return A Layout with the specified name, or null.
- * @exception Exception a generic exception.
+ * @throws Exception a generic exception.
*/
@Override
public Layout getAssembler(String name)
Modified: turbine/core/trunk/src/java/org/apache/turbine/modules/Navigation.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/Navigation.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/modules/Navigation.java
(original)
+++ turbine/core/trunk/src/java/org/apache/turbine/modules/Navigation.java Fri
Dec 9 13:19:59 2016
@@ -61,7 +61,7 @@ public abstract class Navigation
*
* @param pipelineData Turbine information.
* @return the content of the navigation module
- * @exception Exception a generic exception.
+ * @throws Exception a generic exception.
*/
protected abstract String doBuild(PipelineData pipelineData) throws
Exception;
@@ -72,7 +72,7 @@ public abstract class Navigation
*
* @param pipelineData Turbine information.
* @return the content of the navigation module
- * @exception Exception a generic exception.
+ * @throws Exception a generic exception.
*/
protected String build(PipelineData pipelineData)
throws Exception
Modified:
turbine/core/trunk/src/java/org/apache/turbine/modules/NavigationLoader.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/NavigationLoader.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/modules/NavigationLoader.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/modules/NavigationLoader.java
Fri Dec 9 13:19:59 2016
@@ -57,7 +57,7 @@ public class NavigationLoader
* @param pipelineData Turbine information.
* @param name Name of object that will execute the navigation.
* @return the navigation module output
- * @exception Exception a generic exception.
+ * @throws Exception a generic exception.
*/
public String eval(PipelineData pipelineData, String name)
throws Exception
@@ -71,7 +71,7 @@ public class NavigationLoader
*
* @param pipelineData Turbine information.
* @param name Name of object instance.
- * @exception Exception a generic exception.
+ * @throws Exception a generic exception.
*/
@Override
public void exec(PipelineData pipelineData, String name)
@@ -86,7 +86,7 @@ public class NavigationLoader
*
* @param name Name of object instance.
* @return A Layout with the specified name, or null.
- * @exception Exception a generic exception.
+ * @throws Exception a generic exception.
*/
@Override
public Navigation getAssembler(String name)
Modified: turbine/core/trunk/src/java/org/apache/turbine/modules/Page.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/Page.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/modules/Page.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/modules/Page.java Fri Dec 9
13:19:59 2016
@@ -58,7 +58,7 @@ public abstract class Page
* Subclasses override this method to store the page in PipelineData or
* to write the page to the output stream referenced in PipelineData.
* @param pipelineData Turbine information.
- * @exception Exception a generic exception.
+ * @throws Exception a generic exception.
*/
protected abstract void doBuild(PipelineData pipelineData) throws
Exception;
@@ -68,7 +68,7 @@ public abstract class Page
* use PageLoader to build a Page.
*
* @param pipelineData Turbine information.
- * @exception Exception a generic exception.
+ * @throws Exception a generic exception.
*/
protected void build(PipelineData pipelineData)
throws Exception
Modified: turbine/core/trunk/src/java/org/apache/turbine/modules/PageLoader.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/PageLoader.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/modules/PageLoader.java
(original)
+++ turbine/core/trunk/src/java/org/apache/turbine/modules/PageLoader.java Fri
Dec 9 13:19:59 2016
@@ -52,7 +52,7 @@ public class PageLoader
*
* @param pipelineData Turbine information.
* @param name Name of object that will execute the page.
- * @exception Exception a generic exception.
+ * @throws Exception a generic exception.
*/
@Override
public void exec(PipelineData pipelineData, String name)
@@ -68,7 +68,7 @@ public class PageLoader
*
* @param name Name of object instance.
* @return A Screen with the specified name, or null.
- * @exception Exception a generic exception.
+ * @throws Exception a generic exception.
*/
@Override
public Page getAssembler(String name)
Modified:
turbine/core/trunk/src/java/org/apache/turbine/modules/ScheduledJobLoader.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/ScheduledJobLoader.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/modules/ScheduledJobLoader.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/modules/ScheduledJobLoader.java
Fri Dec 9 13:19:59 2016
@@ -53,7 +53,7 @@ public class ScheduledJobLoader
*
* @param job The JobEntry.
* @param name Name of object that will execute the job.
- * @exception Exception a generic exception.
+ * @throws Exception a generic exception.
*/
public void exec(JobEntry job, String name)
throws Exception
@@ -74,7 +74,7 @@ public class ScheduledJobLoader
*
* @param pipelineData Turbine information.
* @param name Name of object that will execute the job.
- * @exception Exception a generic exception.
+ * @throws Exception a generic exception.
* @deprecated
*/
@Deprecated
@@ -91,7 +91,7 @@ public class ScheduledJobLoader
*
* @param name Name of object instance.
* @return A ScheduledJob with the specified name, or null.
- * @exception Exception a generic exception.
+ * @throws Exception a generic exception.
*/
@Override
public ScheduledJob getAssembler(String name)
Modified: turbine/core/trunk/src/java/org/apache/turbine/modules/Screen.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/Screen.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/modules/Screen.java
(original)
+++ turbine/core/trunk/src/java/org/apache/turbine/modules/Screen.java Fri Dec
9 13:19:59 2016
@@ -63,7 +63,7 @@ public abstract class Screen
* RunData.
* @param pipelineData Turbine information.
* @return the content of the screen
- * @exception Exception a generic exception.
+ * @throws Exception a generic exception.
*/
protected abstract String doBuild(PipelineData pipelineData) throws
Exception;
@@ -74,7 +74,7 @@ public abstract class Screen
*
* @param pipelineData Turbine information.
* @return the content of the screen
- * @exception Exception a generic exception.
+ * @throws Exception a generic exception.
*/
protected String build(PipelineData pipelineData)
throws Exception
Modified:
turbine/core/trunk/src/java/org/apache/turbine/modules/ScreenLoader.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/ScreenLoader.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/modules/ScreenLoader.java
(original)
+++ turbine/core/trunk/src/java/org/apache/turbine/modules/ScreenLoader.java
Fri Dec 9 13:19:59 2016
@@ -59,7 +59,7 @@ public class ScreenLoader
* @param pipelineData Turbine information.
* @param name Name of object that will execute the screen.
* @return the output of the screen module
- * @exception Exception a generic exception.
+ * @throws Exception a generic exception.
*/
public String eval(PipelineData pipelineData, String name)
throws Exception
@@ -75,7 +75,7 @@ public class ScreenLoader
*
* @param pipelineData Turbine information.
* @param name Name of object that will execute the screen.
- * @exception Exception a generic exception.
+ * @throws Exception a generic exception.
*/
@Override
public void exec(PipelineData pipelineData, String name)
@@ -90,7 +90,7 @@ public class ScreenLoader
*
* @param name Name of object instance.
* @return A Screen with the specified name, or null.
- * @exception Exception a generic exception.
+ * @throws Exception a generic exception.
*/
@Override
public Screen getAssembler(String name)
Modified:
turbine/core/trunk/src/java/org/apache/turbine/modules/actions/AccessController.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/actions/AccessController.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/modules/actions/AccessController.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/modules/actions/AccessController.java
Fri Dec 9 13:19:59 2016
@@ -85,7 +85,7 @@ public class AccessController
* session.
*
* @param pipelineData Turbine information.
- * @exception FulcrumSecurityException problem with the security service.
+ * @throws FulcrumSecurityException problem with the security service.
*/
@Override
public void doPerform(PipelineData pipelineData)
Modified:
turbine/core/trunk/src/java/org/apache/turbine/modules/actions/InitContextsAction.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/actions/InitContextsAction.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/modules/actions/InitContextsAction.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/modules/actions/InitContextsAction.java
Fri Dec 9 13:19:59 2016
@@ -54,7 +54,7 @@ public class InitContextsAction
*
* @param pipelineData
* The PipelineRunData object for the current request.
- * @exception NamingException
+ * @throws NamingException
* could not create InitialContext
*/
@Override
Modified:
turbine/core/trunk/src/java/org/apache/turbine/modules/actions/LegacyVelocityAction.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/actions/LegacyVelocityAction.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/modules/actions/LegacyVelocityAction.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/modules/actions/LegacyVelocityAction.java
Fri Dec 9 13:19:59 2016
@@ -65,7 +65,7 @@ public abstract class LegacyVelocityActi
* 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/modules/actions/LoginUser.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/actions/LoginUser.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/modules/actions/LoginUser.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/modules/actions/LoginUser.java
Fri Dec 9 13:19:59 2016
@@ -78,7 +78,7 @@ public class LoginUser
* to SCREEN_LOGIN
*
* @param pipelineData Turbine information.
- * @exception FulcrumSecurityException could not get instance of the
+ * @throws FulcrumSecurityException could not get instance of the
* anonymous user
*/
@Override
Modified:
turbine/core/trunk/src/java/org/apache/turbine/modules/actions/LogoutUser.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/actions/LogoutUser.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/modules/actions/LogoutUser.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/modules/actions/LogoutUser.java
Fri Dec 9 13:19:59 2016
@@ -69,7 +69,7 @@ public class LogoutUser
* for a logged out (read not-logged-in) user.
*
* @param pipelineData Turbine information.
- * @exception FulcrumSecurityException a problem occurred in the security
+ * @throws FulcrumSecurityException a problem occurred in the security
* service.
*/
@Override
Modified:
turbine/core/trunk/src/java/org/apache/turbine/modules/actions/sessionvalidator/TemplateSessionValidator.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/actions/sessionvalidator/TemplateSessionValidator.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/modules/actions/sessionvalidator/TemplateSessionValidator.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/modules/actions/sessionvalidator/TemplateSessionValidator.java
Fri Dec 9 13:19:59 2016
@@ -75,7 +75,7 @@ public class TemplateSessionValidator
* Execute the action.
*
* @param pipelineData Turbine information.
- * @exception Exception The anonymous user could not be obtained
+ * @throws Exception The anonymous user could not be obtained
* from the security service
*/
@Override
Modified:
turbine/core/trunk/src/java/org/apache/turbine/modules/layouts/DirectResponseLayout.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/layouts/DirectResponseLayout.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/modules/layouts/DirectResponseLayout.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/modules/layouts/DirectResponseLayout.java
Fri Dec 9 13:19:59 2016
@@ -40,7 +40,7 @@ public class DirectResponseLayout extend
* Ensures that a direct response has been declared.
*
* @param pipelineData Turbine information.
- * @exception TurbineException if a direct response has not been declared.
+ * @throws TurbineException if a direct response has not been declared.
*/
@Override
public void doBuild(PipelineData pipelineData)
Modified:
turbine/core/trunk/src/java/org/apache/turbine/modules/layouts/VelocityXslLayout.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/layouts/VelocityXslLayout.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/modules/layouts/VelocityXslLayout.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/modules/layouts/VelocityXslLayout.java
Fri Dec 9 13:19:59 2016
@@ -83,7 +83,7 @@ public class VelocityXslLayout extends L
* of the HttpServletResponse object.
*
* @param pipelineData Turbine information.
- * @exception Exception a generic exception.
+ * @throws Exception a generic exception.
*/
@Override
public void doBuild(PipelineData pipelineData)
Modified:
turbine/core/trunk/src/java/org/apache/turbine/modules/navigations/LegacyVelocityNavigation.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/navigations/LegacyVelocityNavigation.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/modules/navigations/LegacyVelocityNavigation.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/modules/navigations/LegacyVelocityNavigation.java
Fri Dec 9 13:19:59 2016
@@ -42,7 +42,7 @@ public class LegacyVelocityNavigation
*
* @param data Turbine information.
* @param context Context for web pages.
- * @exception Exception, a generic exception.
+ * @throws Exception a generic exception.
*/
protected void doBuildTemplate(RunData data, Context context)
throws Exception
Modified:
turbine/core/trunk/src/java/org/apache/turbine/modules/navigations/VelocityNavigation.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/navigations/VelocityNavigation.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/modules/navigations/VelocityNavigation.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/modules/navigations/VelocityNavigation.java
Fri Dec 9 13:19:59 2016
@@ -63,7 +63,7 @@ public class VelocityNavigation
*
* @param pipelineData Turbine information.
* @param context Context for web pages.
- * @exception Exception, a generic exception.
+ * @throws Exception a generic exception.
*/
protected void doBuildTemplate(PipelineData pipelineData,
Context context)
@@ -78,7 +78,7 @@ public class VelocityNavigation
* context in the parameter list.
*
* @param pipelineData Turbine information.
- * @exception Exception, a generic exception.
+ * @throws Exception a generic exception.
*/
@Override
protected void doBuildTemplate(PipelineData pipelineData)
@@ -92,7 +92,7 @@ public class VelocityNavigation
*
* @param pipelineData Turbine information.
* @return the content of the navigation module
- * @exception Exception, a generic exception.
+ * @throws Exception a generic exception.
*/
@Override
public String buildTemplate(PipelineData pipelineData)
Modified: turbine/core/trunk/src/java/org/apache/turbine/modules/package.html
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/package.html?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/modules/package.html
(original)
+++ turbine/core/trunk/src/java/org/apache/turbine/modules/package.html Fri Dec
9 13:19:59 2016
@@ -23,7 +23,5 @@
<body>
Modules (Action, Screen, Layout, Navigation, Page) classes for the Turbine
view.
-<br>
-<font size="-2">$Id$</font>
</body>
</html>
Modified:
turbine/core/trunk/src/java/org/apache/turbine/modules/pages/DefaultPage.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/pages/DefaultPage.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/modules/pages/DefaultPage.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/modules/pages/DefaultPage.java
Fri Dec 9 13:19:59 2016
@@ -111,7 +111,7 @@ public class DefaultPage
* Builds the Page.
*
* @param pipelineData Turbine information.
- * @exception Exception, a generic exception.
+ * @throws Exception a generic exception.
*/
@Override
public void doBuild(PipelineData pipelineData)
@@ -172,7 +172,7 @@ public class DefaultPage
* Screen module via getContext(). It does nothing here.
*
* @param pipelineData Turbine information.
- * @exception Exception, a generic exception.
+ * @throws Exception a generic exception.
*/
protected void doBuildBeforeAction(PipelineData pipelineData)
throws Exception
@@ -185,7 +185,7 @@ public class DefaultPage
* process a template. It does nothing here.
*
* @param pipelineData Turbine information.
- * @exception Exception, a generic exception.
+ * @throws Exception a generic exception.
*/
protected void doBuildAfterAction(PipelineData pipelineData)
throws Exception
@@ -198,7 +198,7 @@ public class DefaultPage
* fully processed. It does nothing here.
*
* @param pipelineData Turbine information.
- * @exception Exception, a generic exception.
+ * @throws Exception a generic exception.
*/
protected void doPostBuild(PipelineData pipelineData)
throws Exception
Modified:
turbine/core/trunk/src/java/org/apache/turbine/modules/pages/TemplatePage.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/pages/TemplatePage.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/modules/pages/TemplatePage.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/modules/pages/TemplatePage.java
Fri Dec 9 13:19:59 2016
@@ -91,7 +91,7 @@ public class TemplatePage
* corresponding class modules.
*
* @param pipelineData Turbine information.
- * @exception Exception, a generic exception.
+ * @throws Exception a generic exception.
*/
@Override
protected void doBuildAfterAction(PipelineData pipelineData)
Modified:
turbine/core/trunk/src/java/org/apache/turbine/modules/pages/VelocityPage.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/pages/VelocityPage.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/modules/pages/VelocityPage.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/modules/pages/VelocityPage.java
Fri Dec 9 13:19:59 2016
@@ -48,7 +48,7 @@ public class VelocityPage
* the Action module and the Screen module via getContext().
*
* @param pipelineData Turbine information.
- * @exception Exception, a generic exception.
+ * @throws Exception a generic exception.
*/
@Override
protected void doBuildBeforeAction(PipelineData pipelineData)
Modified:
turbine/core/trunk/src/java/org/apache/turbine/modules/screens/BaseJspScreen.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/screens/BaseJspScreen.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/modules/screens/BaseJspScreen.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/modules/screens/BaseJspScreen.java
Fri Dec 9 13:19:59 2016
@@ -55,7 +55,7 @@ public class BaseJspScreen
*
* @param pipelineData Turbine information.
* @return null - the JSP sends the information.
- * @exception Exception, a generic exception.
+ * @throws Exception a generic exception.
*/
@Override
public String buildTemplate(PipelineData pipelineData)
@@ -85,7 +85,7 @@ public class BaseJspScreen
* Method to be overridden by subclasses to include data in beans, etc.
*
* @param pipelineData the PipelineData object
- * @exception Exception, a generic exception.
+ * @throws Exception a generic exception.
*/
@Override
protected void doBuildTemplate(PipelineData pipelineData)
Modified:
turbine/core/trunk/src/java/org/apache/turbine/modules/screens/JSONSecureScreen.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/screens/JSONSecureScreen.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/modules/screens/JSONSecureScreen.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/modules/screens/JSONSecureScreen.java
Fri Dec 9 13:19:59 2016
@@ -31,8 +31,8 @@ import org.apache.turbine.pipeline.Pipel
*
* <p>Typically you would extend this class and override the doOutput() method
* to use TurbineJsonRpc to register the POJOs that will provide the functions
- * you are making available via JSON-RPC. Use JSONScreen if you <p>do not</b>
- * need the user to be logged in prior to executing the functions you provide.
+ * you are making available via JSON-RPC. Use JSONScreen if you <b>do not</b>
+ * need the user to be logged in prior to executing the functions you
provide.</p>
*
* <p>Here is an example from a superclass:
* <code>
@@ -51,7 +51,7 @@ import org.apache.turbine.pipeline.Pipel
*
* super.doOutput(data);
* }
- * </code>
+ * </code></p>
*
* <p>The class MyFunctions would be something like:
* <code>
@@ -69,7 +69,7 @@ import org.apache.turbine.pipeline.Pipel
* return "Client " + clientParameter + " says Hello World to " + name;
* }
* }
- * </code>
+ * </code></p>
*
* @author <a href="mailto:[email protected]";>Scott Eade</a>
* @version $Id$
@@ -81,7 +81,7 @@ public abstract class JSONSecureScreen e
* check prior to producing the output.
*
* @param pipelineData Turbine information.
- * @exception Exception, a generic exception.
+ * @throws Exception a generic exception.
*/
@Override
protected void doOutput(PipelineData pipelineData) throws Exception
@@ -97,7 +97,7 @@ public abstract class JSONSecureScreen e
*
* @param pipelineData Turbine information.
* @return <code>true</code> if the user is authorized to access the
screen.
- * @exception Exception A generic exception.
+ * @throws Exception A generic exception.
*/
protected abstract boolean isAuthorized(PipelineData pipelineData)
throws Exception;
Modified:
turbine/core/trunk/src/java/org/apache/turbine/modules/screens/JspErrorScreen.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/screens/JspErrorScreen.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/modules/screens/JspErrorScreen.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/modules/screens/JspErrorScreen.java
Fri Dec 9 13:19:59 2016
@@ -39,7 +39,7 @@ public class JspErrorScreen
/**
* @param pipelineData Turbine information.
- * @exception Exception a generic exception.
+ * @throws Exception a generic exception.
*/
@Override
protected void doBuildTemplate(PipelineData pipelineData)
Modified:
turbine/core/trunk/src/java/org/apache/turbine/modules/screens/LegacyVelocityScreen.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/screens/LegacyVelocityScreen.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/modules/screens/LegacyVelocityScreen.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/modules/screens/LegacyVelocityScreen.java
Fri Dec 9 13:19:59 2016
@@ -40,7 +40,7 @@ public class LegacyVelocityScreen
*
* @param data Turbine information.
* @param context Context for web pages.
- * @exception Exception, a generic exception.
+ * @throws Exception a generic exception.
*/
protected void doBuildTemplate(RunData data, Context context)
throws Exception
@@ -53,7 +53,7 @@ public class LegacyVelocityScreen
*
* @param pipelineData Turbine information.
* @param context Context for web pages.
- * @exception Exception, a generic exception.
+ * @throws Exception a generic exception.
*/
@Override
protected void doBuildTemplate(PipelineData pipelineData,
Modified:
turbine/core/trunk/src/java/org/apache/turbine/modules/screens/LegacyVelocitySecureScreen.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/screens/LegacyVelocitySecureScreen.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/modules/screens/LegacyVelocitySecureScreen.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/modules/screens/LegacyVelocitySecureScreen.java
Fri Dec 9 13:19:59 2016
@@ -39,7 +39,7 @@ public abstract class LegacyVelocitySecu
*
* @param data Turbine information.
* @param context Context for web pages.
- * @exception Exception, a generic exception.
+ * @throws Exception a generic exception.
*/
@Override
protected abstract void doBuildTemplate(RunData data, Context context)
@@ -50,7 +50,7 @@ public abstract class LegacyVelocitySecu
* perform a security check first.
*
* @param pipelineData Turbine information.
- * @exception Exception, a generic exception.
+ * @throws Exception a generic exception.
*/
@Override
protected void doBuildTemplate(PipelineData pipelineData)
@@ -70,7 +70,7 @@ public abstract class LegacyVelocitySecu
*
* @param data Turbine information.
* @return True if the user is authorized to access the screen.
- * @exception Exception, a generic exception.
+ * @throws Exception a generic exception.
*/
protected abstract boolean isAuthorized(RunData data)
throws Exception;
Modified:
turbine/core/trunk/src/java/org/apache/turbine/modules/screens/RawScreen.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/screens/RawScreen.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/modules/screens/RawScreen.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/modules/screens/RawScreen.java
Fri Dec 9 13:19:59 2016
@@ -50,7 +50,7 @@ public abstract class RawScreen extends
*
* @param pipelineData Turbine information.
* @return A ConcreteElement.
- * @exception Exception, a generic exception.
+ * @throws Exception a generic exception.
*/
@Override
protected final String doBuild(PipelineData pipelineData)
@@ -78,7 +78,7 @@ public abstract class RawScreen extends
* data.getResponse().getOutputStream();</pre>.
*
* @param pipelineData Turbine information.
- * @exception Exception, a generic exception.
+ * @throws Exception a generic exception.
*/
protected abstract void doOutput(PipelineData pipelineData) throws
Exception;
Modified:
turbine/core/trunk/src/java/org/apache/turbine/modules/screens/TemplateScreen.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/screens/TemplateScreen.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/modules/screens/TemplateScreen.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/modules/screens/TemplateScreen.java
Fri Dec 9 13:19:59 2016
@@ -66,7 +66,7 @@ public abstract class TemplateScreen
* This method should be overridden by subclasses that wish to add
* specific business logic.
* @param pipelineData Turbine information.
- * @exception Exception A generic exception.
+ * @throws Exception A generic exception.
*/
protected abstract void doBuildTemplate(PipelineData pipelineData)
throws Exception;
@@ -77,7 +77,7 @@ public abstract class TemplateScreen
* the template.
* @param pipelineData Turbine information.
* @return the content of the screen
- * @exception Exception A generic exception.
+ * @throws Exception A generic exception.
*/
public abstract String buildTemplate(PipelineData pipelineData)
throws Exception;
@@ -86,6 +86,8 @@ public abstract class TemplateScreen
* This method can be overridden to write code that executes when
* the template has been built (called from a finally clause, so
* executes regardless of whether an exception is thrown or not)
+ *
+ * @param pipelineData Turbine information
*/
protected void doPostBuildTemplate(PipelineData pipelineData)
{
@@ -98,7 +100,7 @@ public abstract class TemplateScreen
*
* @param pipelineData Turbine information.
* @return the content of the screen
- * @exception Exception A generic exception.
+ * @throws Exception A generic exception.
*/
@Override
protected String doBuild(PipelineData pipelineData)
@@ -166,7 +168,7 @@ public abstract class TemplateScreen
* @param pipelineData Turbine information.
* @param screen Name of screen to redirect to.
* @param template Name of template.
- * @exception Exception A generic exception.
+ * @throws Exception A generic exception.
*/
public void doRedirect(PipelineData pipelineData, String screen, String
template)
throws Exception
@@ -192,7 +194,7 @@ public abstract class TemplateScreen
*
* @param pipelineData Turbine information.
* @param template Name of template.
- * @exception Exception A generic exception.
+ * @throws Exception A generic exception.
*/
public void doRedirect(PipelineData pipelineData, String template)
throws Exception
Modified:
turbine/core/trunk/src/java/org/apache/turbine/modules/screens/VelocityCachedScreen.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/screens/VelocityCachedScreen.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/modules/screens/VelocityCachedScreen.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/modules/screens/VelocityCachedScreen.java
Fri Dec 9 13:19:59 2016
@@ -47,7 +47,7 @@ public class VelocityCachedScreen
*
* @param pipelineData Turbine information.
* @return A ConcreteElement.
- * @exception Exception, a generic exception.
+ * @throws Exception a generic exception.
*/
@Override
public String buildTemplate(PipelineData pipelineData)
Modified:
turbine/core/trunk/src/java/org/apache/turbine/modules/screens/VelocityDirectScreen.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/screens/VelocityDirectScreen.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/modules/screens/VelocityDirectScreen.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/modules/screens/VelocityDirectScreen.java
Fri Dec 9 13:19:59 2016
@@ -48,7 +48,7 @@ public class VelocityDirectScreen
*
* @param pipelineData Turbine information.
* @return the content of the screen
- * @exception Exception, a generic exception.
+ * @throws Exception a generic exception.
*/
@Override
public String buildTemplate(PipelineData pipelineData)
Modified:
turbine/core/trunk/src/java/org/apache/turbine/modules/screens/VelocityErrorScreen.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/screens/VelocityErrorScreen.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/modules/screens/VelocityErrorScreen.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/modules/screens/VelocityErrorScreen.java
Fri Dec 9 13:19:59 2016
@@ -41,7 +41,7 @@ public class VelocityErrorScreen
*
* @param pipelineData Turbine information.
* @param context Context for web pages.
- * @exception Exception a generic exception.
+ * @throws Exception a generic exception.
*/
@Override
protected void doBuildTemplate(PipelineData pipelineData, Context context)
Modified:
turbine/core/trunk/src/java/org/apache/turbine/modules/screens/VelocityScreen.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/screens/VelocityScreen.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/modules/screens/VelocityScreen.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/modules/screens/VelocityScreen.java
Fri Dec 9 13:19:59 2016
@@ -69,7 +69,7 @@ public class VelocityScreen
*
* @param pipelineData Turbine information.
* @param context Context for web pages.
- * @exception Exception, a generic exception.
+ * @throws Exception a generic exception.
*/
protected void doBuildTemplate(PipelineData pipelineData,
Context context)
@@ -84,7 +84,7 @@ public class VelocityScreen
* context in the parameter list.
*
* @param pipelineData Turbine information.
- * @exception Exception, a generic exception.
+ * @throws Exception a generic exception.
*/
@Override
protected void doBuildTemplate(PipelineData pipelineData)
@@ -98,7 +98,7 @@ public class VelocityScreen
*
* @param pipelineData Turbine information.
* @return the content of the screen
- * @exception Exception, a generic exception.
+ * @throws Exception a generic exception.
*/
@Override
public String buildTemplate(PipelineData pipelineData)
Modified:
turbine/core/trunk/src/java/org/apache/turbine/modules/screens/VelocitySecureScreen.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/screens/VelocitySecureScreen.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/modules/screens/VelocitySecureScreen.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/modules/screens/VelocitySecureScreen.java
Fri Dec 9 13:19:59 2016
@@ -46,7 +46,7 @@ public abstract class VelocitySecureScre
*
* @param pipelineData Turbine information.
* @param context Context for web pages.
- * @exception Exception, a generic exception.
+ * @throws Exception a generic exception.
*/
@Override
protected abstract void doBuildTemplate(PipelineData pipelineData,
@@ -58,7 +58,7 @@ public abstract class VelocitySecureScre
* perform a security check first.
*
* @param pipelineData Turbine information.
- * @exception Exception, a generic exception.
+ * @throws Exception a generic exception.
*/
@Override
protected void doBuildTemplate(PipelineData pipelineData)
@@ -78,7 +78,7 @@ public abstract class VelocitySecureScre
*
* @param pipelineData Turbine information.
* @return True if the user is authorized to access the screen.
- * @exception Exception, a generic exception.
+ * @throws Exception a generic exception.
*/
protected abstract boolean isAuthorized(PipelineData pipelineData)
throws Exception;
Modified:
turbine/core/trunk/src/java/org/apache/turbine/modules/screens/error/InvalidState.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/screens/error/InvalidState.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/modules/screens/error/InvalidState.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/modules/screens/error/InvalidState.java
Fri Dec 9 13:19:59 2016
@@ -52,7 +52,7 @@ public class InvalidState
* Build the Screen.
*
* @param pipelineData Turbine information.
- * @exception Exception, a generic exception.
+ * @throws Exception a generic exception.
*/
@Override
public String doBuild(PipelineData pipelineData)
Modified:
turbine/core/trunk/src/java/org/apache/turbine/om/security/DefaultUserImpl.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/om/security/DefaultUserImpl.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/om/security/DefaultUserImpl.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/om/security/DefaultUserImpl.java
Fri Dec 9 13:19:59 2016
@@ -726,7 +726,7 @@ public class DefaultUserImpl implements
/**
* Updates the last login date in the database.
*
- * @exception Exception A generic exception.
+ * @throws Exception A generic exception.
*/
@Override
public void updateLastLogin()
Modified: turbine/core/trunk/src/java/org/apache/turbine/om/security/User.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/om/security/User.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/om/security/User.java
(original)
+++ turbine/core/trunk/src/java/org/apache/turbine/om/security/User.java Fri
Dec 9 13:19:59 2016
@@ -280,7 +280,7 @@ public interface User
/**
* Updates the last login date in the database.
*
- * @exception Exception A generic exception.
+ * @throws Exception A generic exception.
*/
void updateLastLogin()
throws Exception;
Modified:
turbine/core/trunk/src/java/org/apache/turbine/pipeline/AbstractValve.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/pipeline/AbstractValve.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/pipeline/AbstractValve.java
(original)
+++ turbine/core/trunk/src/java/org/apache/turbine/pipeline/AbstractValve.java
Fri Dec 9 13:19:59 2016
@@ -39,7 +39,7 @@ public abstract class AbstractValve
/**
* Initialize this valve for use in a pipeline.
*
- * @throws Exception
+ * @throws Exception if initialization fails
*/
@Override
public void initialize()
@@ -57,8 +57,9 @@ public abstract class AbstractValve
/**
- * utility for getting RunData out of the pipelineData object.
- * @param pipelineData
+ * Utility for getting RunData out of the pipelineData object.
+ *
+ * @param pipelineData Turbine request data
* @return the RunData object extracted from pipelineData
*/
public final RunData getRunData(PipelineData pipelineData)
@@ -69,5 +70,4 @@ public abstract class AbstractValve
}
return (RunData)pipelineData;
}
-
}
Modified:
turbine/core/trunk/src/java/org/apache/turbine/pipeline/CleanUpValve.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/pipeline/CleanUpValve.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/pipeline/CleanUpValve.java
(original)
+++ turbine/core/trunk/src/java/org/apache/turbine/pipeline/CleanUpValve.java
Fri Dec 9 13:19:59 2016
@@ -54,6 +54,7 @@ public class CleanUpValve
/**
* @see org.apache.turbine.pipeline.Valve#invoke(PipelineData,
ValveContext)
*/
+ @Override
public void invoke(PipelineData pipelineData, ValveContext context)
throws IOException, TurbineException
{
@@ -76,7 +77,6 @@ public class CleanUpValve
* @param pipelineData The run-time data.
*/
protected void cleanUp(PipelineData pipelineData)
- throws Exception
{
RunData data = getRunData(pipelineData);
// If a module has set data.acl = null, remove acl from
Modified:
turbine/core/trunk/src/java/org/apache/turbine/pipeline/DefaultLoginValve.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/pipeline/DefaultLoginValve.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/pipeline/DefaultLoginValve.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/pipeline/DefaultLoginValve.java
Fri Dec 9 13:19:59 2016
@@ -85,6 +85,8 @@ public class DefaultLoginValve
* string, and access control.
*
* @param pipelineData The run-time data.
+ *
+ * @throws Exception if executing the action fails
*/
protected void process(PipelineData pipelineData)
throws Exception
@@ -145,15 +147,13 @@ public class DefaultLoginValve
data.setAction(null);
}
}
+
/**
* cleans the Velocity Context if available.
*
* @param data A RunData Object
- *
- * @throws Exception A problem while cleaning out the Template Context
occurred.
*/
private void cleanupTemplateContext(RunData data)
- throws Exception
{
// This is Velocity specific and shouldn't be done here.
// But this is a band aid until we get real listeners
Modified:
turbine/core/trunk/src/java/org/apache/turbine/pipeline/DetermineRedirectRequestedValve.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/pipeline/DetermineRedirectRequestedValve.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/pipeline/DetermineRedirectRequestedValve.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/pipeline/DetermineRedirectRequestedValve.java
Fri Dec 9 13:19:59 2016
@@ -57,14 +57,7 @@ public class DetermineRedirectRequestedV
public void invoke(PipelineData pipelineData, ValveContext context)
throws IOException, TurbineException
{
- try
- {
- redirectRequested(pipelineData);
- }
- catch (Exception e)
- {
- throw new TurbineException(e);
- }
+ redirectRequested(pipelineData);
// Pass control to the next Valve in the Pipeline
context.invokeNext(pipelineData);
@@ -74,9 +67,11 @@ public class DetermineRedirectRequestedV
* Perform clean up after processing the request.
*
* @param pipelineData The run-time data.
+ *
+ * @throws IOException if sending the redirect fails
*/
protected void redirectRequested(PipelineData pipelineData)
- throws Exception
+ throws IOException
{
RunData data = getRunData(pipelineData);
// handle a redirect request
Modified:
turbine/core/trunk/src/java/org/apache/turbine/pipeline/ExecutePageValve.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/pipeline/ExecutePageValve.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/pipeline/ExecutePageValve.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/pipeline/ExecutePageValve.java
Fri Dec 9 13:19:59 2016
@@ -78,6 +78,8 @@ public class ExecutePageValve
* execute the page generation.
*
* @param pipelineData The run-time data.
+ *
+ * @throws Exception if the page execution fails
*/
protected void executePage(PipelineData pipelineData)
throws Exception
Modified: turbine/core/trunk/src/java/org/apache/turbine/pipeline/Pipeline.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/pipeline/Pipeline.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/pipeline/Pipeline.java
(original)
+++ turbine/core/trunk/src/java/org/apache/turbine/pipeline/Pipeline.java Fri
Dec 9 13:19:59 2016
@@ -64,7 +64,7 @@ public interface Pipeline
*
* @param valve Valve to be added.
*
- * @exception IllegalStateException If the pipeline has not been
+ * @throws IllegalStateException If the pipeline has not been
* initialized.
*/
void addValve(Valve valve);
Modified:
turbine/core/trunk/src/java/org/apache/turbine/pipeline/PipelineData.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/pipeline/PipelineData.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/pipeline/PipelineData.java
(original)
+++ turbine/core/trunk/src/java/org/apache/turbine/pipeline/PipelineData.java
Fri Dec 9 13:19:59 2016
@@ -59,6 +59,9 @@ public interface PipelineData
*
* @param key the key class
* @param innerKey the key into the value map
+ *
+ * @param <T> the type of the inner key
+ *
* @return the inner value or null if no such keys exist
*/
public <T> T get(Class<?> key, Class<T> innerKey);
Modified: turbine/core/trunk/src/java/org/apache/turbine/pipeline/Valve.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/pipeline/Valve.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/pipeline/Valve.java
(original)
+++ turbine/core/trunk/src/java/org/apache/turbine/pipeline/Valve.java Fri Dec
9 13:19:59 2016
@@ -86,8 +86,8 @@ public interface Valve
* @param context The valve context used to invoke the next valve
* in the current processing pipeline
*
- * @exception IOException Thrown by a subsequent Valve.
- * @exception TurbineException Thrown by a subsequent Valve.
+ * @throws IOException Thrown by a subsequent Valve.
+ * @throws TurbineException Thrown by a subsequent Valve.
*/
public void invoke(PipelineData pipelineData, ValveContext context)
throws IOException, TurbineException;
Modified:
turbine/core/trunk/src/java/org/apache/turbine/pipeline/ValveContext.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/pipeline/ValveContext.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/pipeline/ValveContext.java
(original)
+++ turbine/core/trunk/src/java/org/apache/turbine/pipeline/ValveContext.java
Fri Dec 9 13:19:59 2016
@@ -59,9 +59,9 @@ public interface ValveContext
* @param pipelineData The run-time information, including the servlet
* request and response we are processing.
*
- * @exception IOException Thrown by a subsequent Valve.
- * @exception TurbineException Thrown by a subsequent Valve.
- * @exception TurbineException No further Valves configured in the
+ * @throws IOException Thrown by a subsequent Valve.
+ * @throws TurbineException Thrown by a subsequent Valve.
+ * @throws TurbineException No further Valves configured in the
* Pipeline currently being processed.
*/
public void invokeNext(PipelineData pipelineData)
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/BaseInitable.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/BaseInitable.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/BaseInitable.java
(original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/BaseInitable.java
Fri Dec 9 13:19:59 2016
@@ -81,7 +81,7 @@ public class BaseInitable
* activities.
*
* @param data An Object to use for initialization activities.
- * @exception InitializationException Initialization of this
+ * @throws InitializationException Initialization of this
* class was not successful.
*/
@Override
@@ -97,7 +97,7 @@ public class BaseInitable
*
* Late initialization of a BaseInitable is always successful.
*
- * @exception InitializationException Initialization of this
+ * @throws InitializationException Initialization of this
* class was not successful.
*/
@Override
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/BaseInitableBroker.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/BaseInitableBroker.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/services/BaseInitableBroker.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/services/BaseInitableBroker.java
Fri Dec 9 13:19:59 2016
@@ -46,7 +46,7 @@ import org.apache.commons.logging.LogFac
* parties.</li>
*
* <li>Maintaining dependencies between <code>Initables</code> during
- * early initalization phases, including circular dependencies
+ * early initialization phases, including circular dependencies
* detection.</li>
*
* </ul>
@@ -90,7 +90,7 @@ public abstract class BaseInitableBroker
*
* @param className The name of the class to be initialized.
* @param data An Object to be used for initialization activities.
- * @exception InitializationException Initialization was not successful.
+ * @throws InitializationException Initialization was not successful.
*/
@Override
public void initClass(String className, Object data)
@@ -170,7 +170,7 @@ public abstract class BaseInitableBroker
*
* @param className The name of the Initable requested.
* @return An instance of the requested Initable.
- * @exception InstantiationException if there was a problem
+ * @throws InstantiationException if there was a problem
* during instantiation or initialization of the Initable.
*/
@Override
@@ -219,7 +219,10 @@ public abstract class BaseInitableBroker
* then returned.
*
* @param className The name of the class to be instantiated.
- * @exception InstantiationException if the requested class can't
+ *
+ * @return an instance of the requested class
+ *
+ * @throws InstantiationException if the requested class can't
* be instantiated.
*/
protected Initable getInitableInstance(String className)
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/BaseServiceBroker.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/BaseServiceBroker.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/services/BaseServiceBroker.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/services/BaseServiceBroker.java
Fri Dec 9 13:19:59 2016
@@ -43,9 +43,8 @@ import org.apache.commons.logging.LogFac
* pluggable service implementations.</li>
* <li>Providing <code>Services</code> with a configuration based on
* system wide configuration mechanism.</li>
- * </ul>
* <li>Integration of TurbineServiceProviders for looking up
- * non-local services
+ * non-local services</li>
* </ul>
*
* @author <a href="mailto:[email protected]";>Kevin Burton</a>
@@ -360,7 +359,7 @@ public abstract class BaseServiceBroker
* @param name The name of the service (generally the
* <code>SERVICE_NAME</code> constant of the service's interface
* definition).
- * @exception InitializationException Initialization of this
+ * @throws InitializationException Initialization of this
* service was not successful.
*/
@Override
@@ -535,7 +534,7 @@ public abstract class BaseServiceBroker
*
* @param name The name of the Service requested.
* @return An instance of requested Service.
- * @exception InstantiationException if the service is unknown or
+ * @throws InstantiationException if the service is unknown or
* can't be initialized.
*/
@Override
@@ -603,7 +602,10 @@ public abstract class BaseServiceBroker
* instances.
*
* @param name The name of the service requested.
- * @exception InstantiationException The service is unknown or
+ *
+ * @return the Service instance
+ *
+ * @throws InstantiationException The service is unknown or
* can't be initialized.
*/
protected Service getServiceInstance(String name)
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/Initable.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/Initable.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/Initable.java
(original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/Initable.java Fri
Dec 9 13:19:59 2016
@@ -60,7 +60,7 @@ public interface Initable
* throw an exception and complain.
*
* @param data An Object to use for initialization activities.
- * @exception InitializationException if initialization of this
+ * @throws InitializationException if initialization of this
* class was not successful.
*/
void init(Object data) throws InitializationException;
@@ -72,7 +72,7 @@ public interface Initable
* will call getInit(), and if it returns false, this method will
* be invoked.
*
- * @exception InitializationException if initialization of this
+ * @throws InitializationException if initialization of this
* class was not successful.
*/
void init() throws InitializationException;
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/InitableBroker.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/InitableBroker.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/InitableBroker.java
(original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/InitableBroker.java
Fri Dec 9 13:19:59 2016
@@ -64,7 +64,7 @@ public interface InitableBroker
*
* @param className The name of the class to be initialized.
* @param data An object to be used for initialization activities.
- * @exception InitializationException if initialization of this
+ * @throws InitializationException if initialization of this
* class was not successful.
*/
void initClass(String className, Object data)
@@ -91,7 +91,7 @@ public interface InitableBroker
*
* @param className The name of the Initable requested.
* @return An instance of requested Initable.
- * @exception InstantiationException if there was a problem
+ * @throws InstantiationException if there was a problem
* during instantiation or initialization of the Initable.
*/
Initable getInitable(String className) throws InstantiationException;
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/ServiceBroker.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/ServiceBroker.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/ServiceBroker.java
(original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/ServiceBroker.java
Fri Dec 9 13:19:59 2016
@@ -61,7 +61,7 @@ public interface ServiceBroker
* Performs early initialization of the specified service.
*
* @param name The name of the service.
- * @exception InitializationException if the service is unknown
+ * @throws InitializationException if the service is unknown
* or can't be initialized.
*/
void initService(String name) throws InitializationException;
@@ -89,7 +89,7 @@ public interface ServiceBroker
*
* @param name The name of the Service requested.
* @return An instance of requested Service.
- * @exception InstantiationException if the service is unknown or
+ * @throws InstantiationException if the service is unknown or
* can't be initialized.
*/
Object getService(String name) throws InstantiationException;
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/TurbineBaseService.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/TurbineBaseService.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/services/TurbineBaseService.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/services/TurbineBaseService.java
Fri Dec 9 13:19:59 2016
@@ -30,7 +30,7 @@ import org.apache.turbine.util.RunData;
* functionality provided in addition to <code>BaseService</code>
* functionality is recognizing objects used in early initialization
* of <code>Services</code> in Turbine, and passing them to
- * appropriate convenience methods. These methods should be overriden
+ * appropriate convenience methods. These methods should be overridden
* to provide desired initialization functionality.</p>
*
* <p><strong>Note!</strong><br>Remember to call
@@ -41,11 +41,11 @@ import org.apache.turbine.util.RunData;
* request initialization of that <code>Service</code> before using
* it:</p>
*
- * <pre><code>
+ * <pre>
* getServiceBroker().initClass("OtherService",data);
* OtherService service =
* (OtherService)getServiceBroker().getService("OtherService");
- * </code></pre>
+ * </pre>
*
* @author <a href="mailto:[email protected]";>Greg Ritter</a>
* @author <a href="mailto:[email protected]";>Brett McLaughlin</a>
@@ -65,7 +65,7 @@ public abstract class TurbineBaseService
* initialization and pass them to appropriate init() methods.
*
* @param data An Object to use for initialization activities.
- * @exception InitializationException if initialization of this
+ * @throws InitializationException if initialization of this
* class was not successful.
*/
@Override
@@ -86,7 +86,7 @@ public abstract class TurbineBaseService
* Performs early initialization.
*
* @param pipelineData A PipelineData to use for initialization activities.
- * @exception InitializationException if initialization of this
+ * @throws InitializationException if initialization of this
* class was not successful.
*/
public void init(PipelineData pipelineData) throws InitializationException
@@ -101,7 +101,7 @@ public abstract class TurbineBaseService
* expects was not received, you can use late initialization to
* throw an exception and complain.
*
- * @exception InitializationException, if initialization of this
+ * @throws InitializationException if initialization of this
* class was not successful.
*/
@Override
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/AssemblerBrokerService.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/AssemblerBrokerService.java?rev=1773378&r1=1773377&r2=1773378&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/AssemblerBrokerService.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/services/assemblerbroker/AssemblerBrokerService.java
Fri Dec 9 13:19:59 2016
@@ -45,6 +45,9 @@ public interface AssemblerBrokerService
* Register an AssemblerFactory class
*
* @param factory The factory object
+ *
+ * @param <T> the type of the assembler
+ *
*/
<T extends Assembler> void registerFactory(AssemblerFactory<T> factory);
@@ -53,6 +56,9 @@ public interface AssemblerBrokerService
*
* @param type The Type of the Assembler
* @param name The Name of the Assembler
+ *
+ * @param <T> the type of the assembler
+ *
* @return An Assembler object for the requested name and type
*
* @throws TurbineException Something went wrong while looking for the
Assembler
@@ -63,6 +69,9 @@ public interface AssemblerBrokerService
* 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
*/
<T extends Assembler> Loader<T> getLoader(Class<T> type);
