You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by he...@apache.org on 2003/02/28 15:49:25 UTC
cvs commit: jakarta-turbine-2/src/java/org/apache/turbine/modules/actions LoginUser.java LogoutUser.java
henning 2003/02/28 06:49:25
Modified: src/java/org/apache/turbine/modules/actions LoginUser.java
LogoutUser.java
Log:
Removed TurbineResources Service reference
Revision Changes Path
1.6 +19 -10 jakarta-turbine-2/src/java/org/apache/turbine/modules/actions/LoginUser.java
Index: LoginUser.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/actions/LoginUser.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- LoginUser.java 12 Feb 2003 17:52:16 -0000 1.5
+++ LoginUser.java 28 Feb 2003 14:49:25 -0000 1.6
@@ -54,14 +54,22 @@
* <http://www.apache.org/>.
*/
+import org.apache.commons.configuration.Configuration;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+
+import org.apache.turbine.Turbine;
import org.apache.turbine.TurbineConstants;
+
import org.apache.turbine.modules.Action;
+
import org.apache.turbine.om.security.User;
-import org.apache.turbine.services.resources.TurbineResources;
+
import org.apache.turbine.services.security.TurbineSecurity;
+
import org.apache.turbine.util.RunData;
+
import org.apache.turbine.util.security.DataBackendException;
import org.apache.turbine.util.security.TurbineSecurityException;
@@ -71,9 +79,11 @@
* that users last login time will be updated.
*
* @author <a href="mailto:mbryson@mont.mindspring.com">Dave Bryson</a>
+ * @author <a href="mailto:hps@intermeta.de">Henning P. Schmiedehausen</a>
* @version $Id$
*/
-public class LoginUser extends Action
+public class LoginUser
+ extends Action
{
/** Logging */
private static Log log = LogFactory.getLog(LoginUser.class);
@@ -140,16 +150,16 @@
}
catch (TurbineSecurityException e)
{
+ Configuration conf = Turbine.getConfiguration();
+
if (e instanceof DataBackendException)
{
log.error(e);
}
- data.setMessage(TurbineResources.getString(
- TurbineConstants.LOGIN_ERROR));
+ data.setMessage(conf.getString(TurbineConstants.LOGIN_ERROR));
// Retrieve an anonymous user.
- data.setUser(TurbineSecurity.getAnonymousUser());
- String loginTemplate = TurbineResources.getString(
- TurbineConstants.TEMPLATE_LOGIN);
+ data.setUser (TurbineSecurity.getAnonymousUser());
+ String loginTemplate = conf.getString(TurbineConstants.TEMPLATE_LOGIN);
if (loginTemplate != null && loginTemplate.length() > 0)
{
@@ -157,8 +167,7 @@
}
else
{
- data.setScreen(TurbineResources.getString(
- TurbineConstants.SCREEN_LOGIN));
+ data.setScreen(conf.getString(TurbineConstants.SCREEN_LOGIN));
}
}
}
1.7 +19 -9 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- LogoutUser.java 27 Feb 2003 23:07:41 -0000 1.6
+++ LogoutUser.java 28 Feb 2003 14:49:25 -0000 1.7
@@ -54,12 +54,19 @@
* <http://www.apache.org/>.
*/
+import org.apache.commons.configuration.Configuration;
+
+import org.apache.turbine.Turbine;
import org.apache.turbine.TurbineConstants;
+
import org.apache.turbine.modules.Action;
+
import org.apache.turbine.om.security.User;
-import org.apache.turbine.services.resources.TurbineResources;
+
import org.apache.turbine.services.security.TurbineSecurity;
+
import org.apache.turbine.util.RunData;
+
import org.apache.turbine.util.security.AccessControlList;
/**
@@ -67,9 +74,11 @@
* the User object in the session.
*
* @author <a href="mailto:mbryson@mont.mindspring.com">Dave Bryson</a>
+ * @author <a href="mailto:hps@intermeta.de">Henning P. Schmiedehausen</a>
* @version $Id$
*/
-public class LogoutUser extends Action
+public class LogoutUser
+ extends Action
{
/**
* Clears the RunData user object back to an anonymous status not
@@ -105,8 +114,9 @@
TurbineSecurity.saveUser(user);
}
- data.setMessage(TurbineResources.getString(
- TurbineConstants.LOGOUT_MESSAGE));
+ Configuration conf = Turbine.getConfiguration();
+
+ data.setMessage(conf.getString(TurbineConstants.LOGOUT_MESSAGE));
// This will cause the acl to be removed from the session in
// the Turbine servlet code.
@@ -128,11 +138,11 @@
// - 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_KEY, "")
- .equals("LogoutUser"))
+ if (!conf.getString(TurbineConstants.ACTION_LOGOUT_KEY,
+ TurbineConstants.ACTION_LOGOUT_DEFAULT)
+ .equals(TurbineConstants.ACTION_LOGOUT_DEFAULT))
{
- data.setScreen(TurbineResources.getString(
- TurbineConstants.SCREEN_HOMEPAGE));
+ data.setScreen(conf.getString(TurbineConstants.SCREEN_HOMEPAGE));
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org