svn commit: r1025853 - in /lenya/trunk/org.apache.lenya.core.acusecases: ./ src/main/java/org/apache/lenya/cms/ac/usecases/ src/main/resources/COB-INF/jx/ src/main/resources/META-INF/cocoon/spring/ src/test/ src/test/java/ src/test/java/org/ src/test/j...

Author: florent
Date: Thu Oct 21 06:53:55 2010
New Revision: 1025853

URL: http://svn.apache.org/viewvc?rev=1025853&view=rev
Log:
Solve ac related bugs for login page. For this
add a first test case that have to be continue
Change in login the way to retrieve publication name (change of URLInformation class) with the spring context
add the continuation parameter in the spring declaration
change way to call cocoon request and continuation components in the login.jx
add dependency for template generation and tests in pom

Added:
    lenya/trunk/org.apache.lenya.core.acusecases/src/test/
    lenya/trunk/org.apache.lenya.core.acusecases/src/test/java/
    lenya/trunk/org.apache.lenya.core.acusecases/src/test/java/org/
    lenya/trunk/org.apache.lenya.core.acusecases/src/test/java/org/apache/
    lenya/trunk/org.apache.lenya.core.acusecases/src/test/java/org/apache/lenya/
    lenya/trunk/org.apache.lenya.core.acusecases/src/test/java/org/apache/lenya/cms/
    lenya/trunk/org.apache.lenya.core.acusecases/src/test/java/org/apache/lenya/cms/ac/
    lenya/trunk/org.apache.lenya.core.acusecases/src/test/java/org/apache/lenya/cms/ac/usecases/
    lenya/trunk/org.apache.lenya.core.acusecases/src/test/java/org/apache/lenya/cms/ac/usecases/LoginTest.java
Modified:
    lenya/trunk/org.apache.lenya.core.acusecases/pom.xml
    lenya/trunk/org.apache.lenya.core.acusecases/src/main/java/org/apache/lenya/cms/ac/usecases/Login.java
    lenya/trunk/org.apache.lenya.core.acusecases/src/main/resources/COB-INF/jx/login.jx
    lenya/trunk/org.apache.lenya.core.acusecases/src/main/resources/META-INF/cocoon/spring/lenya-core-acusecases-components.xml

Modified: lenya/trunk/org.apache.lenya.core.acusecases/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.acusecases/pom.xml?rev=1025853&r1=1025852&r2=1025853&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.acusecases/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.core.acusecases/pom.xml Thu Oct 21 06:53:55 2010
@@ -32,5 +32,36 @@
       <artifactId>servlet-api</artifactId>
       <scope>provided</scope>
     </dependency>
+     <!-- for template generation -->
+    <dependency>
+	<groupId>org.apache.cocoon</groupId>
+	<artifactId>cocoon-template-impl</artifactId>
+    </dependency>
+       <!-- Tests -->
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-core</artifactId>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+    <!-- FIXME: This dependency is transitive and should be obtained automatically
+      see http://jira.codehaus.org/browse/MNG-1378 -->
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-sitemap-impl</artifactId>
+      <scope>test</scope>
+      <type>test-jar</type>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.lenya</groupId>
+      <artifactId>lenya-core-api</artifactId>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>

