mpoeschl 01/07/15 11:39:42
Modified: src/share/sample30/src/java/modules/actions
SecureAction.java
src/share/sample30/src/java/modules/screens
SecureScreen.java
src/share/sample30/src/java/modules/tags UserInfoTag.java
Log:
update imports
Revision Changes Path
1.2 +8 -8
jakarta-turbine-tdk/src/share/sample30/src/java/modules/actions/SecureAction.java
Index: SecureAction.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-tdk/src/share/sample30/src/java/modules/actions/SecureAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SecureAction.java 2001/07/13 20:56:26 1.1
+++ SecureAction.java 2001/07/15 18:39:41 1.2
@@ -25,13 +25,13 @@
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Turbine" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Apache Turbine" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
* written permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -57,7 +57,7 @@
import org.apache.turbine.RunData;
import org.apache.turbine.modules.actions.TemplateSecureAction;
import org.apache.turbine.services.security.TurbineSecurity;
-import org.apache.turbine.util.security.AccessControlList;
+import org.apache.turbine.services.security.util.AccessControlList;
import org.apache.turbine.TemplateContext;
/**
@@ -70,7 +70,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>John Thorhauer</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
*/
-public class SecureAction
+public class SecureAction
extends TemplateSecureAction
{
/**
@@ -97,10 +97,10 @@
protected boolean isAuthorized( RunData data ) throws Exception
{
boolean isAuthorized = false;
-
+
// Get acl and check security.
AccessControlList acl = data.getACL();
-
+
if (acl == null || ! acl.hasRole("turbine_root"))
{
isAuthorized = false;
1.2 +8 -8
jakarta-turbine-tdk/src/share/sample30/src/java/modules/screens/SecureScreen.java
Index: SecureScreen.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-tdk/src/share/sample30/src/java/modules/screens/SecureScreen.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SecureScreen.java 2001/07/13 20:56:26 1.1
+++ SecureScreen.java 2001/07/15 18:39:42 1.2
@@ -25,13 +25,13 @@
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Turbine" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Apache Turbine" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
* written permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -58,7 +58,7 @@
import org.apache.turbine.Turbine;
import org.apache.turbine.RunData;
import org.apache.turbine.TemplateContext;
-import org.apache.turbine.util.security.AccessControlList;
+import org.apache.turbine.services.security.util.AccessControlList;
import org.apache.turbine.modules.screens.TemplateSecureScreen;
/**
@@ -68,7 +68,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
*/
-public class SecureScreen
+public class SecureScreen
extends TemplateSecureScreen
{
public void doBuildTemplate(RunData data, TemplateContext context)
@@ -83,13 +83,13 @@
* @return True if the user is authorized to access the screen.
* @exception Exception, a generic exception.
*/
- protected boolean isAuthorized( RunData data )
+ protected boolean isAuthorized( RunData data )
throws Exception
{
boolean isAuthorized = false;
AccessControlList acl = data.getACL();
-
+
if (acl==null || ! acl.hasRole("turbine_root"))
{
data.setTarget(Turbine.getConfiguration().getString("template.login"));
1.2 +1 -1
jakarta-turbine-tdk/src/share/sample30/src/java/modules/tags/UserInfoTag.java
Index: UserInfoTag.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-tdk/src/share/sample30/src/java/modules/tags/UserInfoTag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- UserInfoTag.java 2001/07/13 20:56:27 1.1
+++ UserInfoTag.java 2001/07/15 18:39:42 1.2
@@ -8,7 +8,7 @@
import org.apache.turbine.RunData;
import org.apache.turbine.services.jsp.JspService;
-import org.apache.turbine.om.security.User;
+import org.apache.turbine.services.security.entity.User;
/**
* UserInfoTag is a sample JSP tag handler that displays the full
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
