jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ajaqu...@apache.org
Subject svn commit: r905900 - in /incubator/jspwiki/trunk: src/WebContent/WEB-INF/ src/WebContent/WEB-INF/classes/ tests/java/org/apache/wiki/action/ tests/java/org/apache/wiki/ui/stripes/
Date Wed, 03 Feb 2010 05:29:17 GMT
Author: ajaquith
Date: Wed Feb  3 05:29:15 2010
New Revision: 905900

URL: http://svn.apache.org/viewvc?rev=905900&view=rev
Log:
[JSPWIKI-578] Eliminated top-level JSPs for Edit.jsp, Preview.jsp, CreateProfile.jsp, Login.jsp,
LoginForm.jsp, LostPassword.jsp, and UserPreferences.jsp and consolidated the markup into
the template JSPs.

Modified:
    incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources.properties
    incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_de.properties
    incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_es.properties
    incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_fi.properties
    incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_fr.properties
    incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_it.properties
    incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_nl.properties
    incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_ru.properties
    incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_zh_CN.properties
    incubator/jspwiki/trunk/src/WebContent/WEB-INF/web.xml
    incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/DiffActionBeanTest.java
    incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/EditActionBeanTest.java
    incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/GroupActionBeanTest.java
    incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/LoginActionBeanTest.java
    incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/UserPreferencesActionBeanTest.java
    incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/UserProfileActionBeanTest.java
    incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/ViewActionBeanTest.java
    incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/stripes/IsOneOfTest.java
    incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/stripes/ShortUrlRedirectFilterTest.java

Modified: incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources.properties?rev=905900&r1=905899&r2=905900&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources.properties (original)
+++ incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources.properties Wed Feb
 3 05:29:15 2010
@@ -238,8 +238,6 @@
 login=Login
 # Formerly login.lostpw.name, prefs.email
 email=E-mail address
-# Formerly login.lostpw.submit
-resetPassword=Reset password
 # Formerly prefs.loginname
 profile.loginName=Login name
 # Formerly prefs.password
@@ -382,3 +380,5 @@
 org.apache.wiki.action.DeleteActionBean.delete=Delete entire page
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
info.rename.submit.. Formerly named org.apache.wiki.action.ViewActionBean.delete.. Formerly
named org.apache.wiki.action.ViewActionBean.rename.
 org.apache.wiki.action.RenameActionBean.rename=Rename page
+#Formerly login.lostpw.submit. Formerly named resetPassword.
+org.apache.wiki.action.LostPasswordActionBean.reset=Reset password

Modified: incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_de.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_de.properties?rev=905900&r1=905899&r2=905900&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_de.properties (original)
+++ incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_de.properties Wed
Feb  3 05:29:15 2010
@@ -242,8 +242,6 @@
 login=Anmeldung
 # Formerly login.lostpw.name, prefs.email
 email=E-Mail-Adresse
-# Formerly login.lostpw.submit
-resetPassword=Passwort zurücksetzen
 # Formerly prefs.loginname
 profile.loginName=Benutzername
 # Formerly prefs.password
@@ -349,6 +347,8 @@
 org.apache.wiki.action.DeleteActionBean.delete=Komplette Seite löschen
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
info.rename.submit.. Formerly named org.apache.wiki.action.ViewActionBean.delete.. Formerly
named org.apache.wiki.action.ViewActionBean.rename.
 org.apache.wiki.action.RenameActionBean.rename=Seite umbenennen
+#Formerly login.lostpw.submit. Formerly named resetPassword.
+org.apache.wiki.action.LostPasswordActionBean.reset=Passwort zurücksetzen
 # Outdated or superfluous properties since 3.0.0
 
 # folgende Properties sind in der aktuellen 'default en' Datei nicht enthalten

Modified: incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_es.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_es.properties?rev=905900&r1=905899&r2=905900&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_es.properties (original)
+++ incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_es.properties Wed
Feb  3 05:29:15 2010
@@ -236,7 +236,6 @@
 remember=¿Recordarme?
 login=Iniciar sesión
 email=Dirección E-mail
