You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by mp...@apache.org on 2003/02/28 00:07:42 UTC
cvs commit: jakarta-turbine-2/src/java/org/apache/turbine/modules/screens VelocityErrorScreen.java
mpoeschl 2003/02/27 15:07:42
Modified: src/java/org/apache/turbine/modules/actions LogoutUser.java
src/java/org/apache/turbine/modules/screens
VelocityErrorScreen.java
Log:
some names in TurbineConstants changed
Revision Changes Path
1.6 +3 -3 jakarta-turbine-2/src/java/org/apache/turbine/modules/actions/LogoutUser.java
Index: LogoutUser.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/actions/LogoutUser.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- LogoutUser.java 12 Feb 2003 17:52:16 -0000 1.5
+++ LogoutUser.java 27 Feb 2003 23:07:41 -0000 1.6
@@ -86,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
@@ -128,7 +128,7 @@
// - it is recommended that action.logout is set to "LogoutUser" and
// that the session validator does handle setting the screen/template
// for a logged out (read not-logged-in) user.
- if (!TurbineResources.getString(TurbineConstants.ACTION_LOGOUT, "")
+ if (!TurbineResources.getString(TurbineConstants.ACTION_LOGOUT_KEY, "")
.equals("LogoutUser"))
{
data.setScreen(TurbineResources.getString(
1.5 +5 -6 jakarta-turbine-2/src/java/org/apache/turbine/modules/screens/VelocityErrorScreen.java
Index: VelocityErrorScreen.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/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 12 Feb 2003 17:52:19 -0000 1.4
+++ VelocityErrorScreen.java 27 Feb 2003 23:07:42 -0000 1.5
@@ -73,17 +73,16 @@
*
* @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,
- Context context)
+ protected void doBuildTemplate(RunData data, Context context)
throws Exception
{
context.put("processingException",
data.getStackTraceException().toString());
context.put("stackTrace", data.getStackTrace());
- String errorTemplate = TurbineResources.getString(TurbineConstants.TEMPLATE_ERROR,
- "error.vm");
+ String errorTemplate = TurbineResources.getString(
+ TurbineConstants.TEMPLATE_ERROR_KEY, "error.vm");
setTemplate(data, errorTemplate);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org
Re: cvs commit: jakarta-turbine-2/src/java/org/apache/turbine/modules/screens VelocityErrorScreen.java
Posted by "Henning P. Schmiedehausen" <hp...@intermeta.de>.
mpoeschl@apache.org writes:
>mpoeschl 2003/02/27 15:07:42
> Modified: src/java/org/apache/turbine/modules/actions LogoutUser.java
> src/java/org/apache/turbine/modules/screens
> VelocityErrorScreen.java
> Log:
> some names in TurbineConstants changed
Thanks Martin. I'm not through with all my changes yet, I will clean
up the remaining places, so you don't have to make all the work, I
will do it anyway.
Regards
Henning
--
Dipl.-Inf. (Univ.) Henning P. Schmiedehausen INTERMETA GmbH
hps@intermeta.de +49 9131 50 654 0 http://www.intermeta.de/
Java, perl, Solaris, Linux, xSP Consulting, Web Services
freelance consultant -- Jakarta Turbine Development -- hero for hire
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org
Re: cvs commit: jakarta-turbine-2/src/java/org/apache/turbine/modules/screens
Posted by "Henning P. Schmiedehausen" <hp...@intermeta.de>.
Martin Poeschl <mp...@marmot.at> writes:
>mpoeschl@apache.org wrote:
>> mpoeschl 2003/02/27 15:07:42
>>
>> Modified: src/java/org/apache/turbine/modules/actions LogoutUser.java
>> src/java/org/apache/turbine/modules/screens
>> VelocityErrorScreen.java
>> Log:
>> some names in TurbineConstants changed
>henning:
>Folks, it might annoy you, but _testing_ your stuff before checking in
>would really be great.
Strange. I run "rm -rf target ; maven " as part of my script to run
CVS checkins, and I haven't any trouble.
But I accept all the blame. What kind of beer do you prefer? :-)
Regards
Henning
--
Dipl.-Inf. (Univ.) Henning P. Schmiedehausen INTERMETA GmbH
hps@intermeta.de +49 9131 50 654 0 http://www.intermeta.de/
Java, perl, Solaris, Linux, xSP Consulting, Web Services
freelance consultant -- Jakarta Turbine Development -- hero for hire
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org
Re: cvs commit: jakarta-turbine-2/src/java/org/apache/turbine/modules/screens
VelocityErrorScreen.java
Posted by Martin Poeschl <mp...@marmot.at>.
mpoeschl@apache.org wrote:
> mpoeschl 2003/02/27 15:07:42
>
> Modified: src/java/org/apache/turbine/modules/actions LogoutUser.java
> src/java/org/apache/turbine/modules/screens
> VelocityErrorScreen.java
> Log:
> some names in TurbineConstants changed
henning:
Folks, it might annoy you, but _testing_ your stuff before checking in
would really be great.
;-)
martin
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org