You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by br...@apache.org on 2002/03/20 02:55:29 UTC
cvs commit: jakarta-turbine-3/src/java/org/apache/turbine/services/rundata SessionBindingEventProxy.java TurbineRunDataService.java TurbineSessionBindingEvent.java
brekke 02/03/19 17:55:29
Modified: src/java/org/apache/turbine RunData.java
src/java/org/apache/turbine/modules Error.java Module.java
ModuleLoader.java SecureModule.java
src/java/org/apache/turbine/modules/actions LogoutUser.java
NullSessionValidator.java SessionValidator.java
TemplateAction.java TemplateSecureAction.java
TemplateSecureSessionValidator.java
TemplateSessionValidator.java
src/java/org/apache/turbine/pipeline BranchPointValve.java
ClassicPipeline.java DefaultACLCreationValve.java
DefaultActionValve.java DefaultLoginValve.java
DefaultResolver.java
DefaultSessionValidationValve.java
DirectRenderer.java DirectTargetValve.java
JspRendererValve.java ModuleRunner.java
RequestParameterConditionalValve.java
RunModulesValve.java
TargetExtensionConditionalValve.java
TurbinePipeline.java
src/java/org/apache/turbine/services/pull
TurbinePullService.java
src/java/org/apache/turbine/services/rundata
SessionBindingEventProxy.java
TurbineRunDataService.java
TurbineSessionBindingEvent.java
Log:
Patch from Stephane Bailliez <sb...@apache.org>:
Minor fixes, but I was browsing through the source code and invalid javadoc
or unused import hurt my eyes with IDEA. :)
Revision Changes Path
1.6 +2 -2 jakarta-turbine-3/src/java/org/apache/turbine/RunData.java
Index: RunData.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/RunData.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- RunData.java 4 Dec 2001 05:00:39 -0000 1.5
+++ RunData.java 20 Mar 2002 01:55:28 -0000 1.6
@@ -79,7 +79,7 @@
* @author <a href="mailto:jon@clearink.com">Jon S. Stevens</a>
* @author <a href="mailto:bhoeneis@ee.ethz.ch">Bernie Hoeneisen</a>
* @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
- * @version $Id: RunData.java,v 1.5 2001/12/04 05:00:39 jmcnally Exp $
+ * @version $Id: RunData.java,v 1.6 2002/03/20 01:55:28 brekke Exp $
*/
public interface RunData
{
@@ -260,7 +260,7 @@
* will set the print writer via the response.
*
* @return a print writer.
- * @throws IOException.
+ * @throws IOException
*/
public PrintWriter getOut()
throws IOException;
1.2 +2 -2 jakarta-turbine-3/src/java/org/apache/turbine/modules/Error.java
Index: Error.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/modules/Error.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Error.java 16 Aug 2001 04:41:35 -0000 1.1
+++ Error.java 20 Mar 2002 01:55:28 -0000 1.2
@@ -63,7 +63,7 @@
* error template defined in template.error.
*
* @author <a href="mailto:gonzalo.diethelm@sonda.com">Gonzalo Diethelm</a>
- * @version $Id: Error.java,v 1.1 2001/08/16 04:41:35 jvanzyl Exp $
+ * @version $Id: Error.java,v 1.2 2002/03/20 01:55:28 brekke Exp $
*/
public class Error
extends Module
@@ -73,7 +73,7 @@
*
* @param data Turbine information.
* @param context Context for web pages.
- * @exception Exception, a generic exception.
+ * @exception Exception a generic exception.
*/
protected void doBuildTemplate( RunData data,
TemplateContext context )
1.8 +3 -3 jakarta-turbine-3/src/java/org/apache/turbine/modules/Module.java
Index: Module.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/modules/Module.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Module.java 15 Jan 2002 01:54:24 -0000 1.7
+++ Module.java 20 Mar 2002 01:55:28 -0000 1.8
@@ -76,7 +76,7 @@
* the classic pattern.</p>
*
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
- * @version $Id: Module.java,v 1.7 2002/01/15 01:54:24 dlr Exp $
+ * @version $Id: Module.java,v 1.8 2002/03/20 01:55:28 brekke Exp $
*/
public class Module
{
@@ -127,7 +127,7 @@
* specific business logic.
*
* @param data Turbine information.
- * @exception Exception, a generic exception.
+ * @exception Exception a generic exception.
*/
protected void doBuildTemplate( RunData data, TemplateContext context)
throws Exception
@@ -224,7 +224,7 @@
*
* @param data Turbine information.
* @param template The name of the next template.
- * @param deprecated use setTarget(data,template)
+ * @deprecated use setTarget(data,template)
*/
public static void setTemplate(RunData data, String template)
{
1.9 +2 -5 jakarta-turbine-3/src/java/org/apache/turbine/modules/ModuleLoader.java
Index: ModuleLoader.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/modules/ModuleLoader.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ModuleLoader.java 6 Feb 2002 17:26:34 -0000 1.8
+++ ModuleLoader.java 20 Mar 2002 01:55:28 -0000 1.9
@@ -55,15 +55,12 @@
*/
import java.util.Iterator;
-import java.util.ArrayList;
import java.util.List;
import java.util.Vector;
import java.util.Map;
import org.apache.stratum.configuration.Configuration;
-import org.apache.turbine.RunData;
import org.apache.turbine.Turbine;
import org.apache.turbine.TurbineException;
-import org.apache.turbine.Resolver;
import org.apache.commons.collections.FastArrayList;
import org.apache.commons.collections.FastHashMap;
import org.apache.turbine.Log;
@@ -75,7 +72,7 @@
*
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
* @author <a href="mailto:mpoeschl@marmot.at">Martin Poeschl</a>
- * @version $Id: ModuleLoader.java,v 1.8 2002/02/06 17:26:34 mpoeschl Exp $
+ * @version $Id: ModuleLoader.java,v 1.9 2002/03/20 01:55:28 brekke Exp $
*/
public class ModuleLoader
{
@@ -122,7 +119,7 @@
/**
* Add a module package to the search list.
*
- * @param String module package to add to search list
+ * @param modulePackage module package to add to search list
*/
public void addModulePackage(String modulePackage)
{
1.2 +3 -4 jakarta-turbine-3/src/java/org/apache/turbine/modules/SecureModule.java
Index: SecureModule.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/modules/SecureModule.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SecureModule.java 16 Aug 2001 04:41:35 -0000 1.1
+++ SecureModule.java 20 Mar 2002 01:55:28 -0000 1.2
@@ -55,7 +55,6 @@
*/
import org.apache.turbine.RunData;
-import org.apache.turbine.TemplateContext;
/**
* VelocitySecureScreen
@@ -69,7 +68,7 @@
* your base screen.
*
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
- * @version $Id: SecureModule.java,v 1.1 2001/08/16 04:41:35 jvanzyl Exp $
+ * @version $Id: SecureModule.java,v 1.2 2002/03/20 01:55:28 brekke Exp $
*/
public abstract class SecureModule
extends Module
@@ -79,7 +78,7 @@
* perform a security check first.
*
* @param data Turbine information.
- * @exception Exception, a generic exception.
+ * @exception Exception a generic exception.
*/
protected void doBuildTemplate( RunData data )
throws Exception
@@ -97,7 +96,7 @@
*
* @param data Turbine information.
* @return True if the user is authorized to access the screen.
- * @exception Exception, a generic exception.
+ * @exception Exception a generic exception.
*/
protected abstract boolean isAuthorized(RunData data)
throws Exception;
1.4 +2 -3 jakarta-turbine-3/src/java/org/apache/turbine/modules/actions/LogoutUser.java
Index: LogoutUser.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/modules/actions/LogoutUser.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LogoutUser.java 5 Mar 2002 01:32:34 -0000 1.3
+++ LogoutUser.java 20 Mar 2002 01:55:28 -0000 1.4
@@ -59,7 +59,6 @@
import org.apache.turbine.modules.Action;
import org.apache.fulcrum.security.entity.User;
import org.apache.fulcrum.security.TurbineSecurity;
-import org.apache.turbine.Log;
import org.apache.fulcrum.security.util.AccessControlList;
/**
@@ -67,7 +66,7 @@
* the User object in the session.
*
* @author <a href="mailto:mbryson@mont.mindspring.com">Dave Bryson</a>
- * @version $Id: LogoutUser.java,v 1.3 2002/03/05 01:32:34 jon Exp $
+ * @version $Id: LogoutUser.java,v 1.4 2002/03/20 01:55:28 brekke Exp $
*/
public class LogoutUser
extends Action
@@ -87,7 +86,7 @@
* for a logged out (read not-logged-in) user.
*
* @param data Turbine information.
- * @exception Exception, a generic exception.
+ * @exception Exception a generic exception.
*/
public void doPerform( RunData data )
throws Exception
1.2 +2 -2 jakarta-turbine-3/src/java/org/apache/turbine/modules/actions/NullSessionValidator.java
Index: NullSessionValidator.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/modules/actions/NullSessionValidator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NullSessionValidator.java 17 Jan 2002 16:42:18 -0000 1.1
+++ NullSessionValidator.java 20 Mar 2002 01:55:28 -0000 1.2
@@ -62,7 +62,7 @@
* doesn't require any security.
*
* @author <a href="mailto:jvanzyl@zenplex.com">Jason van Zyl</a>
- * @version $Id: NullSessionValidator.java,v 1.1 2002/01/17 16:42:18 jvanzyl Exp $
+ * @version $Id: NullSessionValidator.java,v 1.2 2002/03/20 01:55:28 brekke Exp $
*/
public class NullSessionValidator
extends SessionValidator
@@ -71,7 +71,7 @@
* Execute the action.
*
* @param data Turbine information.
- * @exception Exception, a generic exception.
+ * @exception Exception a generic exception.
*/
public void doPerform(RunData data)
throws Exception
1.3 +1 -2 jakarta-turbine-3/src/java/org/apache/turbine/modules/actions/SessionValidator.java
Index: SessionValidator.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/modules/actions/SessionValidator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SessionValidator.java 24 Oct 2001 20:54:57 -0000 1.2
+++ SessionValidator.java 20 Mar 2002 01:55:28 -0000 1.3
@@ -54,7 +54,6 @@
* <http://www.apache.org/>.
*/
-import org.apache.turbine.RunData;
import org.apache.turbine.modules.Action;
/**
@@ -78,7 +77,7 @@
* Turbine servlet.
*
* @author <a href="mailto:mbryson@mont.mindspring.com">Dave Bryson</a>
- * @version $Id: SessionValidator.java,v 1.2 2001/10/24 20:54:57 jon Exp $
+ * @version $Id: SessionValidator.java,v 1.3 2002/03/20 01:55:28 brekke Exp $
*/
public abstract class SessionValidator
extends Action
1.2 +4 -5 jakarta-turbine-3/src/java/org/apache/turbine/modules/actions/TemplateAction.java
Index: TemplateAction.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/modules/actions/TemplateAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TemplateAction.java 16 Aug 2001 04:41:36 -0000 1.1
+++ TemplateAction.java 20 Mar 2002 01:55:28 -0000 1.2
@@ -60,7 +60,6 @@
import java.util.Enumeration;
import org.apache.turbine.ParameterParser;
import org.apache.turbine.modules.ActionEvent;
-import org.apache.fulcrum.template.TurbineTemplate;
/**
* If you are using VelocitySite stuff, then your Action's should
@@ -77,7 +76,7 @@
*
* @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
* @author <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
- * @version $Id: TemplateAction.java,v 1.1 2001/08/16 04:41:36 jvanzyl Exp $
+ * @version $Id: TemplateAction.java,v 1.2 2002/03/20 01:55:28 brekke Exp $
*/
public abstract class TemplateAction
extends ActionEvent
@@ -87,7 +86,7 @@
* class.
*
* @param data A Turbine RunData object.
- * @exception Exception, a generic exception.
+ * @exception Exception a generic exception.
*/
public void doPerform(RunData data)
throws Exception
@@ -105,7 +104,7 @@
* doPerform() method instead.
*
* @param data A Turbine RunData object.
- * @exception Exception, a generic exception.
+ * @exception Exception a generic exception.
*/
protected void perform( RunData data )
throws Exception
@@ -125,7 +124,7 @@
*
* @param data A Turbine RunData object.
* @param context Velocity context information.
- * @exception Exception, a generic exception.
+ * @exception Exception a generic exception.
*/
public void executeEvents(RunData data, TemplateContext context)
throws Exception
1.2 +3 -4 jakarta-turbine-3/src/java/org/apache/turbine/modules/actions/TemplateSecureAction.java
Index: TemplateSecureAction.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/modules/actions/TemplateSecureAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TemplateSecureAction.java 16 Aug 2001 04:41:35 -0000 1.1
+++ TemplateSecureAction.java 20 Mar 2002 01:55:28 -0000 1.2
@@ -55,7 +55,6 @@
*/
import org.apache.turbine.RunData;
-import org.apache.turbine.TemplateContext;
/**
* VelocitySecure action.
@@ -71,7 +70,7 @@
* @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: TemplateSecureAction.java,v 1.1 2001/08/16 04:41:35 jvanzyl Exp $
+ * @version $Id: TemplateSecureAction.java,v 1.2 2002/03/20 01:55:28 brekke Exp $
*/
public abstract class TemplateSecureAction
extends TemplateAction
@@ -81,7 +80,7 @@
* perform a security check first.
*
* @param data Turbine information.
- * @exception Exception, a generic exception.
+ * @exception Exception a generic exception.
*/
protected void perform( RunData data )
throws Exception
@@ -100,7 +99,7 @@
*
* @param data Turbine information.
* @return True if the user is authorized to access the screen.
- * @exception Exception, a generic exception.
+ * @exception Exception a generic exception.
*/
protected abstract boolean isAuthorized( RunData data )
throws Exception;
1.2 +3 -3 jakarta-turbine-3/src/java/org/apache/turbine/modules/actions/TemplateSecureSessionValidator.java
Index: TemplateSecureSessionValidator.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/modules/actions/TemplateSecureSessionValidator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TemplateSecureSessionValidator.java 16 Aug 2001 04:41:36 -0000 1.1
+++ TemplateSecureSessionValidator.java 20 Mar 2002 01:55:28 -0000 1.2
@@ -77,7 +77,7 @@
*
* @author <a href="mailto:jmcnally@collab.net">John D. McNally</a>
* @author <a href="mailto:mbryson@mont.mindspring.com">Dave Bryson</a>
- * @version $Id: TemplateSecureSessionValidator.java,v 1.1 2001/08/16 04:41:36 jvanzyl Exp $
+ * @version $Id: TemplateSecureSessionValidator.java,v 1.2 2002/03/20 01:55:28 brekke Exp $
*/
public class TemplateSecureSessionValidator
extends TemplateSessionValidator
@@ -89,9 +89,9 @@
* load the tr.props TEMPLATE_LOGIN instead of the default's
* setScreen to TurbineContants.SCREEN_LOGIN.
*
- * @see DefaultSessionValidator
+ * @see TemplateSessionValidator
* @param data Turbine information.
- * @exception Exception, a generic exception.
+ * @exception Exception a generic exception.
*/
public void doPerform( RunData data )
throws Exception
1.5 +2 -3 jakarta-turbine-3/src/java/org/apache/turbine/modules/actions/TemplateSessionValidator.java
Index: TemplateSessionValidator.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/modules/actions/TemplateSessionValidator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TemplateSessionValidator.java 24 Oct 2001 20:54:57 -0000 1.4
+++ TemplateSessionValidator.java 20 Mar 2002 01:55:28 -0000 1.5
@@ -57,7 +57,6 @@
import org.apache.turbine.Turbine;
import org.apache.turbine.RunData;
import org.apache.fulcrum.security.TurbineSecurity;
-import org.apache.turbine.Log;
/**
* SessionValidator for use with the Template Service, the
@@ -71,7 +70,7 @@
* @see TemplateSecureSessionValidator
* @author <a href="mailto:jmcnally@collab.net">John D. McNally</a>
* @author <a href="mailto:mbryson@mont.mindspring.com">Dave Bryson</a>
- * @version $Id: TemplateSessionValidator.java,v 1.4 2001/10/24 20:54:57 jon Exp $
+ * @version $Id: TemplateSessionValidator.java,v 1.5 2002/03/20 01:55:28 brekke Exp $
*/
public class TemplateSessionValidator
extends SessionValidator
@@ -87,7 +86,7 @@
* Execute the action.
*
* @param data Turbine information.
- * @exception Exception, a generic exception.
+ * @exception Exception a generic exception.
*/
public void doPerform(RunData data)
throws Exception
1.6 +3 -2 jakarta-turbine-3/src/java/org/apache/turbine/pipeline/BranchPointValve.java
Index: BranchPointValve.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/pipeline/BranchPointValve.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- BranchPointValve.java 11 Feb 2002 18:04:25 -0000 1.5
+++ BranchPointValve.java 20 Mar 2002 01:55:28 -0000 1.6
@@ -70,7 +70,7 @@
* pipelines finish.
*
* @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
- * @version $Id: BranchPointValve.java,v 1.5 2002/02/11 18:04:25 dlr Exp $
+ * @version $Id: BranchPointValve.java,v 1.6 2002/03/20 01:55:28 brekke Exp $
*/
public abstract class BranchPointValve
extends AbstractValve
@@ -127,7 +127,8 @@
* </p>
*
* @param data The run-time data.
- * @exception Exception Problem choosing pipline to branch down.
+ * @exception IOException Problem choosing pipeline to branch down.
+ * @exception TurbineException Problem choosing pipeline to branch down.
* @see org.apache.turbine.Valve#invoke(RunData, ValveContext)
*/
public abstract void invoke(RunData data, ValveContext context)
1.16 +1 -5 jakarta-turbine-3/src/java/org/apache/turbine/pipeline/ClassicPipeline.java
Index: ClassicPipeline.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/pipeline/ClassicPipeline.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ClassicPipeline.java 18 Jan 2002 03:33:58 -0000 1.15
+++ ClassicPipeline.java 20 Mar 2002 01:55:28 -0000 1.16
@@ -54,10 +54,6 @@
* <http://www.apache.org/>.
*/
-import java.io.IOException;
-
-import org.apache.turbine.Valve;
-
/**
* This is a pipeline that emulates the standard Turbine 2.1
* page/layout/navigation/screen pipeline.
@@ -69,7 +65,7 @@
* @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
* @author <a href="mailto:mikeh@apache.org">Mike Haberman</a>
* @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
- * @version $Id: ClassicPipeline.java,v 1.15 2002/01/18 03:33:58 jvanzyl Exp $
+ * @version $Id: ClassicPipeline.java,v 1.16 2002/03/20 01:55:28 brekke Exp $
* @deprecated Use TurbinePipeline with the
* turbine-classic-pipeline.xml pipeline descriptor instead.
*/
1.4 +1 -3 jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DefaultACLCreationValve.java
Index: DefaultACLCreationValve.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DefaultACLCreationValve.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultACLCreationValve.java 24 Jan 2002 03:55:26 -0000 1.3
+++ DefaultACLCreationValve.java 20 Mar 2002 01:55:28 -0000 1.4
@@ -56,8 +56,6 @@
import java.io.IOException;
-import java.util.Enumeration;
-
import org.apache.log4j.Category;
import org.apache.turbine.Turbine;
@@ -74,7 +72,7 @@
* pipeline (from the Turbine 2.x series).
*
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
- * @version $Id: DefaultACLCreationValve.java,v 1.3 2002/01/24 03:55:26 jvanzyl Exp $
+ * @version $Id: DefaultACLCreationValve.java,v 1.4 2002/03/20 01:55:28 brekke Exp $
*/
public class DefaultACLCreationValve
extends AbstractValve
1.9 +1 -6 jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DefaultActionValve.java
Index: DefaultActionValve.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DefaultActionValve.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DefaultActionValve.java 9 Feb 2002 17:55:22 -0000 1.8
+++ DefaultActionValve.java 20 Mar 2002 01:55:28 -0000 1.9
@@ -56,20 +56,15 @@
import java.io.IOException;
-import java.util.Enumeration;
-
import org.apache.log4j.Category;
import org.apache.turbine.Turbine;
import org.apache.turbine.TurbineConstants;
-import org.apache.turbine.Resolver;
import org.apache.turbine.RunData;
-import org.apache.turbine.TemplateContext;
import org.apache.turbine.TurbineException;
import org.apache.turbine.Valve;
import org.apache.turbine.ValveContext;
import org.apache.turbine.modules.Module;
-import org.apache.turbine.modules.Action;
/**
* Implements the action portion of the "Turbine classic" processing
@@ -79,7 +74,7 @@
* @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
* @author <a href="mailto:mikeh@apache.org">Mike Haberman</a>
* @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
- * @version $Id: DefaultActionValve.java,v 1.8 2002/02/09 17:55:22 dlr Exp $
+ * @version $Id: DefaultActionValve.java,v 1.9 2002/03/20 01:55:28 brekke Exp $
*/
public class DefaultActionValve
extends AbstractValve
1.5 +1 -4 jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DefaultLoginValve.java
Index: DefaultLoginValve.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DefaultLoginValve.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultLoginValve.java 5 Mar 2002 01:32:34 -0000 1.4
+++ DefaultLoginValve.java 20 Mar 2002 01:55:28 -0000 1.5
@@ -62,10 +62,7 @@
import org.apache.turbine.Turbine;
import org.apache.turbine.TurbineConstants;
-import org.apache.turbine.Resolver;
import org.apache.turbine.RunData;
-import org.apache.turbine.Resolver;
-import org.apache.turbine.TemplateContext;
import org.apache.turbine.TurbineException;
import org.apache.turbine.Valve;
import org.apache.turbine.ValveContext;
@@ -76,7 +73,7 @@
* cycle.
*
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
- * @version $Id: DefaultLoginValve.java,v 1.4 2002/03/05 01:32:34 jon Exp $
+ * @version $Id: DefaultLoginValve.java,v 1.5 2002/03/20 01:55:28 brekke Exp $
*/
public class DefaultLoginValve
extends AbstractValve
1.13 +5 -8 jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DefaultResolver.java
Index: DefaultResolver.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DefaultResolver.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- DefaultResolver.java 19 Jan 2002 03:23:26 -0000 1.12
+++ DefaultResolver.java 20 Mar 2002 01:55:28 -0000 1.13
@@ -54,8 +54,6 @@
* <http://www.apache.org/>.
*/
-import java.util.Map;
-import org.apache.commons.collections.FastHashMap;
import java.util.ArrayList;
import java.util.List;
import java.util.Iterator;
@@ -134,7 +132,7 @@
*
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
* @author <a href="mailto:mikeh@apache.org">Mike Haberman</a>
- * @version $Id: DefaultResolver.java,v 1.12 2002/01/19 03:23:26 jvanzyl Exp $
+ * @version $Id: DefaultResolver.java,v 1.13 2002/03/20 01:55:28 brekke Exp $
*/
public class DefaultResolver
implements Resolver, TurbineConstants
@@ -178,9 +176,9 @@
* Get an instance of a module
*
* For turbine classic edition, type is one of (actions, screens)
- * @param String name
- * @param String type
- * @return Module
+ * @param type
+ * @param name
+ * @return
*/
public Module getModule(String type, String name)
throws Exception
@@ -213,9 +211,8 @@
* Get the parsed module name for the specified template.
*
* @param template The template name.
- * @param key The module type key.
* @return The parsed module name.
- * @exception Exception, a generaic exception.
+ * @exception Exception a generic exception.
*/
protected Iterator getPossibleTemplates(String template)
throws Exception
1.4 +1 -5 jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DefaultSessionValidationValve.java
Index: DefaultSessionValidationValve.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DefaultSessionValidationValve.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultSessionValidationValve.java 24 Jan 2002 03:55:26 -0000 1.3
+++ DefaultSessionValidationValve.java 20 Mar 2002 01:55:28 -0000 1.4
@@ -56,10 +56,6 @@
import java.io.IOException;
-import java.util.Enumeration;
-
-import org.apache.commons.collections.ExtendedProperties;
-
import org.apache.log4j.Category;
import org.apache.turbine.Turbine;
@@ -76,7 +72,7 @@
* pipeline (from the Turbine 2.x series).
*
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
- * @version $Id: DefaultSessionValidationValve.java,v 1.3 2002/01/24 03:55:26 jvanzyl Exp $
+ * @version $Id: DefaultSessionValidationValve.java,v 1.4 2002/03/20 01:55:28 brekke Exp $
*/
public class DefaultSessionValidationValve
extends AbstractValve
1.6 +1 -3 jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DirectRenderer.java
Index: DirectRenderer.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DirectRenderer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DirectRenderer.java 19 Jan 2002 03:23:26 -0000 1.5
+++ DirectRenderer.java 20 Mar 2002 01:55:28 -0000 1.6
@@ -54,8 +54,6 @@
* <http://www.apache.org/>.
*/
-import java.io.Writer;
-import org.apache.turbine.Turbine;
import org.apache.turbine.RunData;
import org.apache.turbine.modules.Module;
import org.apache.turbine.TemplateContext;
@@ -70,7 +68,7 @@
* @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
* @author <a href="mailto:jmcnally@collab.net">John McNally</a>
* @author <a href="mailto:james@jamestaylor.org">James Taylor</a>
- * @version $Id: DirectRenderer.java,v 1.5 2002/01/19 03:23:26 jvanzyl Exp $
+ * @version $Id: DirectRenderer.java,v 1.6 2002/03/20 01:55:28 brekke Exp $
*/
public class DirectRenderer
extends Renderer
1.5 +1 -3 jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DirectTargetValve.java
Index: DirectTargetValve.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DirectTargetValve.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DirectTargetValve.java 19 Jan 2002 03:23:26 -0000 1.4
+++ DirectTargetValve.java 20 Mar 2002 01:55:28 -0000 1.5
@@ -55,9 +55,7 @@
*/
import org.apache.turbine.RunData;
-import org.apache.turbine.Turbine;
import org.apache.turbine.TemplateContext;
-import org.apache.turbine.modules.Module;
import org.apache.log4j.Category;
/**
@@ -70,7 +68,7 @@
* @author <a href="mailto:jmcnally@apache.org">John McNally</a>
* @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
* @author <a href="mailto:james@jamestaylor.org">James Taylor</a>
- * @version $Id: DirectTargetValve.java,v 1.4 2002/01/19 03:23:26 jvanzyl Exp $
+ * @version $Id: DirectTargetValve.java,v 1.5 2002/03/20 01:55:28 brekke Exp $
* @see org.apache.turbine.pipeline.ClassicPipeline
*/
public class DirectTargetValve
1.3 +1 -3 jakarta-turbine-3/src/java/org/apache/turbine/pipeline/JspRendererValve.java
Index: JspRendererValve.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/pipeline/JspRendererValve.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JspRendererValve.java 24 Jan 2002 03:55:26 -0000 1.2
+++ JspRendererValve.java 20 Mar 2002 01:55:28 -0000 1.3
@@ -55,9 +55,7 @@
*/
import java.io.IOException;
-import java.util.Enumeration;
-import org.apache.turbine.Turbine;
import org.apache.turbine.RunData;
import org.apache.turbine.TurbineException;
import org.apache.turbine.Valve;
@@ -69,7 +67,7 @@
* based on JSP.
*
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
- * @version $Id: JspRendererValve.java,v 1.2 2002/01/24 03:55:26 jvanzyl Exp $
+ * @version $Id: JspRendererValve.java,v 1.3 2002/03/20 01:55:28 brekke Exp $
*/
public class JspRendererValve
extends AbstractValve
1.3 +1 -2 jakarta-turbine-3/src/java/org/apache/turbine/pipeline/ModuleRunner.java
Index: ModuleRunner.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/pipeline/ModuleRunner.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ModuleRunner.java 13 Nov 2001 21:35:44 -0000 1.2
+++ ModuleRunner.java 20 Mar 2002 01:55:28 -0000 1.3
@@ -59,13 +59,12 @@
import org.apache.turbine.modules.Module;
import org.apache.turbine.TurbineException;
import org.apache.turbine.Log;
-import org.apache.turbine.TemplateContext;
/**
* This class is used execute the module chain.
*
* @author <a href="mailto:mikeh@apache.org">Mike Haberman</a>
- * @version $Id: ModuleRunner.java,v 1.2 2001/11/13 21:35:44 mikeh Exp $
+ * @version $Id: ModuleRunner.java,v 1.3 2002/03/20 01:55:28 brekke Exp $
*/
public class ModuleRunner
{
1.2 +1 -6 jakarta-turbine-3/src/java/org/apache/turbine/pipeline/RequestParameterConditionalValve.java
Index: RequestParameterConditionalValve.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/pipeline/RequestParameterConditionalValve.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RequestParameterConditionalValve.java 11 Feb 2002 23:58:05 -0000 1.1
+++ RequestParameterConditionalValve.java 20 Mar 2002 01:55:28 -0000 1.2
@@ -54,19 +54,14 @@
* <http://www.apache.org/>.
*/
-import java.io.IOException;
-
import org.apache.turbine.RunData;
-import org.apache.turbine.TurbineException;
-import org.apache.turbine.Valve;
-import org.apache.turbine.ValveContext;
/**
* Conditional valve that tests if a request parameter (key) matches a specific
* value (value).
*
* @author <a href="mailto:james@jamestaylor.org">James Taylor</a>
- * @version $Id: RequestParameterConditionalValve.java,v 1.1 2002/02/11 23:58:05 jtaylor Exp $
+ * @version $Id: RequestParameterConditionalValve.java,v 1.2 2002/03/20 01:55:28 brekke Exp $
*/
public class RequestParameterConditionalValve
extends ConditionalValve
1.6 +1 -2 jakarta-turbine-3/src/java/org/apache/turbine/pipeline/RunModulesValve.java
Index: RunModulesValve.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/pipeline/RunModulesValve.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- RunModulesValve.java 15 Feb 2002 23:36:30 -0000 1.5
+++ RunModulesValve.java 20 Mar 2002 01:55:28 -0000 1.6
@@ -57,7 +57,6 @@
import java.io.IOException;
import org.apache.turbine.Turbine;
-import org.apache.turbine.TurbineConstants;
import org.apache.turbine.RunData;
import org.apache.turbine.TurbineException;
import org.apache.turbine.Valve;
@@ -74,7 +73,7 @@
* release 2
*
* @author <a href="mailto:jtaylor@apache.org">James Taylor</a>
- * @version $Id: RunModulesValve.java,v 1.5 2002/02/15 23:36:30 jmcnally Exp $
+ * @version $Id: RunModulesValve.java,v 1.6 2002/03/20 01:55:28 brekke Exp $
*/
public class RunModulesValve
extends AbstractValve
1.2 +1 -7 jakarta-turbine-3/src/java/org/apache/turbine/pipeline/TargetExtensionConditionalValve.java
Index: TargetExtensionConditionalValve.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/pipeline/TargetExtensionConditionalValve.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TargetExtensionConditionalValve.java 11 Feb 2002 23:58:05 -0000 1.1
+++ TargetExtensionConditionalValve.java 20 Mar 2002 01:55:28 -0000 1.2
@@ -57,9 +57,6 @@
import java.io.IOException;
import org.apache.turbine.RunData;
-import org.apache.turbine.TurbineException;
-import org.apache.turbine.Valve;
-import org.apache.turbine.ValveContext;
import org.apache.log4j.Category;
@@ -68,7 +65,7 @@
* matches a given value.
*
* @author <a href="mailto:james@jamestaylor.org">James Taylor</a>
- * @version $Id: TargetExtensionConditionalValve.java,v 1.1 2002/02/11 23:58:05 jtaylor Exp $
+ * @version $Id: TargetExtensionConditionalValve.java,v 1.2 2002/03/20 01:55:28 brekke Exp $
*/
public class TargetExtensionConditionalValve
extends ConditionalValve
@@ -79,9 +76,6 @@
/** Value to require */
private String extension;
- /**
- * @see org.apache.turbine.pipeline.BaseConditionalValve#doTest
- */
protected boolean shouldInvoke( RunData data )
{
String target = data.getTarget();
1.9 +1 -1 jakarta-turbine-3/src/java/org/apache/turbine/pipeline/TurbinePipeline.java
Index: TurbinePipeline.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/pipeline/TurbinePipeline.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TurbinePipeline.java 24 Jan 2002 03:55:26 -0000 1.8
+++ TurbinePipeline.java 20 Mar 2002 01:55:28 -0000 1.9
@@ -98,7 +98,7 @@
protected ThreadLocal state = new ThreadLocal();
/**
- * @see org.apache.turbine.Pipeline#init()
+ * @see org.apache.turbine.Pipeline#initialize()
*/
public void initialize()
throws Exception
1.11 +2 -4 jakarta-turbine-3/src/java/org/apache/turbine/services/pull/TurbinePullService.java
Index: TurbinePullService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/services/pull/TurbinePullService.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- TurbinePullService.java 6 Feb 2002 17:26:34 -0000 1.10
+++ TurbinePullService.java 20 Mar 2002 01:55:29 -0000 1.11
@@ -57,8 +57,6 @@
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import java.util.Vector;
-import java.util.HashMap;
import org.apache.fulcrum.security.entity.User;
import org.apache.fulcrum.BaseService;
@@ -145,7 +143,7 @@
* @author <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
* @author <a href="mailto:sean@informage.net">Sean Legassick</a>
* @author <a href="mailto:mpoeschl@marmot.at">Martin Poeschl</a>
- * @version $Id: TurbinePullService.java,v 1.10 2002/02/06 17:26:34 mpoeschl Exp $
+ * @version $Id: TurbinePullService.java,v 1.11 2002/03/20 01:55:29 brekke Exp $
*/
public class TurbinePullService
extends BaseService
@@ -490,7 +488,7 @@
* @param context A TemplateContext to populate.
* @param user The <code>User</code> object whose storage to
* retrieve the tool from.
- * @param userPerm Whether to retrieve the tools from the
+ * @param usePerm Whether to retrieve the tools from the
* permanent storage (as opposed to the temporary storage).
*/
private void populateWithSessionTools(List tools,
1.3 +1 -3 jakarta-turbine-3/src/java/org/apache/turbine/services/rundata/SessionBindingEventProxy.java
Index: SessionBindingEventProxy.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/services/rundata/SessionBindingEventProxy.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SessionBindingEventProxy.java 2 Oct 2001 00:01:51 -0000 1.2
+++ SessionBindingEventProxy.java 20 Mar 2002 01:55:29 -0000 1.3
@@ -54,18 +54,16 @@
* <http://www.apache.org/>.
*/
-import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpSessionBindingEvent;
import javax.servlet.http.HttpSessionBindingListener;
-import org.apache.fulcrum.security.session.SessionBindingEvent;
import org.apache.fulcrum.security.session.SessionBindingListener;
/**
* Proxies session binding/unbinding events from Turbine to Fulcrum.
*
* @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
- * @version $Id: SessionBindingEventProxy.java,v 1.2 2001/10/02 00:01:51 jon Exp $
+ * @version $Id: SessionBindingEventProxy.java,v 1.3 2002/03/20 01:55:29 brekke Exp $
*/
public class SessionBindingEventProxy
implements HttpSessionBindingListener, java.io.Serializable
1.9 +2 -5 jakarta-turbine-3/src/java/org/apache/turbine/services/rundata/TurbineRunDataService.java
Index: TurbineRunDataService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/services/rundata/TurbineRunDataService.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TurbineRunDataService.java 25 Jan 2002 23:36:19 -0000 1.8
+++ TurbineRunDataService.java 20 Mar 2002 01:55:29 -0000 1.9
@@ -54,11 +54,9 @@
* <http://www.apache.org/>.
*/
-import java.util.Map;
import java.util.HashMap;
import java.util.Iterator;
import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
import javax.servlet.ServletConfig;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -79,7 +77,7 @@
* the implementations should implement the Recyclable interface.
*
* @author <a href="mailto:ilkka.priha@simsoft.fi">Ilkka Priha</a>
- * @version $Id: TurbineRunDataService.java,v 1.8 2002/01/25 23:36:19 jmcnally Exp $
+ * @version $Id: TurbineRunDataService.java,v 1.9 2002/03/20 01:55:29 brekke Exp $
*/
public class TurbineRunDataService
extends BaseService
@@ -139,9 +137,8 @@
}
/**
- * Initializes the service by setting the pool capacity.
+ * Initializes the service.
*
- * @param config initialization configuration.
* @throws InitializationException if initialization fails.
*/
public void init()
1.2 +2 -3 jakarta-turbine-3/src/java/org/apache/turbine/services/rundata/TurbineSessionBindingEvent.java
Index: TurbineSessionBindingEvent.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/services/rundata/TurbineSessionBindingEvent.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TurbineSessionBindingEvent.java 16 Aug 2001 04:41:46 -0000 1.1
+++ TurbineSessionBindingEvent.java 20 Mar 2002 01:55:29 -0000 1.2
@@ -54,7 +54,6 @@
* <http://www.apache.org/>.
*/
-import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpSessionBindingEvent;
import org.apache.fulcrum.security.session.Session;
@@ -62,10 +61,10 @@
/**
* Turbine's implementation of Fulcrum's
- * {@link org.apache.fulcrum.session.SessionBindingEvent} interface.
+ * {@link org.apache.fulcrum.security.session.SessionBindingEvent} interface.
*
* @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
- * @version $Id: TurbineSessionBindingEvent.java,v 1.1 2001/08/16 04:41:46 jvanzyl Exp $
+ * @version $Id: TurbineSessionBindingEvent.java,v 1.2 2002/03/20 01:55:29 brekke Exp $
*/
public class TurbineSessionBindingEvent implements SessionBindingEvent
{
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>