-resetPassword=¡Resetear contraseña!
 profile.loginName=Nombre de inicio de sesión
 profile.password=Contraseña
 passwordAgain=Verificación de contraseña
@@ -350,3 +349,5 @@
 org.apache.wiki.action.DeleteActionBean.delete=Borrar toda la página
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
info.rename.submit.. Formerly named org.apache.wiki.action.ViewActionBean.delete.. Formerly
named org.apache.wiki.action.ViewActionBean.rename.
 org.apache.wiki.action.RenameActionBean.rename=Renombrar página
+#Formerly named resetPassword.
+org.apache.wiki.action.LostPasswordActionBean.reset=¡Resetear contraseña!

Modified: incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_fi.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_fi.properties?rev=905900&r1=905899&r2=905900&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_fi.properties (original)
+++ incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_fi.properties Wed
Feb  3 05:29:15 2010
@@ -152,7 +152,6 @@
 remember=Muista minut
 login=Kirjaudu
 email=Sähköpostiosoite
-resetPassword=Lähetä uusi salasana!
 profile.loginName=Käyttäjätunnus
 profile.password=Salasana
 passwordAgain=Vahvista salasana
@@ -241,3 +240,5 @@
 org.apache.wiki.action.DeleteActionBean.delete=Poista koko sivu
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
info.rename.submit.. Formerly named org.apache.wiki.action.ViewActionBean.delete.. Formerly
named org.apache.wiki.action.ViewActionBean.rename.
 org.apache.wiki.action.RenameActionBean.rename=Vaihda sivun nimeä
+#Formerly named resetPassword.
+org.apache.wiki.action.LostPasswordActionBean.reset=Lähetä uusi salasana!

Modified: incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_fr.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_fr.properties?rev=905900&r1=905899&r2=905900&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_fr.properties (original)
+++ incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_fr.properties Wed
Feb  3 05:29:15 2010
@@ -166,7 +166,6 @@
 remember=Se souvenir de moi
 login=S'identifier
 email=Adresse e-mail
-resetPassword=Réinitialiser le mot de passe !
 profile.loginName=Identifiant
 profile.password=Mot de passe
 passwordAgain=Vérification du mot de passe
@@ -256,3 +255,5 @@
 org.apache.wiki.action.DeleteActionBean.delete=Supprimer la page entière
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
info.rename.submit.. Formerly named org.apache.wiki.action.ViewActionBean.delete.. Formerly
named org.apache.wiki.action.ViewActionBean.rename.
 org.apache.wiki.action.RenameActionBean.rename=Renommer la page
+#Formerly named resetPassword.
+org.apache.wiki.action.LostPasswordActionBean.reset=Réinitialiser le mot de passe !

Modified: incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_it.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_it.properties?rev=905900&r1=905899&r2=905900&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_it.properties (original)
+++ incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_it.properties Wed
Feb  3 05:29:15 2010
@@ -164,7 +164,6 @@
 remember=Ricorda?
 login=Login
 email=Indirizzo E-mail
-resetPassword=Cambia la password !
 profile.loginName=Login nome
 profile.password=Password
 passwordAgain=Verifica password
@@ -254,3 +253,5 @@
 org.apache.wiki.action.DeleteActionBean.delete=Elimina l’intera pagina
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
info.rename.submit.. Formerly named org.apache.wiki.action.ViewActionBean.delete.. Formerly
named org.apache.wiki.action.ViewActionBean.rename.
 org.apache.wiki.action.RenameActionBean.rename=Rinomina la pagina
+#Formerly named resetPassword.
+org.apache.wiki.action.LostPasswordActionBean.reset=Cambia la password !

Modified: incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_nl.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_nl.properties?rev=905900&r1=905899&r2=905900&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_nl.properties (original)
+++ incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_nl.properties Wed
Feb  3 05:29:15 2010
@@ -162,7 +162,6 @@
 remember=Bewaar login naam in browser cookie?
 login=Login
 email=Email adres
-resetPassword=Genereer een nieuw wachtwoord !
 profile.loginName=Login naam
 profile.password=Wachtwoord
 passwordAgain=Bevestig wachtwoord