Modified: lenya/trunk/org.apache.lenya.core.acusecases/src/main/java/org/apache/lenya/cms/ac/usecases/Login.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.acusecases/src/main/java/org/apache/lenya/cms/ac/usecases/Login.java?rev=1025853&r1=1025852&r2=1025853&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.acusecases/src/main/java/org/apache/lenya/cms/ac/usecases/Login.java (original)
+++ lenya/trunk/org.apache.lenya.core.acusecases/src/main/java/org/apache/lenya/cms/ac/usecases/Login.java Thu Oct 21 06:53:55 2010
@@ -47,7 +47,7 @@ public class Login extends AccessControl
         super.initParameters();
 
         try {
-            URLInformation info = new URLInformation(getSourceURL());
+            URLInformation info = new URLInformation();
             String pubId = info.getPublicationId();
             if (getSession().existsPublication(pubId)) {
                 Publication publication = getSession().getPublication(pubId);

Modified: lenya/trunk/org.apache.lenya.core.acusecases/src/main/resources/COB-INF/jx/login.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.acusecases/src/main/resources/COB-INF/jx/login.jx?rev=1025853&r1=1025852&r2=1025853&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.acusecases/src/main/resources/COB-INF/jx/login.jx (original)
+++ lenya/trunk/org.apache.lenya.core.acusecases/src/main/resources/COB-INF/jx/login.jx Thu Oct 21 06:53:55 2010
@@ -48,7 +48,7 @@
           <i18n:translate>
             <i18n:text i18n:key="user-not-authorized"/>
             <i18n:param><jx:out value="${usecase.getParameter('currentUser').getId()}"/></i18n:param>
-            <i18n:param><jx:out value="${request.getRequestURI()}"/></i18n:param>
+            <i18n:param><jx:out value="${cocoon.request.getRequestURI()}"/></i18n:param>
           </i18n:translate>
           <br/>
           <br/>
@@ -89,7 +89,7 @@
 
       <div class="lenya-box-body">
         <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
-        <form name="login" id="login" method="post" action="?lenya.continuation=${continuation.id}&amp;lenya.usecase=${usecase.getName()}">
+        <form name="login" id="login" method="post" action="?lenya.continuation=${cocoon.continuation.id}&amp;lenya.usecase=${usecase.getName()}">
           <table class="lenya-table-noborder">
             <tr>
               <td><label for="name"><i18n:text>Username</i18n:text>: </label></td>

Modified: lenya/trunk/org.apache.lenya.core.acusecases/src/main/resources/META-INF/cocoon/spring/lenya-core-acusecases-components.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.acusecases/src/main/resources/META-INF/cocoon/spring/lenya-core-acusecases-components.xml?rev=1025853&r1=1025852&r2=1025853&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.acusecases/src/main/resources/META-INF/cocoon/spring/lenya-core-acusecases-components.xml (original)
+++ lenya/trunk/org.apache.lenya.core.acusecases/src/main/resources/META-INF/cocoon/spring/lenya-core-acusecases-components.xml Thu Oct 21 06:53:55 2010
@@ -34,6 +34,7 @@
       <bean class="org.apache.lenya.cms.usecase.UsecaseView">
         <property name="guiManager" ref="org.apache.lenya.cms.usecase.gui.GUIManager"/>
         <property name="uri" value="fallback://lenya/modules/acusecases/jx/login.jx"/>
+        <property name="createContinuation" value="true"/>
       </bean>
     </property>
   </bean>

Added: lenya/trunk/org.apache.lenya.core.acusecases/src/test/java/org/apache/lenya/cms/ac/usecases/LoginTest.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.acusecases/src/test/java/org/apache/lenya/cms/ac/usecases/LoginTest.java?rev=1025853&view=auto
==============================================================================
--- lenya/trunk/org.apache.lenya.core.acusecases/src/test/java/org/apache/lenya/cms/ac/usecases/LoginTest.java (added)
+++ lenya/trunk/org.apache.lenya.core.acusecases/src/test/java/org/apache/lenya/cms/ac/usecases/LoginTest.java Thu Oct 21 06:53:55 2010
@@ -0,0 +1,19 @@
+package org.apache.lenya.cms.ac.usecases;
+
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Ignore;
+import org.junit.Test;
+
+public class LoginTest {
+
+	@Ignore("Find a way to retrieve all the test context") @Test
+    public void testParametersInit(){
+		Login login = new Login();
+		login.initParameters();
+		String pubName = login.getParameterAsString("Publication");
+    	assertEquals("test", pubName);
+    }
+
+}