Updated common dashboard jar classes

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@183370 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-dashboard/ibase/dashboard/common/webService/DashboardService.java

@@ -13,6 +13,11 @@ import javax.ws.rs.core.MediaType;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+import javax.ws.rs.core.Context;
+
 //import com.sun.corba.se.impl.javax.rmi.CORBA.Util;
 
 import ibase.dashboard.common.hibernate.dao.DashboardUtil;
@@ -22,17 +27,26 @@ import ibase.utility.CommonConstants;
 public class DashboardService {
 	@Context
 	HttpServletRequest request; // The proxy of Request will be injected into this singleton
+	   
+    @Context 
+    ServletContext context;
+		
 
 	@GET
 	@Path("/metadata/{dashboardFileName}")
 	@Produces(MediaType.APPLICATION_JSON)
 	public String getDashboardMetadata( @PathParam("dashboardFileName") String dashboardFileName ) throws Exception 
 	{
+
 		System.out.println("getDashboardMetadata ["+CommonConstants.JBOSSHOME+"] dashboardFileName[" + dashboardFileName + "] ");
 		String dashboardMetadataFilePath = CommonConstants.JBOSSHOME + File.separator + "server" + File.separator + "default" + File.separator + "deploy" + File.separator + "ibase.ear" + File.separator + "ibase.war" + File.separator + "dashboard" + File.separator + "metadataxml" + File.separator +dashboardFileName+".xml";
 		System.out.println("Final File Path =" + dashboardMetadataFilePath);
 		DashboardUtil util = new DashboardUtil();
-		JSONObject dashboardMetadata = util.getDashboardConfig(dashboardMetadataFilePath);
+		HttpSession session = request.getSession();
+		ibase.utility.UserInfoBean userInfo = ( ibase.utility.UserInfoBean )session.getAttribute( "USER_INFO" );
+
+		
+		JSONObject dashboardMetadata = util.getDashboardConfig(dashboardMetadataFilePath,userInfo);
 		
 		return dashboardMetadata.toString();
 	}