@@ -310,3 +309,5 @@
 org.apache.wiki.action.DeleteActionBean.delete=Pagina Verwijderen
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
info.rename.submit.. Formerly named org.apache.wiki.action.ViewActionBean.delete.. Formerly
named org.apache.wiki.action.ViewActionBean.rename.
 org.apache.wiki.action.RenameActionBean.rename=Pagina Hernoemen
+#Formerly named resetPassword.
+org.apache.wiki.action.LostPasswordActionBean.reset=Genereer een nieuw wachtwoord !

Modified: incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_ru.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_ru.properties?rev=905900&r1=905899&r2=905900&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_ru.properties (original)
+++ incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_ru.properties Wed
Feb  3 05:29:15 2010
@@ -170,7 +170,6 @@
 remember=\u0417\u0430\u043f\u043e\u043c\u043d\u0438\u0442\u044c?
 login=\u041b\u043e\u0433\u0438\u043d
 email=\u042d\u043b\u0435\u043a\u0442\u043e\u0440\u043d\u043d\u0430\u044f \u043f\u043e\u0447\u0442\u0430
-resetPassword=\u0421\u0431\u0440\u043e\u0441\u0438\u0442\u044c \u043f\u0430\u0440\u043e\u043b\u044c
!
 profile.loginName=\u041b\u043e\u0433\u0438\u043d
 profile.password=\u041f\u0430\u0440\u043e\u043b\u044c
 passwordAgain=\u041f\u0440\u043e\u0432\u0435\u0440\u043a\u0430 \u043f\u0430\u0440\u043e\u043b\u044f
@@ -259,3 +258,5 @@
 org.apache.wiki.action.DeleteActionBean.delete=\u0423\u0434\u0430\u043b\u0438\u0442\u044c
\u0441\u043e\u0434\u0435\u0440\u0436\u0430\u0449\u0443\u044e \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0443
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
info.rename.submit.. Formerly named org.apache.wiki.action.ViewActionBean.delete.. Formerly
named org.apache.wiki.action.ViewActionBean.rename.
 org.apache.wiki.action.RenameActionBean.rename=\u041f\u0435\u0440\u0435\u0438\u043c\u0435\u043d\u043e\u0432\u0430\u0442\u044c
\u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0443
+#Formerly named resetPassword.
+org.apache.wiki.action.LostPasswordActionBean.reset=\u0421\u0431\u0440\u043e\u0441\u0438\u0442\u044c
\u043f\u0430\u0440\u043e\u043b\u044c !

Modified: incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_zh_CN.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_zh_CN.properties?rev=905900&r1=905899&r2=905900&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_zh_CN.properties
(original)
+++ incubator/jspwiki/trunk/src/WebContent/WEB-INF/classes/CoreResources_zh_CN.properties
Wed Feb  3 05:29:15 2010
@@ -239,8 +239,6 @@
 login=\u767b\u5f55
 # Formerly login.lostpw.name, prefs.email
 email=\u7535\u5b50\u90ae\u4ef6\u5730\u5740
-# Formerly login.lostpw.submit
-resetPassword=\u91cd\u8bbe\u5bc6\u7801
 # Formerly prefs.loginname
 profile.loginName=\u767b\u5f55\u540d
 # Formerly prefs.password
@@ -347,3 +345,5 @@
 org.apache.wiki.action.DeleteActionBean.delete=\u5220\u9664\u6574\u4e2a\u9875\u9762
 #Copied from src/WebContent/WEB-INF/classes/templates/default.properties.. Formerly named
info.rename.submit.. Formerly named org.apache.wiki.action.ViewActionBean.delete.. Formerly
named org.apache.wiki.action.ViewActionBean.rename.
 org.apache.wiki.action.RenameActionBean.rename=\u91cd\u547d\u540d\u9875\u9762
+#Formerly login.lostpw.submit. Formerly named resetPassword.
+org.apache.wiki.action.LostPasswordActionBean.reset=\u91cd\u8bbe\u5bc6\u7801

Modified: incubator/jspwiki/trunk/src/WebContent/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/web.xml?rev=905900&r1=905899&r2=905900&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/WEB-INF/web.xml (original)
+++ incubator/jspwiki/trunk/src/WebContent/WEB-INF/web.xml Wed Feb  3 05:29:15 2010
@@ -358,8 +358,8 @@
    <login-config>
        <auth-method>FORM</auth-method>
        <form-login-config>
