svn commit: r219170 - in /lenya/trunk/src: java/org/apache/lenya/cms/ac/usecases/Login.java webapp/lenya/usecases/ac/login.jx

Author: andreas
Date: Fri Jul 15 01:26:36 2005
New Revision: 219170

URL: http://svn.apache.org/viewcvs?rev=219170&view=rev
Log:
Adding publication ID to login screen

Modified:
    lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/Login.java
    lenya/trunk/src/webapp/lenya/usecases/ac/login.jx

Modified: lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/Login.java
URL: 
http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/Login.java?rev=219170&r1=219169&r2=219170&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/Login.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/ac/usecases/Login.java Fri Jul 15 
01:26:36 2005
@@ -18,10 +18,12 @@
 
 import java.util.Map;
 
-import org.apache.lenya.cms.usecase.UsecaseException;
 import org.apache.cocoon.components.ContextHelper;
 import org.apache.cocoon.environment.ObjectModelHelper;
 import org.apache.cocoon.environment.Request;
+import org.apache.lenya.cms.publication.Publication;
+import org.apache.lenya.cms.publication.PublicationFactory;
+import org.apache.lenya.cms.usecase.UsecaseException;
 
 /**
  * Usecase to login a user.
@@ -31,6 +33,24 @@
 public class Login extends AccessControlUsecase {
 
     protected static final String REFERRER_QUERY_STRING = 
"referrerQueryString";
+    protected static final String PUBLICATION_ID = "publicationId";
+
+    /**
+     * @see org.apache.lenya.cms.usecase.AbstractUsecase#initParameters()
+     */
+    protected void initParameters() {
+        super.initParameters();
+
+        try {
+            PublicationFactory factory = 
PublicationFactory.getInstance(getLogger());
+            Publication pub = factory.getPublication(this.manager, 
getSourceURL());
+            if (pub.exists()) {
+                setParameter(PUBLICATION_ID, pub.getId());
+            }
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
 
     /**
      * Ctor.

Modified: lenya/trunk/src/webapp/lenya/usecases/ac/login.jx
URL: 
http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/usecases/ac/login.jx?rev=219170&r1=219169&r2=219170&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/usecases/ac/login.jx (original)
+++ lenya/trunk/src/webapp/lenya/usecases/ac/login.jx Fri Jul 15 01:26:36 2005
@@ -25,7 +25,7 @@
   <page:title>
     <i18n:translate>
       <i18n:text i18n:key="login-to-pub"/>
-      <i18n:param></i18n:param>
+      <i18n:param><jx:out 
value="${usecase.getParameterAsString('publicationId').toUpperCase()}"/></i18n:param>
     </i18n:translate>
   </page:title>
   <page:body>