[Skabacca-developer] SF.net SVN: skabacca:[20] trunk/gui/src/main/java/org/skabacca/gui

[<tri...@us...>]

Revision: 20
          http://skabacca.svn.sourceforge.net/skabacca/?rev=20&view=rev
Author:   triathlon98
Date:     2010-01-30 21:03:38 +0000 (Sat, 30 Jan 2010)

Log Message:
-----------
fix login using chenillekit-access (SessionState object *needs* to be of type "WebSessionUser", and not "EquandaWebSessionUser") + loginservice does not remember across requests

Modified Paths:
--------------
    trunk/gui/src/main/java/org/skabacca/gui/pages/Login.java
    trunk/gui/src/main/java/org/skabacca/gui/services/AppModule.java
    trunk/gui/src/main/java/org/skabacca/gui/services/AppServerLoginFilter.java
    trunk/gui/src/main/java/org/skabacca/gui/services/EquandaAuthService.java
    trunk/gui/src/main/java/org/skabacca/gui/services/JbossAppServerLoginService.java

Modified: trunk/gui/src/main/java/org/skabacca/gui/pages/Login.java
===================================================================
--- trunk/gui/src/main/java/org/skabacca/gui/pages/Login.java	2010-01-29 19:19:09 UTC (rev 19)
+++ trunk/gui/src/main/java/org/skabacca/gui/pages/Login.java	2010-01-30 21:03:38 UTC (rev 20)
@@ -95,7 +95,7 @@
 
     void onSuccess()
     {
-        // @todo return page handling should be implicit
+        System.out.println( "login was successful, wsu=" + webSessionUser );
         if ( null != webSessionUser ) resources.discardPersistentFieldChanges();
         logger.debug( "login successful" );
 

Modified: trunk/gui/src/main/java/org/skabacca/gui/services/AppModule.java
===================================================================
--- trunk/gui/src/main/java/org/skabacca/gui/services/AppModule.java	2010-01-29 19:19:09 UTC (rev 19)
+++ trunk/gui/src/main/java/org/skabacca/gui/services/AppModule.java	2010-01-30 21:03:38 UTC (rev 20)
@@ -60,7 +60,7 @@
         javassist.runtime.Desc.useContextClassLoader = true;
     }
 
-    // not that this is not 5.1 compatible, these versions use the ApplicationDefaults below...
+    // note that this is not 5.1 compatible, these versions use the ApplicationDefaults below...
 
     public static void contributeMetaDataLocator( MappedConfiguration<String, String> configuration )
     {
@@ -73,7 +73,7 @@
                                                           final AppServerLoginFilter accessFilter )
     {
         System.out.println( "adding AppServerLogin filter" );
-        configuration.add( "AppServerLogin", accessFilter, "after:CookieRedirect" );
+        configuration.add( "AppServerLogin", accessFilter, "after:AccessControl" );
     }
 
 
@@ -107,7 +107,7 @@
     public static void contributeAuthenticationService( OrderedConfiguration<AuthenticationServiceFilter> configuration,
                                                         LoginInfoService loginInfoService )
     {
-        configuration.add( "CA", new EquandaAuthService(loginInfoService) );
+        configuration.add( "CA", new EquandaAuthService( loginInfoService ) );
     }
 
     /**

Modified: trunk/gui/src/main/java/org/skabacca/gui/services/AppServerLoginFilter.java
===================================================================
--- trunk/gui/src/main/java/org/skabacca/gui/services/AppServerLoginFilter.java	2010-01-29 19:19:09 UTC (rev 19)
+++ trunk/gui/src/main/java/org/skabacca/gui/services/AppServerLoginFilter.java	2010-01-30 21:03:38 UTC (rev 20)
@@ -45,7 +45,7 @@
         throws IOException
     {
         System.out.println( "AppServerLoginFilter.handle compo" );
-        WebSessionUser wsu = asoManager.getIfExists( EquandaWebSessionUser.class );
+        WebSessionUser wsu = asoManager.getIfExists( WebSessionUser.class );
         System.out.println( "webSessionUser=" + wsu );
         if ( null != wsu ) appServerLoginService.appServerLogin( wsu );
         componentRequestHandler.handleComponentEvent( componentEventRequestParameters );
@@ -56,7 +56,7 @@
         throws IOException
     {
         System.out.println( "AppServerLoginFilter.handle page" );
-        WebSessionUser wsu = asoManager.getIfExists( EquandaWebSessionUser.class );
+        WebSessionUser wsu = asoManager.getIfExists( WebSessionUser.class );
         System.out.println( "webSessionUser=" + wsu );
         if ( null != wsu ) appServerLoginService.appServerLogin( wsu );
         componentRequestHandler.handlePageRender( pageRenderRequestParameters );

Modified: trunk/gui/src/main/java/org/skabacca/gui/services/EquandaAuthService.java
===================================================================
--- trunk/gui/src/main/java/org/skabacca/gui/services/EquandaAuthService.java	2010-01-29 19:19:09 UTC (rev 19)
+++ trunk/gui/src/main/java/org/skabacca/gui/services/EquandaAuthService.java	2010-01-30 21:03:38 UTC (rev 20)
@@ -60,7 +60,9 @@
                         log.debug( "authentication succeeded for " + userName + " guiAP=" +
                             loginInfo.isGuiAccessProhibited() );
                     }
+                    System.out.println( "loginInfoService=" + loginInfoService );
                     loginInfoService.setLoginInfo( loginInfo );
+                    System.out.println( "value in loginInfoService=" + loginInfoService.getLoginInfo() );
                     return new EquandaWebSessionUser( loginInfo );
                 }
             }

Modified: trunk/gui/src/main/java/org/skabacca/gui/services/JbossAppServerLoginService.java
===================================================================
--- trunk/gui/src/main/java/org/skabacca/gui/services/JbossAppServerLoginService.java	2010-01-29 19:19:09 UTC (rev 19)
+++ trunk/gui/src/main/java/org/skabacca/gui/services/JbossAppServerLoginService.java	2010-01-30 21:03:38 UTC (rev 20)
@@ -54,7 +54,7 @@
 
     public void appServerLogin( WebSessionUser user )
     {
-        log.debug( "do appServerLogin on user " + user );
+        log.debug( "do appServerLogin for user " + user );
         // skip for import url
         try
         {
@@ -84,7 +84,9 @@
         }
 
         // now also assure the login info service is filled and info copied
+        System.out.println( "jas loginInfoService was " + loginInfoService.getLoginInfo() );
         loginInfoService.setLoginInfo( loginInfo );
+        System.out.println( "jas loginInfoService now " + loginInfoService.getLoginInfo() );
         try
         {
             if ( null != loginInfo && null != loginInfo.getUser() )


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.