-           <form-login-page>/LoginForm.jsp</form-login-page>
-           <form-error-page>/LoginForm.jsp</form-error-page>
+           <form-login-page>/templates/default/LoginForm.jsp</form-login-page>
+           <form-error-page>/templates/default/LoginForm.jsp</form-error-page>
        </form-login-config>
    </login-config>
 

Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/DiffActionBeanTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/DiffActionBeanTest.java?rev=905900&r1=905899&r2=905900&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/DiffActionBeanTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/DiffActionBeanTest.java Wed
Feb  3 05:29:15 2010
@@ -93,13 +93,13 @@
         assertNotNull( history );
         assertEquals( 3, history.size() );
         
-        // Verify that the history was retrieved in the right order
-        assertEquals( 1, history.get( 0 ).getVersion() );
+        // Verify that the history was retrieved in the reverse order
+        assertEquals( 3, history.get( 0 ).getVersion() );
         assertEquals( 2, history.get( 1 ).getVersion() );
-        assertEquals( 3, history.get( 2 ).getVersion() );
-        assertEquals( "This is version one.\r\n", history.get( 0 ).getContentAsString() );
+        assertEquals( 1, history.get( 2 ).getVersion() );
+        assertEquals( "This is version three...\r\n", history.get( 0 ).getContentAsString()
);
         assertEquals( "This is version two!\r\n", history.get( 1 ).getContentAsString() );
