svn commit: r1203644 - in /cocoon/cocoon3/trunk/cocoon-shiro/src/main/java/org/apache/cocoon: shiro/rest/AbstractShiroLogin.java sitemap/expression/ShiroInterpreter.java

[th...@apache.org]

Author: thorsten
Date: Fri Nov 18 13:28:31 2011
New Revision: 1203644

URL: http://svn.apache.org/viewvc?rev=1203644&view=rev
Log:
Updating shiro components to use the new object in sitemap mechanism. Removing fixme note since latest work by Francesco on the string-template reader fixed the underlying issue

Modified:
    cocoon/cocoon3/trunk/cocoon-shiro/src/main/java/org/apache/cocoon/shiro/rest/AbstractShiroLogin.java
    cocoon/cocoon3/trunk/cocoon-shiro/src/main/java/org/apache/cocoon/sitemap/expression/ShiroInterpreter.java

Modified: cocoon/cocoon3/trunk/cocoon-shiro/src/main/java/org/apache/cocoon/shiro/rest/AbstractShiroLogin.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-shiro/src/main/java/org/apache/cocoon/shiro/rest/AbstractShiroLogin.java?rev=1203644&r1=1203643&r2=1203644&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-shiro/src/main/java/org/apache/cocoon/shiro/rest/AbstractShiroLogin.java (original)
+++ cocoon/cocoon3/trunk/cocoon-shiro/src/main/java/org/apache/cocoon/shiro/rest/AbstractShiroLogin.java Fri Nov 18 13:28:31 2011
@@ -99,8 +99,7 @@ public abstract class AbstractShiroLogin
         }
         Map<String, Object> data = new HashMap<String, Object>();
         data.put("to", getTo());
-        // FIXME: If we activate the following $if(error)$ will kick in even if it should not!
-        //data.put("error", false);
+        data.put("error", false);
         return new URLResponse(getLoginPage(), data);
     }
 

Modified: cocoon/cocoon3/trunk/cocoon-shiro/src/main/java/org/apache/cocoon/sitemap/expression/ShiroInterpreter.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-shiro/src/main/java/org/apache/cocoon/sitemap/expression/ShiroInterpreter.java?rev=1203644&r1=1203643&r2=1203644&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-shiro/src/main/java/org/apache/cocoon/sitemap/expression/ShiroInterpreter.java (original)
+++ cocoon/cocoon3/trunk/cocoon-shiro/src/main/java/org/apache/cocoon/sitemap/expression/ShiroInterpreter.java Fri Nov 18 13:28:31 2011
@@ -24,7 +24,7 @@ import org.apache.shiro.subject.Subject;
 
 public class ShiroInterpreter implements LanguageInterpreter {
 
-    public String resolve(String expression, ObjectModel objectModel) {
+    public Object resolve(String expression, ObjectModel objectModel) {
         Object o = null;
         Subject subject = SecurityUtils.getSubject();
         if (expression.equals("authenticated")) {
@@ -36,7 +36,7 @@ public class ShiroInterpreter implements
             }
             o = principal;
         }
-        return o != null ? o.toString() : "";
+        return o != null ? o : new String("");
     }
 
 }