You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by ch...@apache.org on 2001/03/06 23:40:47 UTC
cvs commit: jakarta-turbine/src/java/org/apache/turbine/util/db/adapter DBInstantDB.java
chrise 01/03/06 14:40:47
Modified: src/java/org/apache/turbine Turbine.java
src/java/org/apache/turbine/modules Action.java
ActionEvent.java ActionLoader.java
GenericLoader.java Layout.java LayoutLoader.java
Navigation.java NavigationLoader.java Page.java
PageLoader.java ScheduledJobLoader.java Screen.java
ScreenLoader.java
src/java/org/apache/turbine/modules/actions
VelocitySecureAction.java
WebMacroSiteSecureAction.java
src/java/org/apache/turbine/modules/layouts
FreeMarkerSiteLayout.java JspLayout.java
VelocityECSLayout.java VelocityOnlyLayout.java
WebMacroOnlyLayout.java WebMacroSiteLayout.java
src/java/org/apache/turbine/modules/navigations
VelocityNavigation.java WebMacroSiteNavigation.java
src/java/org/apache/turbine/modules/screens
JspErrorScreen.java VelocityErrorScreen.java
VelocityScreen.java VelocitySecureScreen.java
WebMacroSiteErrorScreen.java
WebMacroSiteScreen.java
WebMacroSiteSecureScreen.java
src/java/org/apache/turbine/services/cache CachedObject.java
ObjectExpiredException.java
RefreshableCachedObject.java
src/java/org/apache/turbine/services/jsp
TurbineJspService.java
src/java/org/apache/turbine/services/webmacro
WebMacroService.java
src/java/org/apache/turbine/services/xmlrpc
TurbineXmlRpcService.java
src/java/org/apache/turbine/services/xslt TurbineXSLT.java
src/java/org/apache/turbine/util StringStackBuffer.java
src/java/org/apache/turbine/util/db/adapter DBInstantDB.java
Log:
Miscellanous javadoc fixes, mostly syntax errors that prevented generation
of existing docs without causing compiler errors
Revision Changes Path
1.49 +2 -2 jakarta-turbine/src/java/org/apache/turbine/Turbine.java
Index: Turbine.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/Turbine.java,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- Turbine.java 2001/03/02 21:04:38 1.48
+++ Turbine.java 2001/03/06 22:40:22 1.49
@@ -103,7 +103,7 @@
* application server does not support web applications, or the or does not
* support <code>ServletContext.getRealPath(String)</code> method correctly.
* You can use this parameter to specify the directory within the server's
- * filesystem, that is the base of your web application.<li>
+ * filesystem, that is the base of your web application.</li>
* </ul><br>
*
* @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
@@ -112,7 +112,7 @@
* @author <a href="mailto:john.mcnally@clearink.com">John D. McNally</a>
* @author <a href="mailto:frank.kim@clearink.com">Frank Y. Kim</a>
* @author <a href="mailto:krzewski@e-point.pl">Rafal Krzewski</a>
- * @version $Id: Turbine.java,v 1.48 2001/03/02 21:04:38 jon Exp $
+ * @version $Id: Turbine.java,v 1.49 2001/03/06 22:40:22 chrise Exp $
*/
public class Turbine extends HttpServlet
{
1.5 +3 -3 jakarta-turbine/src/java/org/apache/turbine/modules/Action.java
Index: Action.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/Action.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Action.java 2001/03/06 04:50:41 1.4
+++ Action.java 2001/03/06 22:40:24 1.5
@@ -61,7 +61,7 @@
* Generic Action class.
*
* @author <a href="mailto:mbryson@mont.mindspring.com">Dave Bryson</a>
- * @version $Id: Action.java,v 1.4 2001/03/06 04:50:41 chrise Exp $
+ * @version $Id: Action.java,v 1.5 2001/03/06 22:40:24 chrise Exp $
*/
public abstract class Action extends Assembler
{
@@ -70,7 +70,7 @@
* Action can also set the screen that is associated with RunData.
*
* @param data Turbine information.
- * @exception Exception, a generic exception.
+ * @exception Exception a generic exception.
*/
public abstract void doPerform( RunData data )
throws Exception;
@@ -81,7 +81,7 @@
* use ActionLoader to perform an Action.
*
* @param data Turbine information.
- * @exception Exception, a generic exception.
+ * @exception Exception a generic exception.
*/
protected void perform( RunData data )
throws Exception
1.9 +4 -4 jakarta-turbine/src/java/org/apache/turbine/modules/ActionEvent.java
Index: ActionEvent.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/ActionEvent.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ActionEvent.java 2001/03/06 04:50:41 1.8
+++ ActionEvent.java 2001/03/06 22:40:24 1.9
@@ -102,7 +102,7 @@
* method naming in your Action class.
*
* @author <a href="mailto:jon@latchkey.com">Jon S. Stevens </a>
- * @version $Id: ActionEvent.java,v 1.8 2001/03/06 04:50:41 chrise Exp $
+ * @version $Id: ActionEvent.java,v 1.9 2001/03/06 22:40:24 chrise Exp $
*/
public abstract class ActionEvent extends Action
{
@@ -110,7 +110,7 @@
* You need to implement this in your classes that extend this class.
*
* @param data Turbine information.
- * @exception Exception, a generic exception.
+ * @exception Exception a generic exception.
*/
public abstract void doPerform( RunData data )
throws Exception;
@@ -132,7 +132,7 @@
* doPerform() method instead.
*
* @param data Turbine information.
- * @exception Exception, a generic exception.
+ * @exception Exception a generic exception.
*/
protected void perform( RunData data )
throws Exception
@@ -151,7 +151,7 @@
* This method should be called to execute the event based system.
*
* @param data Turbine information.
- * @exception Exception, a generic exception.
+ * @exception Exception a generic exception.
*/
public void executeEvents(RunData data)
throws Exception
1.7 +3 -3 jakarta-turbine/src/java/org/apache/turbine/modules/ActionLoader.java
Index: ActionLoader.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/ActionLoader.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ActionLoader.java 2001/03/06 04:50:41 1.6
+++ ActionLoader.java 2001/03/06 22:40:25 1.7
@@ -68,7 +68,7 @@
* Action modules.
*
* @author <a href="mailto:mbryson@mont.mindspring.com">Dave Bryson</a>
- * @version $Id: ActionLoader.java,v 1.6 2001/03/06 04:50:41 chrise Exp $
+ * @version $Id: ActionLoader.java,v 1.7 2001/03/06 22:40:25 chrise Exp $
*/
public class ActionLoader extends GenericLoader
{
@@ -112,7 +112,7 @@
*
* @param data Turbine information.
* @param name Name of object that will execute the action.
- * @exception Exception, a generic exception.
+ * @exception Exception a generic exception.
*/
public void exec ( RunData data,
String name )
@@ -128,7 +128,7 @@
*
* @param name Name of object instance.
* @return An Action with the specified name, or null.
- * @exception Exception, a generic exception.
+ * @exception Exception a generic exception.
*/
public Action getInstance (String name)
throws Exception
1.4 +2 -2 jakarta-turbine/src/java/org/apache/turbine/modules/GenericLoader.java
Index: GenericLoader.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/GenericLoader.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- GenericLoader.java 2001/03/06 04:50:41 1.3
+++ GenericLoader.java 2001/03/06 22:40:25 1.4
@@ -67,7 +67,7 @@
* that is required to be called a Loader.
*
* @author <a href="mailto:mbryson@mont.mindspring.com">Dave Bryson</a>
- * @version $Id: GenericLoader.java,v 1.3 2001/03/06 04:50:41 chrise Exp $
+ * @version $Id: GenericLoader.java,v 1.4 2001/03/06 22:40:25 chrise Exp $
*/
public abstract class GenericLoader extends Hashtable
{
@@ -110,7 +110,7 @@
* Attempts to load and execute the external action that has been
* set.
*
- * @exception Exception, a generic exception.
+ * @exception Exception a generic exception.
*/
public abstract void exec ( RunData data,
String name )
1.4 +3 -3 jakarta-turbine/src/java/org/apache/turbine/modules/Layout.java
Index: Layout.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/Layout.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Layout.java 2001/03/06 04:50:41 1.3
+++ Layout.java 2001/03/06 22:40:25 1.4
@@ -61,7 +61,7 @@
* This is an interface that defines what a Layout module is.
*
* @author <a href="mailto:mbryson@mont.mindspring.com">Dave Bryson</a>
- * @version $Id: Layout.java,v 1.3 2001/03/06 04:50:41 chrise Exp $
+ * @version $Id: Layout.java,v 1.4 2001/03/06 22:40:25 chrise Exp $
*/
public abstract class Layout extends Assembler
{
@@ -72,7 +72,7 @@
* RunData.
*
* @param data Turbine information.
- * @exception Exception, a generic exception.
+ * @exception Exception a generic exception.
*/
protected abstract void doBuild( RunData data )
throws Exception;
@@ -83,7 +83,7 @@
* use LayoutLoader to build a Layout.
*
* @param data Turbine information.
- * @exception Exception, a generic exception.
+ * @exception Exception a generic exception.
*/
protected void build( RunData data )
throws Exception
1.7 +3 -3 jakarta-turbine/src/java/org/apache/turbine/modules/LayoutLoader.java
Index: LayoutLoader.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/LayoutLoader.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- LayoutLoader.java 2001/03/06 04:50:41 1.6
+++ LayoutLoader.java 2001/03/06 22:40:26 1.7
@@ -68,7 +68,7 @@
* Layout modules.
*
* @author <a href="mailto:mbryson@mont.mindspring.com">Dave Bryson</a>
- * @version $Id: LayoutLoader.java,v 1.6 2001/03/06 04:50:41 chrise Exp $
+ * @version $Id: LayoutLoader.java,v 1.7 2001/03/06 22:40:26 chrise Exp $
*/
public class LayoutLoader extends GenericLoader
{
@@ -112,7 +112,7 @@
*
* @param data Turbine information.
* @param name Name of object that will execute the layout.
- * @exception Exception, a generic exception.
+ * @exception Exception a generic exception.
*/
public void exec ( RunData data,
String name )
@@ -128,7 +128,7 @@
*
* @param name Name of object instance.
* @return A Layout with the specified name, or null.
- * @exception Exception, a generic exception.
+ * @exception Exception a generic exception.
*/
public Layout getInstance (String name)
throws Exception
1.4 +3 -3 jakarta-turbine/src/java/org/apache/turbine/modules/Navigation.java
Index: Navigation.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/Navigation.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Navigation.java 2001/03/06 04:50:41 1.3
+++ Navigation.java 2001/03/06 22:40:26 1.4
@@ -65,7 +65,7 @@
* This is an interface that defines what a Navigation module is.
*
* @author <a href="mailto:mbryson@mont.mindspring.com">Dave Bryson</a>
- * @version $Id: Navigation.java,v 1.3 2001/03/06 04:50:41 chrise Exp $
+ * @version $Id: Navigation.java,v 1.4 2001/03/06 22:40:26 chrise Exp $
*/
public abstract class Navigation extends Assembler
{
@@ -78,7 +78,7 @@
* referenced in RunData.
*
* @param data Turbine information.
- * @exception Exception, a generic exception.
+ * @exception Exception a generic exception.
*/
protected abstract ConcreteElement doBuild( RunData data )
throws Exception;
@@ -89,7 +89,7 @@
* use NavigationLoader to build a Navigation.
*
* @param data Turbine information.
- * @exception Exception, a generic exception.
+ * @exception Exception a generic exception.
*/
protected ConcreteElement build( RunData data )
throws Exception
1.7 +4 -4 jakarta-turbine/src/java/org/apache/turbine/modules/NavigationLoader.java
Index: NavigationLoader.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/NavigationLoader.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- NavigationLoader.java 2001/03/06 04:50:41 1.6
+++ NavigationLoader.java 2001/03/06 22:40:26 1.7
@@ -71,7 +71,7 @@
* Navigation modules.
*
* @author <a href="mailto:mbryson@mont.mindspring.com">Dave Bryson</a>
- * @version $Id: NavigationLoader.java,v 1.6 2001/03/06 04:50:41 chrise Exp $
+ * @version $Id: NavigationLoader.java,v 1.7 2001/03/06 22:40:26 chrise Exp $
*/
public class NavigationLoader extends GenericLoader
{
@@ -119,7 +119,7 @@
*
* @param data Turbine information.
* @param name Name of object that will execute the navigation.
- * @exception Exception, a generic exception.
+ * @exception Exception a generic exception.
*/
public ConcreteElement eval ( RunData data,
String name )
@@ -134,7 +134,7 @@
*
* @param data Turbine information.
* @param name Name of object instance.
- * @exception Exception, a generic exception.
+ * @exception Exception a generic exception.
*/
public void exec ( RunData data,
String name )
@@ -149,7 +149,7 @@
*
* @param name Name of object instance.
* @return A Layout with the specified name, or null.
- * @exception Exception, a generic exception.
+ * @exception Exception a generic exception.
*/
public Navigation getInstance (String name)
throws Exception
1.4 +3 -3 jakarta-turbine/src/java/org/apache/turbine/modules/Page.java
Index: Page.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/Page.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Page.java 2001/03/06 04:50:41 1.3
+++ Page.java 2001/03/06 22:40:26 1.4
@@ -61,7 +61,7 @@
* This is an interface that defines what a Page module is.
*
* @author <a href="mailto:mbryson@mont.mindspring.com">Dave Bryson</a>
- * @version $Id: Page.java,v 1.3 2001/03/06 04:50:41 chrise Exp $
+ * @version $Id: Page.java,v 1.4 2001/03/06 22:40:26 chrise Exp $
*/
public abstract class Page extends Assembler
{
@@ -71,7 +71,7 @@
* to write the page to the output stream referenced in RunData.
*
* @param data Turbine information.
- * @exception Exception, a generic exception.
+ * @exception Exception a generic exception.
*/
protected abstract void doBuild( RunData data )
throws Exception;
@@ -82,7 +82,7 @@
* use PageLoader to build a Page.
*
* @param data Turbine information.
- * @exception Exception, a generic exception.
+ * @exception Exception a generic exception.
*/
protected void build( RunData data )
throws Exception
1.8 +3 -3 jakarta-turbine/src/java/org/apache/turbine/modules/PageLoader.java
Index: PageLoader.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/PageLoader.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- PageLoader.java 2001/03/06 04:50:41 1.7
+++ PageLoader.java 2001/03/06 22:40:27 1.8
@@ -69,7 +69,7 @@
* modules.
*
* @author <a href="mailto:mbryson@mont.mindspring.com">Dave Bryson</a>
- * @version $Id: PageLoader.java,v 1.7 2001/03/06 04:50:41 chrise Exp $
+ * @version $Id: PageLoader.java,v 1.8 2001/03/06 22:40:27 chrise Exp $
*/
public class PageLoader extends GenericLoader
{
@@ -113,7 +113,7 @@
*
* @param data Turbine information.
* @param name Name of object that will execute the page.
- * @exception Exception, a generic exception.
+ * @exception Exception a generic exception.
*/
public void exec ( RunData data,
String name )
@@ -129,7 +129,7 @@
*
* @param name Name of object instance.
* @return A Page with the specified name, or null.
- * @exception Exception, a generic exception.
+ * @exception Exception a generic exception.
*/
public Page getInstance (String name)
throws Exception
1.6 +4 -4 jakarta-turbine/src/java/org/apache/turbine/modules/ScheduledJobLoader.java
Index: ScheduledJobLoader.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/ScheduledJobLoader.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ScheduledJobLoader.java 2001/03/06 04:50:41 1.5
+++ ScheduledJobLoader.java 2001/03/06 22:40:27 1.6
@@ -70,7 +70,7 @@
* ScheduledJobs loader class.
*
* @author <a href="mailto:mbryson@mindspring.com">Dave Bryson</a>
- * @version $Id: ScheduledJobLoader.java,v 1.5 2001/03/06 04:50:41 chrise Exp $
+ * @version $Id: ScheduledJobLoader.java,v 1.6 2001/03/06 22:40:27 chrise Exp $
*/
public class ScheduledJobLoader extends GenericLoader
{
@@ -114,7 +114,7 @@
*
* @param job The JobEntry.
* @param name Name of object that will execute the job.
- * @exception Exception, a generic exception.
+ * @exception Exception a generic exception.
*/
public void exec ( JobEntry job,
String name )
@@ -136,7 +136,7 @@
*
* @param data Turbine information.
* @param name Name of object that will execute the job.
- * @exception Exception, a generic exception.
+ * @exception Exception a generic exception.
*/
public void exec(RunData data,
String name)
@@ -151,7 +151,7 @@
*
* @param name Name of object instance.
* @return An ScheduledJob with the specified name, or null.
- * @exception Exception, a generic exception.
+ * @exception Exception a generic exception.
*/
public ScheduledJob getInstance (String name)
throws Exception
1.4 +3 -3 jakarta-turbine/src/java/org/apache/turbine/modules/Screen.java
Index: Screen.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/Screen.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Screen.java 2001/03/06 04:50:41 1.3
+++ Screen.java 2001/03/06 22:40:27 1.4
@@ -65,7 +65,7 @@
* This is an interface that defines the Screen modules.
*
* @author <a href="mailto:mbryson@mont.mindspring.com">Dave Bryson</a>
- * @version $Id: Screen.java,v 1.3 2001/03/06 04:50:41 chrise Exp $
+ * @version $Id: Screen.java,v 1.4 2001/03/06 22:40:27 chrise Exp $
*/
public abstract class Screen extends Assembler
{
@@ -79,7 +79,7 @@
* RunData.
*
* @param data Turbine information.
- * @exception Exception, a generic exception.
+ * @exception Exception a generic exception.
*/
protected abstract ConcreteElement doBuild( RunData data )
throws Exception;
@@ -90,7 +90,7 @@
* use ScreenLoader to build a Screen.
*
* @param data Turbine information.
- * @exception Exception, a generic exception.
+ * @exception Exception a generic exception.
*/
protected ConcreteElement build( RunData data )
throws Exception
1.8 +4 -4 jakarta-turbine/src/java/org/apache/turbine/modules/ScreenLoader.java
Index: ScreenLoader.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/ScreenLoader.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ScreenLoader.java 2001/03/06 04:50:41 1.7
+++ ScreenLoader.java 2001/03/06 22:40:27 1.8
@@ -71,7 +71,7 @@
* Screen modules.
*
* @author <a href="mailto:mbryson@mont.mindspring.com">Dave Bryson</a>
- * @version $Id: ScreenLoader.java,v 1.7 2001/03/06 04:50:41 chrise Exp $
+ * @version $Id: ScreenLoader.java,v 1.8 2001/03/06 22:40:27 chrise Exp $
*/
public class ScreenLoader extends GenericLoader
{
@@ -119,7 +119,7 @@
*
* @param data Turbine information.
* @param name Name of object that will execute the screen.
- * @exception Exception, a generic exception.
+ * @exception Exception a generic exception.
*/
public ConcreteElement eval ( RunData data,
String name )
@@ -136,7 +136,7 @@
*
* @param data Turbine information.
* @param name Name of object that will execute the screen.
- * @exception Exception, a generic exception.
+ * @exception Exception a generic exception.
*/
public void exec ( RunData data,
String name )
@@ -151,7 +151,7 @@
*
* @param name Name of object instance.
* @return A Screen with the specified name, or null.
- * @exception Exception, a generic exception.
+ * @exception Exception a generic exception.
*/
public Screen getInstance (String name)
throws Exception
1.4 +4 -5 jakarta-turbine/src/java/org/apache/turbine/modules/actions/VelocitySecureAction.java
Index: VelocitySecureAction.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/actions/VelocitySecureAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- VelocitySecureAction.java 2001/03/06 04:50:43 1.3
+++ VelocitySecureAction.java 2001/03/06 22:40:31 1.4
@@ -58,8 +58,8 @@
import org.apache.velocity.context.Context;
-/*
- * WebMacroSiteSecure action.
+/**
+ * VelocitySecure action.
*
* Always performs a Security Check that you've defined before
* executing the doBuildtemplate(). You should extend this class and
@@ -67,13 +67,12 @@
* screens that need to perform the same check, you could make a base
* screen by extending this class and implementing the isAuthorized().
* Then each action that needs to perform the same check could extend
- * your base action. To make things easy you could also use the
- * WebMacroSecuritCheck utility. See the util/webmacro directory.
+ * your base action.
*
* @author <a href="mailto:mbryson@mont.mindspring.com">Dave Bryson</a>
* @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
* @author <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
- * @version $Id: VelocitySecureAction.java,v 1.3 2001/03/06 04:50:43 chrise Exp $
+ * @version $Id: VelocitySecureAction.java,v 1.4 2001/03/06 22:40:31 chrise Exp $
*/
public abstract class VelocitySecureAction extends VelocityAction
{
1.4 +3 -4 jakarta-turbine/src/java/org/apache/turbine/modules/actions/WebMacroSiteSecureAction.java
Index: WebMacroSiteSecureAction.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/actions/WebMacroSiteSecureAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- WebMacroSiteSecureAction.java 2001/03/06 04:50:43 1.3
+++ WebMacroSiteSecureAction.java 2001/03/06 22:40:31 1.4
@@ -62,7 +62,7 @@
// WebMacro
import org.webmacro.servlet.*;
-/*
+/**
* WebMacroSiteSecure action.
*
* Always performs a Security Check that you've defined before
@@ -71,12 +71,11 @@
* screens that need to perform the same check, you could make a base
* screen by extending this class and implementing the isAuthorized().
* Then each action that needs to perform the same check could extend
- * your base action. To make things easy you could also use the
- * WebMacroSecuritCheck utility. See the util/webmacro directory.
+ * your base action.
*
* @author <a href="mailto:mbryson@mont.mindspring.com">Dave Bryson</a>
* @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
- * @version $Id: WebMacroSiteSecureAction.java,v 1.3 2001/03/06 04:50:43 chrise Exp $
+ * @version $Id: WebMacroSiteSecureAction.java,v 1.4 2001/03/06 22:40:31 chrise Exp $
*/
public abstract class WebMacroSiteSecureAction extends WebMacroSiteAction
{
1.6 +2 -2 jakarta-turbine/src/java/org/apache/turbine/modules/layouts/FreeMarkerSiteLayout.java
Index: FreeMarkerSiteLayout.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/layouts/FreeMarkerSiteLayout.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- FreeMarkerSiteLayout.java 2001/03/06 04:50:45 1.5
+++ FreeMarkerSiteLayout.java 2001/03/06 22:40:32 1.6
@@ -72,14 +72,14 @@
// FreeMarker Stuff
import freemarker.template.*;
-/*
+/**
* FreeMarker Site Layout. This Layout module allows FreeMarker
* templates to be used as layouts. Since dynamic content is supposed
* to be primarily located in screens and navigations there should be
* relatively few reasons to subclass this Layout.
*
* @author <a href="mailto:john.mcnally@clearink.com">John D. McNally</a>
- * @version $Id: FreeMarkerSiteLayout.java,v 1.5 2001/03/06 04:50:45 chrise Exp $
+ * @version $Id: FreeMarkerSiteLayout.java,v 1.6 2001/03/06 22:40:32 chrise Exp $
*/
public class FreeMarkerSiteLayout extends Layout
{
1.4 +4 -5 jakarta-turbine/src/java/org/apache/turbine/modules/layouts/JspLayout.java
Index: JspLayout.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/layouts/JspLayout.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JspLayout.java 2001/03/06 04:50:45 1.3
+++ JspLayout.java 2001/03/06 22:40:32 1.4
@@ -61,11 +61,10 @@
import org.apache.turbine.services.jsp.util.*;
-/*
- * This Layout module allows JSP templates
- * to be used as layouts. Since dynamic content is supposed to be primarily
- * located in screens and navigations there should be relatively few reasons
- * to subclass this Layout.
+/**
+ * This Layout module allows JSP templates to be used as layouts. Since
+ * dynamic content is supposed to be primarily located in screens and
+ * navigations there should be relatively few reasons to subclass this Layout.
*
* @author <a href="mailto:john.mcnally@clearink.com">John D. McNally</a>
*/
1.6 +2 -2 jakarta-turbine/src/java/org/apache/turbine/modules/layouts/VelocityECSLayout.java
Index: VelocityECSLayout.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/layouts/VelocityECSLayout.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- VelocityECSLayout.java 2001/03/06 04:50:45 1.5
+++ VelocityECSLayout.java 2001/03/06 22:40:33 1.6
@@ -70,7 +70,7 @@
// Velocity Stuff
import org.apache.velocity.context.Context;
-/*
+/**
* This Layout module allows Velocity templates to be used as layouts.
* Since dynamic content is supposed to be primarily located in
* screens and navigations there should be relatively few reasons to
@@ -78,7 +78,7 @@
*
* @author <a href="mailto:john.mcnally@clearink.com">John D. McNally</a>
* @author <a href="mailto:mbryson@mont.mindspring.com">Dave Bryson</a>
- * @version $Id: VelocityECSLayout.java,v 1.5 2001/03/06 04:50:45 chrise Exp $
+ * @version $Id: VelocityECSLayout.java,v 1.6 2001/03/06 22:40:33 chrise Exp $
*/
public class VelocityECSLayout extends Layout
{
1.6 +1 -1 jakarta-turbine/src/java/org/apache/turbine/modules/layouts/VelocityOnlyLayout.java
Index: VelocityOnlyLayout.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/layouts/VelocityOnlyLayout.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- VelocityOnlyLayout.java 2001/03/06 04:50:45 1.5
+++ VelocityOnlyLayout.java 2001/03/06 22:40:33 1.6
@@ -71,7 +71,7 @@
// Velocity Stuff
import org.apache.velocity.context.Context;
-/*
+/**
* This Layout module allows Velocity templates
* to be used as layouts. Since dynamic content is supposed to be primarily
* located in screens and navigations there should be relatively few reasons
1.5 +1 -1 jakarta-turbine/src/java/org/apache/turbine/modules/layouts/WebMacroOnlyLayout.java
Index: WebMacroOnlyLayout.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/layouts/WebMacroOnlyLayout.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- WebMacroOnlyLayout.java 2001/03/06 04:50:45 1.4
+++ WebMacroOnlyLayout.java 2001/03/06 22:40:33 1.5
@@ -71,7 +71,7 @@
// WebMacro Stuff
import org.webmacro.servlet.*;
-/*
+/**
* WebMacroSiteLayout Screen. This Layout module allows WebMacro templates
* to be used as layouts. Since dynamic content is supposed to be primarily
* located in screens and navigations there should be relatively few reasons
1.7 +2 -2 jakarta-turbine/src/java/org/apache/turbine/modules/layouts/WebMacroSiteLayout.java
Index: WebMacroSiteLayout.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/layouts/WebMacroSiteLayout.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- WebMacroSiteLayout.java 2001/03/06 04:50:45 1.6
+++ WebMacroSiteLayout.java 2001/03/06 22:40:34 1.7
@@ -71,7 +71,7 @@
// WebMacro Stuff
import org.webmacro.servlet.*;
-/*
+/**
* This Layout module allows WebMacro templates to be used as layouts.
* Since dynamic content is supposed to be primarily located in
* screens and navigations there should be relatively few reasons to
@@ -79,7 +79,7 @@
*
* @author <a href="mailto:john.mcnally@clearink.com">John D. McNally</a>
* @author <a href="mailto:mbryson@mont.mindspring.com">Dave Bryson</a>
- * @version $Id: WebMacroSiteLayout.java,v 1.6 2001/03/06 04:50:45 chrise Exp $
+ * @version $Id: WebMacroSiteLayout.java,v 1.7 2001/03/06 22:40:34 chrise Exp $
*/
public class WebMacroSiteLayout extends Layout
{
1.5 +2 -2 jakarta-turbine/src/java/org/apache/turbine/modules/navigations/VelocityNavigation.java
Index: VelocityNavigation.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/navigations/VelocityNavigation.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- VelocityNavigation.java 2001/03/06 04:50:46 1.4
+++ VelocityNavigation.java 2001/03/06 22:40:35 1.5
@@ -70,7 +70,7 @@
import org.apache.turbine.services.velocity.*;
import org.apache.velocity.context.Context;
-/*
+/**
* VelocityNavigation. This screen relies on the VelocityPage
* being set as the default page. The doBuildTemplate() assumes the
* user has put the template filename in the RunData parameter and set
@@ -79,7 +79,7 @@
* doBuildTemplate( data , context) method.
*
* @author <a href="mailto:mbryson@mont.mindspring.com">Dave Bryson</a>
- * @version $Id: VelocityNavigation.java,v 1.4 2001/03/06 04:50:46 chrise Exp $
+ * @version $Id: VelocityNavigation.java,v 1.5 2001/03/06 22:40:35 chrise Exp $
*/
public class VelocityNavigation extends TemplateNavigation
{
1.6 +2 -2 jakarta-turbine/src/java/org/apache/turbine/modules/navigations/WebMacroSiteNavigation.java
Index: WebMacroSiteNavigation.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/navigations/WebMacroSiteNavigation.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- WebMacroSiteNavigation.java 2001/03/06 04:50:46 1.5
+++ WebMacroSiteNavigation.java 2001/03/06 22:40:36 1.6
@@ -72,7 +72,7 @@
import org.apache.turbine.services.webmacro.*;
import org.webmacro.servlet.*;
-/*
+/**
* WebMacroSiteNavigation. This screen relies on the WebMacroSitePage
* being set as the default page. This screen can be called directly
* to generate a WebMacro Screen. The doBuildTemplate() assumes the
@@ -82,7 +82,7 @@
* doBuildTemplate( data , context) method.
*
* @author <a href="mailto:mbryson@mont.mindspring.com">Dave Bryson</a>
- * @version $Id: WebMacroSiteNavigation.java,v 1.5 2001/03/06 04:50:46 chrise Exp $
+ * @version $Id: WebMacroSiteNavigation.java,v 1.6 2001/03/06 22:40:36 chrise Exp $
*/
public class WebMacroSiteNavigation extends TemplateNavigation
{
1.3 +6 -7 jakarta-turbine/src/java/org/apache/turbine/modules/screens/JspErrorScreen.java
Index: JspErrorScreen.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/screens/JspErrorScreen.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JspErrorScreen.java 2001/03/06 04:50:47 1.2
+++ JspErrorScreen.java 2001/03/06 22:40:37 1.3
@@ -61,13 +61,12 @@
import org.apache.turbine.services.resources.*;
-/*
- * JspErrorScreen screen - directs errors at the Jsp
- * error template defined in template.error.
- *
- * @author <a href="mailto:ingo@raleigh.ibm.com">Ingo Schuster</a>
- * @version $Id: JspErrorScreen.java,v 1.2 2001/03/06 04:50:47 chrise Exp $
- */
+/**
+ * Directs errors at the Jsp error template defined in template.error.
+ *
+ * @author <a href="mailto:ingo@raleigh.ibm.com">Ingo Schuster</a>
+ * @version $Id: JspErrorScreen.java,v 1.3 2001/03/06 22:40:37 chrise Exp $
+ */
public class JspErrorScreen extends BaseJspScreen
{
/**
1.5 +2 -2 jakarta-turbine/src/java/org/apache/turbine/modules/screens/VelocityErrorScreen.java
Index: VelocityErrorScreen.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/screens/VelocityErrorScreen.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- VelocityErrorScreen.java 2001/03/06 04:50:47 1.4
+++ VelocityErrorScreen.java 2001/03/06 22:40:37 1.5
@@ -63,12 +63,12 @@
// Velocity
import org.apache.velocity.context.Context;
-/*
+/**
* VelocityErrorScreen screen - directs errors at the velocity
* error template defined in template.error.
*
* @author <a href="mailto:gonzalo.diethelm@sonda.com">Gonzalo Diethelm</a>
- * @version $Id: VelocityErrorScreen.java,v 1.4 2001/03/06 04:50:47 chrise Exp $
+ * @version $Id: VelocityErrorScreen.java,v 1.5 2001/03/06 22:40:37 chrise Exp $
*/
public class VelocityErrorScreen extends VelocityScreen
{
1.11 +2 -2 jakarta-turbine/src/java/org/apache/turbine/modules/screens/VelocityScreen.java
Index: VelocityScreen.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/screens/VelocityScreen.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- VelocityScreen.java 2001/03/06 04:50:47 1.10
+++ VelocityScreen.java 2001/03/06 22:40:37 1.11
@@ -71,7 +71,7 @@
import org.apache.turbine.services.velocity.*;
import org.apache.velocity.context.Context;
-/*
+/**
* Base Velocity Screen. The buildTemplate() assumes the template
* parameter has been set in the RunData object. This provides the
* ability to execute several templates from one Screen.
@@ -82,7 +82,7 @@
* class and override the doBuildTemplate() method.
*
* @author <a href="mailto:mbryson@mont.mindspring.com">Dave Bryson</a>
- * @version $Id: VelocityScreen.java,v 1.10 2001/03/06 04:50:47 chrise Exp $
+ * @version $Id: VelocityScreen.java,v 1.11 2001/03/06 22:40:37 chrise Exp $
*/
public class VelocityScreen extends TemplateScreen
{
1.4 +2 -2 jakarta-turbine/src/java/org/apache/turbine/modules/screens/VelocitySecureScreen.java
Index: VelocitySecureScreen.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/screens/VelocitySecureScreen.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- VelocitySecureScreen.java 2001/03/06 04:50:47 1.3
+++ VelocitySecureScreen.java 2001/03/06 22:40:37 1.4
@@ -63,7 +63,7 @@
import org.apache.turbine.services.velocity.*;
import org.apache.velocity.context.Context;
-/*
+/**
* VelocitySecureScreen
*
* Always performs a Security Check that you've defined before
@@ -75,7 +75,7 @@
* your base screen.
*
* @author <a href="mailto:mbryson@mont.mindspring.com">Dave Bryson</a>
- * @version $Id: VelocitySecureScreen.java,v 1.3 2001/03/06 04:50:47 chrise Exp $
+ * @version $Id: VelocitySecureScreen.java,v 1.4 2001/03/06 22:40:37 chrise Exp $
*/
public abstract class VelocitySecureScreen extends VelocityScreen
{
1.6 +2 -2 jakarta-turbine/src/java/org/apache/turbine/modules/screens/WebMacroSiteErrorScreen.java
Index: WebMacroSiteErrorScreen.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/screens/WebMacroSiteErrorScreen.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- WebMacroSiteErrorScreen.java 2001/03/06 04:50:47 1.5
+++ WebMacroSiteErrorScreen.java 2001/03/06 22:40:38 1.6
@@ -63,12 +63,12 @@
// WebMacro
import org.webmacro.servlet.*;
-/*
+/**
* WebMacroSiteErrorScreen screen - directs errors at the webmacro
* error template defined in template.error.
*
* @author <a href="mailto:sean@somacity.com">Sean Legassick</a>
- * @version $Id: WebMacroSiteErrorScreen.java,v 1.5 2001/03/06 04:50:47 chrise Exp $
+ * @version $Id: WebMacroSiteErrorScreen.java,v 1.6 2001/03/06 22:40:38 chrise Exp $
*/
public class WebMacroSiteErrorScreen extends WebMacroSiteScreen
{
1.8 +2 -2 jakarta-turbine/src/java/org/apache/turbine/modules/screens/WebMacroSiteScreen.java
Index: WebMacroSiteScreen.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/screens/WebMacroSiteScreen.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- WebMacroSiteScreen.java 2001/03/06 04:50:47 1.7
+++ WebMacroSiteScreen.java 2001/03/06 22:40:38 1.8
@@ -72,7 +72,7 @@
import org.apache.turbine.services.webmacro.*;
import org.webmacro.servlet.*;
-/*
+/**
* Base WebMacro Screen. This screen relies on the WebMacroSitePage
* being set as the default page. This screen can be called directly
* to generate a WebMacro Screen. The buildTemplate() assumes the
@@ -86,7 +86,7 @@
* class and override the doBuildTemplate() method.
*
* @author <a href="mailto:mbryson@mont.mindspring.com">Dave Bryson</a>
- * @version $Id: WebMacroSiteScreen.java,v 1.7 2001/03/06 04:50:47 chrise Exp $
+ * @version $Id: WebMacroSiteScreen.java,v 1.8 2001/03/06 22:40:38 chrise Exp $
*/
public class WebMacroSiteScreen extends TemplateScreen
{
1.4 +3 -4 jakarta-turbine/src/java/org/apache/turbine/modules/screens/WebMacroSiteSecureScreen.java
Index: WebMacroSiteSecureScreen.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/screens/WebMacroSiteSecureScreen.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- WebMacroSiteSecureScreen.java 2001/03/06 04:50:47 1.3
+++ WebMacroSiteSecureScreen.java 2001/03/06 22:40:38 1.4
@@ -62,7 +62,7 @@
// WebMacro
import org.webmacro.servlet.*;
-/*
+/**
* WebMacroSiteSecure screen.
*
* Always performs a Security Check that you've defined before
@@ -71,11 +71,10 @@
* screens that need to perform the same check, you could make a base
* screen by extending this class and implementing the isAuthorized().
* Then each screen that needs to perform the same check could extend
- * your base screen. To make things easy you could also use the
- * WebMacroSecuritCheck utility. See the util/webmacro directory.
+ * your base screen.
*
* @author <a href="mailto:mbryson@mont.mindspring.com">Dave Bryson</a>
- * @version $Id: WebMacroSiteSecureScreen.java,v 1.3 2001/03/06 04:50:47 chrise Exp $
+ * @version $Id: WebMacroSiteSecureScreen.java,v 1.4 2001/03/06 22:40:38 chrise Exp $
*/
public abstract class WebMacroSiteSecureScreen extends WebMacroSiteScreen
{
1.6 +2 -2 jakarta-turbine/src/java/org/apache/turbine/services/cache/CachedObject.java
Index: CachedObject.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/cache/CachedObject.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CachedObject.java 2001/03/06 06:11:54 1.5
+++ CachedObject.java 2001/03/06 22:40:41 1.6
@@ -60,12 +60,12 @@
// Turbine stuff.
import org.apache.turbine.services.resources.TurbineResources;
-/*
+/**
* Wrapper for an object you want to store in a cache for a period of
* time.
*
* @author <a href="mailto:mbryson@mont.mindspring.com">Dave Bryson</a>
- * @version $Id: CachedObject.java,v 1.5 2001/03/06 06:11:54 chrise Exp $
+ * @version $Id: CachedObject.java,v 1.6 2001/03/06 22:40:41 chrise Exp $
*/
public class CachedObject
implements java.io.Serializable
1.4 +2 -2 jakarta-turbine/src/java/org/apache/turbine/services/cache/ObjectExpiredException.java
Index: ObjectExpiredException.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/cache/ObjectExpiredException.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ObjectExpiredException.java 2001/03/06 06:11:56 1.3
+++ ObjectExpiredException.java 2001/03/06 22:40:41 1.4
@@ -54,12 +54,12 @@
* <http://www.apache.org/>.
*/
-/*
+/**
* Exception thrown when an item either does not exist or has expired
* from the GlobalCache.
*
* @author <a href="mailto:mbryson@mont.mindspring.com">Dave Bryson</a>
- * @version $Id: ObjectExpiredException.java,v 1.3 2001/03/06 06:11:56 chrise Exp $
+ * @version $Id: ObjectExpiredException.java,v 1.4 2001/03/06 22:40:41 chrise Exp $
*/
public class ObjectExpiredException
extends Exception
1.6 +2 -2 jakarta-turbine/src/java/org/apache/turbine/services/cache/RefreshableCachedObject.java
Index: RefreshableCachedObject.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/cache/RefreshableCachedObject.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- RefreshableCachedObject.java 2001/03/06 06:11:57 1.5
+++ RefreshableCachedObject.java 2001/03/06 22:40:41 1.6
@@ -60,7 +60,7 @@
// Turbine stuff.
import org.apache.turbine.services.resources.TurbineResources;
-/*
+/**
* The idea of the RefreshableCachedObject is that, rather than
* removing items from the cache when they become stale, we'll tell them to
* refresh themselves instead. That way they'll always be in the
@@ -73,7 +73,7 @@
* cached object, and resetting its expire time.
*
* @author <a href="mailto:nissim@nksystems.com">Nissim Karpenstein</a>
- * @version $Id: RefreshableCachedObject.java,v 1.5 2001/03/06 06:11:57 chrise Exp $
+ * @version $Id: RefreshableCachedObject.java,v 1.6 2001/03/06 22:40:41 chrise Exp $
*/
public class RefreshableCachedObject
extends CachedObject
1.9 +3 -3 jakarta-turbine/src/java/org/apache/turbine/services/jsp/TurbineJspService.java
Index: TurbineJspService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/jsp/TurbineJspService.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TurbineJspService.java 2001/03/06 06:12:14 1.8
+++ TurbineJspService.java 2001/03/06 22:40:43 1.9
@@ -69,9 +69,9 @@
import org.apache.turbine.om.security.*;
import org.apache.turbine.services.jsp.util.*;
-/*
- * This is a Service that can process JSP templates
- * from within a Turbine Screen.
+/**
+ * This is a Service that can process JSP templates from within a Turbine
+ * screen.
*
* @author <a href="mailto:john.mcnally@clearink.com">John D. McNally</a>
*/
1.13 +2 -2 jakarta-turbine/src/java/org/apache/turbine/services/webmacro/WebMacroService.java
Index: WebMacroService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/webmacro/WebMacroService.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- WebMacroService.java 2001/03/06 06:12:59 1.12
+++ WebMacroService.java 2001/03/06 22:40:43 1.13
@@ -71,7 +71,7 @@
*
* @author <a href="mailto:mbryson@mont.mindspring.com">Dave Bryson</a>
* @author <a href="mailto:dlr@collab.net">Daniel Rall</a>
- * @version $Id: WebMacroService.java,v 1.12 2001/03/06 06:12:59 chrise Exp $
+ * @version $Id: WebMacroService.java,v 1.13 2001/03/06 22:40:43 chrise Exp $
*/
public interface WebMacroService
extends Service
@@ -93,7 +93,7 @@
* @param wc A WebContext.
* @param template A String with the filename of the template.
* @return The process template as a String.
- * @exception Exception Error processing request.
+ * @exception TurbineException Error processing request.
*/
public String handleRequest(WebContext wc,
String template)
1.16 +7 -7 jakarta-turbine/src/java/org/apache/turbine/services/xmlrpc/TurbineXmlRpcService.java
Index: TurbineXmlRpcService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/xmlrpc/TurbineXmlRpcService.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- TurbineXmlRpcService.java 2001/03/06 06:13:01 1.15
+++ TurbineXmlRpcService.java 2001/03/06 22:40:44 1.16
@@ -101,7 +101,7 @@
* @author <a href="mailto:magnus@handtolvur.is">Magn�s ��r Torfason</a>
* @author <a href="mailto:Rafal.Krzewski@e-point.pl">Rafal Krzewski</a>
* @author <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
- * @version $Id: TurbineXmlRpcService.java,v 1.15 2001/03/06 06:13:01 chrise Exp $
+ * @version $Id: TurbineXmlRpcService.java,v 1.16 2001/03/06 22:40:44 chrise Exp $
*/
public class TurbineXmlRpcService
extends TurbineBaseService
@@ -440,8 +440,8 @@
/**
* Switch client filtering on/off.
- * @see acceptClient(java.lang.String)
- * @see denyClient(java.lang.String)
+ * @see #acceptClient(java.lang.String)
+ * @see #denyClient(java.lang.String)
*/
public void setParanoid(boolean state)
{
@@ -454,8 +454,8 @@
* call setParanoid(true) in order for this to have
* any effect.
*
- * @see denyClient(java.lang.String)
- * @see setParanoid(boolean)
+ * @see #denyClient(java.lang.String)
+ * @see #setParanoid(boolean)
*/
public void acceptClient(String address)
{
@@ -467,8 +467,8 @@
* contain '*' as wildcard character, e.g. "192.168.*.*". You must call
* setParanoid(true) in order for this to have any effect.
*
- * @see acceptClient(java.lang.String)
- * @see setParanoid(boolean)
+ * @see #acceptClient(java.lang.String)
+ * @see #setParanoid(boolean)
*/
public void denyClient(String address)
{
1.5 +1 -1 jakarta-turbine/src/java/org/apache/turbine/services/xslt/TurbineXSLT.java
Index: TurbineXSLT.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/xslt/TurbineXSLT.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TurbineXSLT.java 2001/03/06 06:13:04 1.4
+++ TurbineXSLT.java 2001/03/06 22:40:45 1.5
@@ -71,7 +71,7 @@
import org.apache.xalan.xslt.*;
/**
- *
+ * This is a static accesor class for {@link XSLTService}.
*
* @author <a href="mailto:leon@opticode.co.za">Leon Messerschmidt</a>
*/
1.9 +2 -2 jakarta-turbine/src/java/org/apache/turbine/util/StringStackBuffer.java
Index: StringStackBuffer.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/util/StringStackBuffer.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- StringStackBuffer.java 2001/03/06 06:13:30 1.8
+++ StringStackBuffer.java 2001/03/06 22:40:46 1.9
@@ -58,11 +58,11 @@
import java.util.Iterator;
import java.util.Stack;
-/*
+/**
* This class implements a Stack for String objects.
*
* @author <a href="mailto:john.mcnally@clearink.com">John D. McNally</a>
- * @version $Id: StringStackBuffer.java,v 1.8 2001/03/06 06:13:30 chrise Exp $
+ * @version $Id: StringStackBuffer.java,v 1.9 2001/03/06 22:40:46 chrise Exp $
*/
public class StringStackBuffer
{
1.4 +2 -2 jakarta-turbine/src/java/org/apache/turbine/util/db/adapter/DBInstantDB.java
Index: DBInstantDB.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/util/db/adapter/DBInstantDB.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DBInstantDB.java 2001/03/06 06:14:07 1.3
+++ DBInstantDB.java 2001/03/06 22:40:47 1.4
@@ -59,7 +59,7 @@
import java.util.*;
import java.sql.*;
-/*
+/**
* This is used to connect to InstantDB databases.
*
* <a href="http://instantdb.enhydra.org">
@@ -68,7 +68,7 @@
*
* @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
* @author <a href="mailto:bmclaugh@algx.net">Brett McLaughlin</a>
- * @version $Id: DBInstantDB.java,v 1.3 2001/03/06 06:14:07 chrise Exp $
+ * @version $Id: DBInstantDB.java,v 1.4 2001/03/06 22:40:47 chrise Exp $
*/
public class DBInstantDB
extends DB
Re: cvs commit: jakarta-turbine/src/java/org/apache/turbine/util/db/adapter DBInstantDB.java
Posted by Christopher Elkins <ch...@scardini.com>.
On Tue, Mar 06, 2001 at 10:40:47PM -0000, chrise@apache.org wrote:
> chrise 01/03/06 14:40:47
>
> Modified: src/java/org/apache/turbine Turbine.java
<snip>
> Log:
> Miscellanous javadoc fixes, mostly syntax errors that prevented generation
> of existing docs without causing compiler errors
>
I apologize for the large commit. I had some time to kill in class today. :-)
For the curious: most of these fixes were javadocs that started with '/*'
instead of '/**'.
--
Christopher Elkins