-        assertEquals( "This is version three...\r\n", history.get( 2 ).getContentAsString()
);
+        assertEquals( "This is version one.\r\n", history.get( 2 ).getContentAsString() );
 
         // Delete the test page
         m_engine.deletePage( pageName );

Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/EditActionBeanTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/EditActionBeanTest.java?rev=905900&r1=905899&r2=905900&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/EditActionBeanTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/EditActionBeanTest.java Wed
Feb  3 05:29:15 2010
@@ -59,7 +59,7 @@
     public void testEditNoParameters() throws Exception
     {
         // Try editing without specifying a page
-        MockRoundtrip trip = m_engine.guestTrip( "/Edit.action" );
+        MockRoundtrip trip = m_engine.guestTrip( "/Edit.jsp" );
         String startTime = String.valueOf( System.currentTimeMillis() );
         trip.addParameter( "startTime", CryptoUtil.encrypt( startTime ) );
         trip.addParameter( "wikiText", "This is the edited text" );
@@ -88,7 +88,7 @@
         m_engine.deletePage( "FindPage" );
 
         // Try editing the 'special page'
-        MockRoundtrip trip = m_engine.guestTrip( "/Edit.action" );
+        MockRoundtrip trip = m_engine.guestTrip( "/Edit.jsp" );
         String startTime = String.valueOf( System.currentTimeMillis() );
         trip.addParameter( "page", "FindPage" );
         trip.addParameter( "startTime", CryptoUtil.encrypt( startTime ) );
@@ -122,7 +122,7 @@
         assertNotNull( "Did not save page " + pageName + "!", page );
 
         // Set up the marked-up page
-        MockRoundtrip trip = m_engine.guestTrip( "/Edit.action" );
+        MockRoundtrip trip = m_engine.guestTrip( "/Edit.jsp" );
         trip.setParameter( "page", pageName );
         String startTime = String.valueOf( System.currentTimeMillis() );
         trip.addParameter( "startTime", CryptoUtil.encrypt( startTime ) );
@@ -142,7 +142,7 @@
         assertEquals( "/Wiki.jsp?view=&page=" + pageName, trip.getDestination() );
         
         // Save the page one more time!
-        trip = m_engine.guestTrip( "/Edit.action" );
+        trip = m_engine.guestTrip( "/Edit.jsp" );
         trip.setParameter( "page", pageName );
         startTime = String.valueOf( System.currentTimeMillis() );
         trip.addParameter( "startTime", CryptoUtil.encrypt( startTime ) );
@@ -169,7 +169,7 @@
         assertFalse( m_engine.pageExists( pageName ) );
 
         // Set up the marked-up page
-        MockRoundtrip trip = m_engine.guestTrip( "/Edit.action" );
+        MockRoundtrip trip = m_engine.guestTrip( "/Edit.jsp" );
         trip.setParameter( "page", pageName );
         String startTime = String.valueOf( System.currentTimeMillis() );
         trip.addParameter( "startTime", CryptoUtil.encrypt( startTime ) );

Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/GroupActionBeanTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/GroupActionBeanTest.java?rev=905900&r1=905899&r2=905900&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/GroupActionBeanTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/GroupActionBeanTest.java Wed
Feb  3 05:29:15 2010
@@ -242,7 +242,7 @@
         GroupActionBean bean = trip.getActionBean( GroupActionBean.class );
         ValidationErrors errors = bean.getContext().getValidationErrors();
         assertEquals( 0, errors.size() );
-        assertEquals( "/Login.action", trip.getDestination().substring( 0, 13 ) );
+        assertEquals( "/Login.jsp", trip.getDestination().substring( 0, 13 ) );
         
         // Try saving again, this time authenticated
         trip = m_engine.authenticatedTrip( Users.JANNE, Users.JANNE_PASS, GroupActionBean.class
);

Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/LoginActionBeanTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/LoginActionBeanTest.java?rev=905900&r1=905899&r2=905900&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/LoginActionBeanTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/LoginActionBeanTest.java Wed
Feb  3 05:29:15 2010
@@ -75,7 +75,7 @@
         ValidationErrors errors;
 
         // Verify that the initial user is anonymous
-        trip = m_engine.guestTrip( "/Login.action" );
+        trip = m_engine.guestTrip( "/Login.jsp" );
         HttpServletRequest request = trip.getRequest();
         WikiSession wikiSession = SessionMonitor.getInstance( m_engine ).find( request.getSession()
);
         assertNotSame( Users.JANNE, wikiSession.getLoginPrincipal().getName() );
@@ -106,7 +106,7 @@
         ValidationErrors errors;
 
         // Verify that the initial user is anonymous
-        trip = m_engine.guestTrip( "/Login.action" );
+        trip = m_engine.guestTrip( "/Login.jsp" );
         HttpServletRequest request = trip.getRequest();
         WikiSession wikiSession = SessionMonitor.getInstance( m_engine ).find( request.getSession()
);
         assertNotSame( Users.JANNE, wikiSession.getLoginPrincipal().getName() );
@@ -119,7 +119,7 @@
         assertEquals( 2, errors.size() );
 
         // Log in again with just a password; should see one error
-        trip = m_engine.guestTrip( "/Login.action" );
+        trip = m_engine.guestTrip( "/Login.jsp" );
         trip.setParameter( "j_password", Users.JANNE_PASS );
         trip.execute( "login" );
         bean = trip.getActionBean( LoginActionBean.class );
@@ -127,7 +127,7 @@
         assertEquals( 1, errors.size() );
 
         // Log in again with just a username; should see one error
-        trip = m_engine.guestTrip( "/Login.action" );
+        trip = m_engine.guestTrip( "/Login.jsp" );
         trip.setParameter( "j_username", Users.JANNE );
         trip.execute( "login" );
         bean = trip.getActionBean( LoginActionBean.class );
@@ -142,7 +142,7 @@
         ValidationErrors errors;
 
         // Verify that the initial user is anonymous
-        trip = m_engine.guestTrip( "/Login.action" );
+        trip = m_engine.guestTrip( "/Login.jsp" );
         HttpServletRequest request = trip.getRequest();
         WikiSession wikiSession = SessionMonitor.getInstance( m_engine ).find( request.getSession()
);
         assertNotSame( Users.JANNE, wikiSession.getLoginPrincipal().getName() );
@@ -168,7 +168,7 @@
         ValidationErrors errors;
 
         // Verify that the initial user is anonymous
-        trip = m_engine.guestTrip( "/Login.action" );
+        trip = m_engine.guestTrip( "/Login.jsp" );
         HttpServletRequest request = trip.getRequest();
         WikiSession wikiSession = SessionMonitor.getInstance( m_engine ).find( request.getSession()
);
         assertNotSame( Users.JANNE, wikiSession.getLoginPrincipal().getName() );

Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/UserPreferencesActionBeanTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/UserPreferencesActionBeanTest.java?rev=905900&r1=905899&r2=905900&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/UserPreferencesActionBeanTest.java
(original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/UserPreferencesActionBeanTest.java
Wed Feb  3 05:29:15 2010
@@ -69,7 +69,7 @@
         UserPreferencesActionBean bean;
 
         // Create session; set 'assertion' param; verify it got saved
-        trip = m_engine.guestTrip( "/UserPreferences.action" );
+        trip = m_engine.guestTrip( "/UserPreferences.jsp" );
         trip.setParameter( "assertedName", "MyAssertedIdentity" );
         trip.execute( "createAssertedName" );
         bean = trip.getActionBean( UserPreferencesActionBean.class );
@@ -90,7 +90,7 @@
         UserPreferencesActionBean bean;
 
         // Create session; login in as Janne
-        trip = m_engine.guestTrip( "/UserPreferences.action" );
+        trip = m_engine.guestTrip( "/UserPreferences.jsp" );
         MockHttpServletRequest request = trip.getRequest();
         WikiSession wikiSession = WikiSession.getWikiSession( m_engine, request );
         boolean login = m_engine.getAuthenticationManager().login( wikiSession, request,
Users.JANNE, Users.JANNE_PASS );
@@ -115,13 +115,13 @@
         UserPreferencesActionBean bean;
 
         // Create session; set 'assertion' param; verify it got saved
-        trip = m_engine.guestTrip( "/UserPreferences.action" );
+        trip = m_engine.guestTrip( "/UserPreferences.jsp" );
         MockHttpServletRequest request = trip.getRequest();
         Cookie cookie = new Cookie( CookieAssertionLoginModule.PREFS_COOKIE_NAME, "MyAssertedIdentity"
);
         request.setCookies( new Cookie[] { cookie } );
         trip.execute( "clearAssertedName" );
         bean = trip.getActionBean( UserPreferencesActionBean.class );
-        assertEquals( "/Login.action?logout=", trip.getDestination() );
+        assertEquals( "/Login.jsp?logout=", trip.getDestination() );
 
         // Verify that the asserted name cookie is gone from the Response
         MockHttpServletResponse response = (MockHttpServletResponse) bean.getContext().getResponse();

Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/UserProfileActionBeanTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/UserProfileActionBeanTest.java?rev=905900&r1=905899&r2=905900&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/UserProfileActionBeanTest.java
(original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/UserProfileActionBeanTest.java
Wed Feb  3 05:29:15 2010
@@ -91,7 +91,7 @@
         assertEquals( MockRoundtrip.DEFAULT_SOURCE_PAGE, trip.getDestination() );
 
         // Submit just the e-mail param
-        trip = m_engine.guestTrip( "/UserProfile.action" );
+        trip = m_engine.guestTrip( "/UserProfile.jsp" );
         trip.setParameter( "profile.email", "fred@friendly.org" );
         trip.execute( "save" );
         bean = trip.getActionBean( UserProfileActionBean.class );
@@ -111,7 +111,7 @@
         assertEquals( MockRoundtrip.DEFAULT_SOURCE_PAGE, trip.getDestination() );
 
         // Submit just the full name param
-        trip = m_engine.guestTrip( "/UserProfile.action" );
+        trip = m_engine.guestTrip( "/UserProfile.jsp" );
         trip.setParameter( "profile.fullname", "Fred Friendly" );
         trip.execute( "save" );
         bean = trip.getActionBean( UserProfileActionBean.class );
@@ -129,7 +129,7 @@
         assertEquals( MockRoundtrip.DEFAULT_SOURCE_PAGE, trip.getDestination() );
 
         // Submit just the login name param
-        trip = m_engine.guestTrip( "/UserProfile.action" );
+        trip = m_engine.guestTrip( "/UserProfile.jsp" );
         trip.setParameter( "profile.loginName", "fred" );
         trip.execute( "save" );
         bean = trip.getActionBean( UserProfileActionBean.class );
@@ -147,7 +147,7 @@
         assertEquals( MockRoundtrip.DEFAULT_SOURCE_PAGE, trip.getDestination() );
 
         // Submit just the first password field
-        trip = m_engine.guestTrip( "/UserProfile.action" );
+        trip = m_engine.guestTrip( "/UserProfile.jsp" );
         trip.setParameter( "profile.password", "myPassword" );
         trip.execute( "save" );
         bean = trip.getActionBean( UserProfileActionBean.class );
@@ -166,7 +166,7 @@
         assertEquals( MockRoundtrip.DEFAULT_SOURCE_PAGE, trip.getDestination() );
 
         // Submit just the second password field
-        trip = m_engine.guestTrip( "/UserProfile.action" );
+        trip = m_engine.guestTrip( "/UserProfile.jsp" );
         trip.setParameter( "passwordAgain", "myPassword" );
         trip.execute( "save" );
         bean = trip.getActionBean( UserProfileActionBean.class );
@@ -192,7 +192,7 @@
         ValidationErrors errors;
 
         // Set different passwords
-        trip = m_engine.guestTrip( "/UserProfile.action" );
+        trip = m_engine.guestTrip( "/UserProfile.jsp" );
         trip.setParameter( "profile.loginName", "fred" );
         trip.setParameter( "profile.fullname", "Fred Friendly" );
         trip.setParameter( "profile.email", "fred@friendly.org" );
@@ -214,7 +214,7 @@
         ValidationErrors errors;
 
         // Set an illegal e-mail address
-        trip = m_engine.guestTrip( "/UserProfile.action" );
+        trip = m_engine.guestTrip( "/UserProfile.jsp" );
         trip.setParameter( "profile.loginName", "fred" );
         trip.setParameter( "profile.fullname", "Fred Friendly" );
         trip.setParameter( "profile.email", "illegalEmail" );
@@ -240,7 +240,7 @@
         assertFalse( userExists( "user" + suffix ) );
 
         // Create new user
-        trip = m_engine.guestTrip( "/UserProfile.action" );
+        trip = m_engine.guestTrip( "/UserProfile.jsp" );
         trip.setParameter( "profile.loginName", "user" + suffix );
         trip.setParameter( "profile.fullname", "Fred Friendly" + suffix );
         trip.setParameter( "profile.email", "fred@friendly.org" );
@@ -275,7 +275,7 @@
 
         // Create user #1; save; verify it saved ok
         String suffix1 = String.valueOf( System.currentTimeMillis() );
-        trip = m_engine.guestTrip( "/UserProfile.action" );
+        trip = m_engine.guestTrip( "/UserProfile.jsp" );
         trip.setParameter( "profile.loginName", "user" + suffix1 );
         trip.setParameter( "profile.fullname", "Fred Friendly" + suffix1 );
         trip.setParameter( "profile.email", "fred1@friendly.org" );
@@ -293,7 +293,7 @@
         // save
         // (because loginnames collided), and redirected back to .Action
         String suffix2 = String.valueOf( System.currentTimeMillis() );
-        trip = m_engine.guestTrip( "/UserProfile.action" );
+        trip = m_engine.guestTrip( "/UserProfile.jsp" );
         trip.setParameter( "profile.loginName", "user" + suffix1 );
         trip.setParameter( "profile.fullname", "Fred Friendly" + suffix2 );
         trip.setParameter( "profile.email", "fred2@friendly.org" );
@@ -310,7 +310,7 @@
 
         // Create user #2, but same fullname as #1; save; verify it did NOT save
         // (because fullnames collided), and redirected back to .Action
-        trip = m_engine.guestTrip( "/UserProfile.action" );
+        trip = m_engine.guestTrip( "/UserProfile.jsp" );
         trip.setParameter( "profile.loginName", "user" + suffix2 );
         trip.setParameter( "profile.fullname", "Fred Friendly" + suffix1 );
         trip.setParameter( "profile.email", "fred2@friendly.org" );
@@ -337,7 +337,7 @@
 
         // Create user; save; verify it saved ok
         String suffix = String.valueOf( System.currentTimeMillis() );
-        trip = m_engine.guestTrip( "/UserProfile.action" );
+        trip = m_engine.guestTrip( "/UserProfile.jsp" );
         trip.setParameter( "profile.loginName", "user" + suffix );
         trip.setParameter( "profile.fullname", "Fred Friendly" + suffix );
         trip.setParameter( "profile.email", "fred1@friendly.org" );
@@ -351,7 +351,7 @@
         assertTrue( userExists( "user" + suffix ) );
 
         // Create new session and login as new user...
-        trip = m_engine.guestTrip( "/UserProfile.action" );
+        trip = m_engine.guestTrip( "/UserProfile.jsp" );
         MockHttpServletRequest request = trip.getRequest();
         WikiSession wikiSession = WikiSession.getWikiSession( m_engine, request );
         boolean login = m_engine.getAuthenticationManager().login( wikiSession, request,
"user" + suffix, "mypassword" );
@@ -365,7 +365,7 @@
         assertEquals( "fred1@friendly.org", bean.getProfile().getEmail() );
 
         // Now, create another session, and log in again....
-        trip = m_engine.guestTrip( "/UserProfile.action" );
+        trip = m_engine.guestTrip( "/UserProfile.jsp" );
         request = trip.getRequest();
         wikiSession = WikiSession.getWikiSession( m_engine, request );
         login = m_engine.getAuthenticationManager().login( wikiSession, request, "user" +
suffix, "mypassword" );

Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/ViewActionBeanTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/ViewActionBeanTest.java?rev=905900&r1=905899&r2=905900&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/ViewActionBeanTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/action/ViewActionBeanTest.java Wed
Feb  3 05:29:15 2010
@@ -73,7 +73,7 @@
         assertEquals( pageName, bean.getPage().getName() );
         
         // ...and the destination should be the Wiki template JSP
-        assertEquals("/templates/default/Wiki.jsp", trip.getDestination() );
+        assertEquals("/templates/default/Wiki.jsp?tab=view", trip.getDestination() );
     }
     
     public void testNoParameter() throws Exception {
@@ -92,7 +92,7 @@
         assertEquals( page, bean.getPage() );
         
         // ...and the destination should be the Wiki template JSP
-        assertEquals("/templates/default/Wiki.jsp", trip.getDestination() );
+        assertEquals("/templates/default/Wiki.jsp?tab=view", trip.getDestination() );
     }
     
     public void testSpecialPage() throws Exception {
@@ -132,7 +132,7 @@
         assertEquals( page, bean.getPage() );
         
         // ...and the destination should be the Wiki template JSP
-        assertEquals( "/templates/default/Wiki.jsp", trip.getDestination() );
+        assertEquals( "/templates/default/Wiki.jsp?tab=view", trip.getDestination() );
     }
 
     public void testViewVersion() throws Exception {

Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/stripes/IsOneOfTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/stripes/IsOneOfTest.java?rev=905900&r1=905899&r2=905900&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/stripes/IsOneOfTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/stripes/IsOneOfTest.java Wed Feb
 3 05:29:15 2010
@@ -39,7 +39,7 @@
         ResolverUtil.Test test = new IsOneOf( WikiActionBean.class, PageFilter.class, WikiPlugin.class
);
         resolver.find( test, "org.apache.wiki" );
         Set<Class<? extends Object>> matches = resolver.getClasses();
-        assertEquals( 71, matches.size() );
+        assertEquals( 72, matches.size() );
     }
 
     public void testActionBeanMatches()
@@ -48,7 +48,7 @@
         ResolverUtil.Test test = new IsOneOf( WikiActionBean.class );
         resolver.find( test, "org.apache.wiki.action" );
         Set<Class<? extends Object>> matches = resolver.getClasses();
-        assertEquals( 24, matches.size() );
+        assertEquals( 25, matches.size() );
     }
 
     public void testPageFilterMatches()

Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/stripes/ShortUrlRedirectFilterTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/stripes/ShortUrlRedirectFilterTest.java?rev=905900&r1=905899&r2=905900&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/stripes/ShortUrlRedirectFilterTest.java
(original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/ui/stripes/ShortUrlRedirectFilterTest.java
Wed Feb  3 05:29:15 2010
@@ -60,7 +60,7 @@
         trip.execute();
         ViewActionBean bean = trip.getActionBean( ViewActionBean.class );
         assertNull( bean );
-        assertEquals( "/Edit.action?edit=&page=Foo", trip.getDestination() );
+        assertEquals( "/Edit.jsp?edit=&page=Foo", trip.getDestination() );
     }
     
     public void testRedirectView() throws Exception



Mime
View raw message