[Registry-dev] svn commit r6793 - trunk/registry/java/modules/webapps/src/main/java/org/wso2/registry/ui/actions

[svn at wso2.org]

Author: deepal
Date: Fri Aug 31 03:04:01 2007
New Revision: 6793

Modified:
   trunk/registry/java/modules/webapps/src/main/java/org/wso2/registry/ui/actions/LoginAction.java
   trunk/registry/java/modules/webapps/src/main/java/org/wso2/registry/ui/actions/ResourceDetailsAction.java
Log:
getting build working after doing code clean up

Modified: trunk/registry/java/modules/webapps/src/main/java/org/wso2/registry/ui/actions/LoginAction.java
==============================================================================
--- trunk/registry/java/modules/webapps/src/main/java/org/wso2/registry/ui/actions/LoginAction.java	(original)
+++ trunk/registry/java/modules/webapps/src/main/java/org/wso2/registry/ui/actions/LoginAction.java	Fri Aug 31 03:04:01 2007
@@ -19,13 +19,12 @@
 
 package org.wso2.registry.ui.actions;
 
-import com.opensymphony.xwork2.ActionSupport;
 import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionSupport;
 import org.apache.struts2.StrutsStatics;
 import org.wso2.registry.Registry;
-import org.wso2.registry.Constants;
+import org.wso2.registry.RegistryConstants;
 import org.wso2.registry.ui.WebAppConstants;
-import org.wso2.registry.engine.RegistrySessionContext;
 
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
@@ -39,18 +38,16 @@
         ActionContext actionContext = ActionContext.getContext();
         ServletContext context = (ServletContext) actionContext.get(StrutsStatics.SERVLET_CONTEXT);
 
-        Registry registry = (Registry) context.getAttribute(Constants.REGISTRY_ENGINE);
+        Registry registry = (Registry) context.getAttribute(RegistryConstants.REGISTRY_ENGINE);
 
         // todo: authenticate the user
         // todo: if valid user, create a RegistrySessionContext and put it in the SessionContext
 
-        RegistrySessionContext sessionContext = new RegistrySessionContext();
-        sessionContext.setUserID(userName);
 
         HttpServletRequest request =
                 (HttpServletRequest) actionContext.get(StrutsStatics.HTTP_REQUEST);
-        request.getSession().setAttribute(WebAppConstants.USER, sessionContext);
-        
+        request.getSession().setAttribute(WebAppConstants.USER, userName);
+
         return ActionSupport.SUCCESS;
     }
 

Modified: trunk/registry/java/modules/webapps/src/main/java/org/wso2/registry/ui/actions/ResourceDetailsAction.java
==============================================================================
--- trunk/registry/java/modules/webapps/src/main/java/org/wso2/registry/ui/actions/ResourceDetailsAction.java	(original)
+++ trunk/registry/java/modules/webapps/src/main/java/org/wso2/registry/ui/actions/ResourceDetailsAction.java	Fri Aug 31 03:04:01 2007
@@ -27,9 +27,8 @@
 
 import org.apache.struts2.StrutsStatics;
 import org.wso2.registry.Registry;
-import org.wso2.registry.Constants;
+import org.wso2.registry.RegistryConstants;
 import org.wso2.registry.ui.WebAppConstants;
-import org.wso2.registry.engine.RegistrySessionContext;
 import org.wso2.registry.resources.Resource;
 
 public class ResourceDetailsAction extends ActionSupport {
@@ -68,16 +67,16 @@
 
         HttpServletRequest request =
                 (HttpServletRequest) actionContext.get(StrutsStatics.HTTP_REQUEST);
-        RegistrySessionContext sessionContext =
-                (RegistrySessionContext) request.getSession().getAttribute(WebAppConstants.USER);
+        String sessionContext =
+                (String) request.getSession().getAttribute(WebAppConstants.USER);
         if (sessionContext == null) {
             return ActionSupport.ERROR;
         }
 
         ServletContext context = (ServletContext) actionContext.get(StrutsStatics.SERVLET_CONTEXT);
-        Registry registry = (Registry) context.getAttribute(Constants.REGISTRY_ENGINE);
+        Registry registry = (Registry) context.getAttribute(RegistryConstants.REGISTRY_ENGINE);
 
-        Resource resource = registry.get(path, sessionContext);
+        Resource resource = registry.get(path);
         this.author = resource.getAuthor();
         this.description = resource.getDescription();